From 2680d2c506085dbc65990981b3dcddd5cac64878 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 18:47:24 +0200
Subject: [PATCH 001/768] Move all files to subdirectory

---
 .../framework/src/{ => Framework}/Actions/BladeMatterParser.php   | 0
 .../Actions/Constructors/FindsContentLengthForImageObject.php     | 0
 .../Actions/Constructors/FindsNavigationDataForPage.php           | 0
 .../{ => Framework}/Actions/Constructors/FindsTitleForPage.php    | 0
 .../src/{ => Framework}/Actions/ConvertsArrayToFrontMatter.php    | 0
 .../src/{ => Framework}/Actions/CreatesNewMarkdownPostFile.php    | 0
 .../src/{ => Framework}/Actions/CreatesNewPageSourceFile.php      | 0
 .../{ => Framework}/Actions/GeneratesSidebarTableOfContents.php   | 0
 .../framework/src/{ => Framework}/Actions/MarkdownConverter.php   | 0
 .../framework/src/{ => Framework}/Actions/MarkdownFileParser.php  | 0
 .../Actions/PostBuildTasks/GenerateBuildManifest.php              | 0
 .../{ => Framework}/Actions/PostBuildTasks/GenerateRssFeed.php    | 0
 .../src/{ => Framework}/Actions/PostBuildTasks/GenerateSearch.php | 0
 .../{ => Framework}/Actions/PostBuildTasks/GenerateSitemap.php    | 0
 .../src/{ => Framework}/Actions/PublishesHomepageView.php         | 0
 .../framework/src/{ => Framework}/Actions/PublishesHydeViews.php  | 0
 .../framework/src/{ => Framework}/Actions/SourceFileParser.php    | 0
 .../framework/src/{ => Framework}/Actions/StaticPageBuilder.php   | 0
 .../src/{ => Framework}/Commands/HydeBuildRssFeedCommand.php      | 0
 .../src/{ => Framework}/Commands/HydeBuildSearchCommand.php       | 0
 .../src/{ => Framework}/Commands/HydeBuildSiteCommand.php         | 0
 .../src/{ => Framework}/Commands/HydeBuildSitemapCommand.php      | 0
 .../framework/src/{ => Framework}/Commands/HydeDebugCommand.php   | 0
 .../src/{ => Framework}/Commands/HydeMakePageCommand.php          | 0
 .../src/{ => Framework}/Commands/HydeMakePostCommand.php          | 0
 .../src/{ => Framework}/Commands/HydePackageDiscoverCommand.php   | 0
 .../src/{ => Framework}/Commands/HydePublishHomepageCommand.php   | 0
 .../src/{ => Framework}/Commands/HydePublishViewsCommand.php      | 0
 .../src/{ => Framework}/Commands/HydeRebuildStaticSiteCommand.php | 0
 .../src/{ => Framework}/Commands/HydeRouteListCommand.php         | 0
 .../framework/src/{ => Framework}/Commands/HydeServeCommand.php   | 0
 .../src/{ => Framework}/Commands/HydeUpdateConfigsCommand.php     | 0
 .../src/{ => Framework}/Commands/HydeValidateCommand.php          | 0
 .../framework/src/{ => Framework}/Concerns/AbstractBuildTask.php  | 0
 .../framework/src/{ => Framework}/Concerns/BaseMarkdownPage.php   | 0
 packages/framework/src/{ => Framework}/Concerns/HydePage.php      | 0
 .../src/{ => Framework}/Concerns/InteractsWithDirectories.php     | 0
 .../{ => Framework}/Concerns/Internal/ConstructsPageSchemas.php   | 0
 .../{ => Framework}/Concerns/Internal/SetsUpMarkdownConverter.php | 0
 .../src/{ => Framework}/Concerns/JsonSerializesArrayable.php      | 0
 .../src/{ => Framework}/Concerns/RegistersFileLocations.php       | 0
 .../framework/src/{ => Framework}/Concerns/ValidatesExistence.php | 0
 .../framework/src/{ => Framework}/Contracts/BuildTaskContract.php | 0
 .../src/{ => Framework}/Contracts/CompilableContract.php          | 0
 .../src/{ => Framework}/Contracts/FrontMatter/BlogPostSchema.php  | 0
 .../Contracts/FrontMatter/DocumentationPageSchema.php             | 0
 .../src/{ => Framework}/Contracts/FrontMatter/PageSchema.php      | 0
 .../Contracts/FrontMatter/Support/FeaturedImageSchema.php         | 0
 .../Contracts/FrontMatter/Support/NavigationSchema.php            | 0
 .../src/{ => Framework}/Contracts/MarkdownDocumentContract.php    | 0
 .../{ => Framework}/Contracts/MarkdownPostProcessorContract.php   | 0
 .../{ => Framework}/Contracts/MarkdownPreProcessorContract.php    | 0
 .../src/{ => Framework}/Contracts/MarkdownShortcodeContract.php   | 0
 .../src/{ => Framework}/Exceptions/BaseUrlNotSetException.php     | 0
 .../src/{ => Framework}/Exceptions/FileConflictException.php      | 0
 .../src/{ => Framework}/Exceptions/FileNotFoundException.php      | 0
 .../src/{ => Framework}/Exceptions/RouteNotFoundException.php     | 0
 .../{ => Framework}/Exceptions/UnsupportedPageTypeException.php   | 0
 packages/framework/src/{ => Framework}/Foundation/Application.php | 0
 .../Foundation/Concerns/BaseFoundationCollection.php              | 0
 .../{ => Framework}/Foundation/Concerns/ForwardsFilesystem.php    | 0
 .../{ => Framework}/Foundation/Concerns/ForwardsHyperlinks.php    | 0
 .../Foundation/Concerns/HandlesFoundationCollections.php          | 0
 .../Foundation/Concerns/ImplementsStringHelpers.php               | 0
 .../src/{ => Framework}/Foundation/Concerns/ManagesHydeKernel.php | 0
 .../src/{ => Framework}/Foundation/Concerns/ManagesViewData.php   | 0
 .../framework/src/{ => Framework}/Foundation/FileCollection.php   | 0
 packages/framework/src/{ => Framework}/Foundation/Filesystem.php  | 0
 packages/framework/src/{ => Framework}/Foundation/Hyperlinks.php  | 0
 .../framework/src/{ => Framework}/Foundation/PageCollection.php   | 0
 .../framework/src/{ => Framework}/Foundation/RouteCollection.php  | 0
 packages/framework/src/{ => Framework}/Helpers/Asset.php          | 0
 packages/framework/src/{ => Framework}/Helpers/Features.php       | 0
 packages/framework/src/{ => Framework}/Helpers/Includes.php       | 0
 packages/framework/src/{ => Framework}/Helpers/Meta.php           | 0
 packages/framework/src/{ => Framework}/Helpers/Redirect.php       | 0
 packages/framework/src/{ => Framework}/Hyde.php                   | 0
 packages/framework/src/{ => Framework}/HydeKernel.php             | 0
 packages/framework/src/{ => Framework}/HydeServiceProvider.php    | 0
 .../framework/src/{ => Framework}/Models/Markdown/FrontMatter.php | 0
 .../framework/src/{ => Framework}/Models/Markdown/Markdown.php    | 0
 .../src/{ => Framework}/Models/Markdown/MarkdownDocument.php      | 0
 .../{ => Framework}/Models/Navigation/DocumentationSidebar.php    | 0
 .../framework/src/{ => Framework}/Models/Navigation/NavItem.php   | 0
 .../src/{ => Framework}/Models/Navigation/NavigationData.php      | 0
 .../src/{ => Framework}/Models/Navigation/NavigationMenu.php      | 0
 packages/framework/src/{ => Framework}/Models/Pages/BladePage.php | 0
 .../src/{ => Framework}/Models/Pages/DocumentationPage.php        | 0
 packages/framework/src/{ => Framework}/Models/Pages/HtmlPage.php  | 0
 .../framework/src/{ => Framework}/Models/Pages/MarkdownPage.php   | 0
 .../framework/src/{ => Framework}/Models/Pages/MarkdownPost.php   | 0
 packages/framework/src/{ => Framework}/Models/Support/Author.php  | 0
 .../framework/src/{ => Framework}/Models/Support/DateString.php   | 0
 packages/framework/src/{ => Framework}/Models/Support/File.php    | 0
 packages/framework/src/{ => Framework}/Models/Support/Image.php   | 0
 packages/framework/src/{ => Framework}/Models/Support/Route.php   | 0
 packages/framework/src/{ => Framework}/Models/Support/Site.php    | 0
 .../src/{ => Framework}/Models/Support/ValidationResult.php       | 0
 .../{ => Framework}/Modules/DataCollections/DataCollection.php    | 0
 .../Modules/DataCollections/DataCollectionServiceProvider.php     | 0
 .../Modules/DataCollections/Facades/MarkdownCollection.php        | 0
 .../src/{ => Framework}/Modules/Markdown/BladeDownProcessor.php   | 0
 .../Modules/Markdown/CodeblockFilepathProcessor.php               | 0
 .../src/{ => Framework}/Modules/Markdown/ShortcodeProcessor.php   | 0
 .../Modules/Markdown/Shortcodes/ColoredBlockquotes.php            | 0
 .../src/{ => Framework}/Modules/Metadata/GlobalMetadataBag.php    | 0
 .../src/{ => Framework}/Modules/Metadata/MetadataBag.php          | 0
 .../{ => Framework}/Modules/Metadata/MetadataElementContract.php  | 0
 .../src/{ => Framework}/Modules/Metadata/Models/LinkElement.php   | 0
 .../{ => Framework}/Modules/Metadata/Models/MetadataElement.php   | 0
 .../{ => Framework}/Modules/Metadata/Models/OpenGraphElement.php  | 0
 .../src/{ => Framework}/Modules/Metadata/PageMetadataBag.php      | 0
 packages/framework/src/{ => Framework}/Modules/README.md          | 0
 packages/framework/src/{ => Framework}/Services/AssetService.php  | 0
 packages/framework/src/{ => Framework}/Services/BuildService.php  | 0
 .../framework/src/{ => Framework}/Services/BuildTaskService.php   | 0
 .../framework/src/{ => Framework}/Services/ChecksumService.php    | 0
 .../framework/src/{ => Framework}/Services/DiscoveryService.php   | 0
 .../src/{ => Framework}/Services/DocumentationSearchService.php   | 0
 .../framework/src/{ => Framework}/Services/MarkdownService.php    | 0
 .../framework/src/{ => Framework}/Services/RebuildService.php     | 0
 .../framework/src/{ => Framework}/Services/RssFeedService.php     | 0
 .../src/{ => Framework}/Services/SemanticDocumentationArticle.php | 0
 .../framework/src/{ => Framework}/Services/SitemapService.php     | 0
 .../framework/src/{ => Framework}/Services/ValidationService.php  | 0
 .../src/{ => Framework}/Services/YamlConfigurationService.php     | 0
 .../src/{ => Framework}/Views/Components/LinkComponent.php        | 0
 packages/framework/src/{ => Framework}/helpers.php                | 0
 128 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/framework/src/{ => Framework}/Actions/BladeMatterParser.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/Constructors/FindsContentLengthForImageObject.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/Constructors/FindsNavigationDataForPage.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/Constructors/FindsTitleForPage.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/ConvertsArrayToFrontMatter.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/CreatesNewMarkdownPostFile.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/CreatesNewPageSourceFile.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/GeneratesSidebarTableOfContents.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/MarkdownConverter.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/MarkdownFileParser.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PostBuildTasks/GenerateBuildManifest.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PostBuildTasks/GenerateRssFeed.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PostBuildTasks/GenerateSearch.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PostBuildTasks/GenerateSitemap.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PublishesHomepageView.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/PublishesHydeViews.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/SourceFileParser.php (100%)
 rename packages/framework/src/{ => Framework}/Actions/StaticPageBuilder.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeBuildRssFeedCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeBuildSearchCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeBuildSiteCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeBuildSitemapCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeDebugCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeMakePageCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeMakePostCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydePackageDiscoverCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydePublishHomepageCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydePublishViewsCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeRebuildStaticSiteCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeRouteListCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeServeCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeUpdateConfigsCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Commands/HydeValidateCommand.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/AbstractBuildTask.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/BaseMarkdownPage.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/HydePage.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/InteractsWithDirectories.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/Internal/ConstructsPageSchemas.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/Internal/SetsUpMarkdownConverter.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/JsonSerializesArrayable.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/RegistersFileLocations.php (100%)
 rename packages/framework/src/{ => Framework}/Concerns/ValidatesExistence.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/BuildTaskContract.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/CompilableContract.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/FrontMatter/BlogPostSchema.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/FrontMatter/DocumentationPageSchema.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/FrontMatter/PageSchema.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/FrontMatter/Support/FeaturedImageSchema.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/FrontMatter/Support/NavigationSchema.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/MarkdownDocumentContract.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/MarkdownPostProcessorContract.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/MarkdownPreProcessorContract.php (100%)
 rename packages/framework/src/{ => Framework}/Contracts/MarkdownShortcodeContract.php (100%)
 rename packages/framework/src/{ => Framework}/Exceptions/BaseUrlNotSetException.php (100%)
 rename packages/framework/src/{ => Framework}/Exceptions/FileConflictException.php (100%)
 rename packages/framework/src/{ => Framework}/Exceptions/FileNotFoundException.php (100%)
 rename packages/framework/src/{ => Framework}/Exceptions/RouteNotFoundException.php (100%)
 rename packages/framework/src/{ => Framework}/Exceptions/UnsupportedPageTypeException.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Application.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/BaseFoundationCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/ForwardsFilesystem.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/ForwardsHyperlinks.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/HandlesFoundationCollections.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/ImplementsStringHelpers.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/ManagesHydeKernel.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Concerns/ManagesViewData.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/FileCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Filesystem.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/Hyperlinks.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/PageCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Foundation/RouteCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Helpers/Asset.php (100%)
 rename packages/framework/src/{ => Framework}/Helpers/Features.php (100%)
 rename packages/framework/src/{ => Framework}/Helpers/Includes.php (100%)
 rename packages/framework/src/{ => Framework}/Helpers/Meta.php (100%)
 rename packages/framework/src/{ => Framework}/Helpers/Redirect.php (100%)
 rename packages/framework/src/{ => Framework}/Hyde.php (100%)
 rename packages/framework/src/{ => Framework}/HydeKernel.php (100%)
 rename packages/framework/src/{ => Framework}/HydeServiceProvider.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Markdown/FrontMatter.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Markdown/Markdown.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Markdown/MarkdownDocument.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Navigation/DocumentationSidebar.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Navigation/NavItem.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Navigation/NavigationData.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Navigation/NavigationMenu.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Pages/BladePage.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Pages/DocumentationPage.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Pages/HtmlPage.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Pages/MarkdownPage.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Pages/MarkdownPost.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/Author.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/DateString.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/File.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/Image.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/Route.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/Site.php (100%)
 rename packages/framework/src/{ => Framework}/Models/Support/ValidationResult.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/DataCollections/DataCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/DataCollections/DataCollectionServiceProvider.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/DataCollections/Facades/MarkdownCollection.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Markdown/BladeDownProcessor.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Markdown/CodeblockFilepathProcessor.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Markdown/ShortcodeProcessor.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Markdown/Shortcodes/ColoredBlockquotes.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/GlobalMetadataBag.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/MetadataBag.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/MetadataElementContract.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/Models/LinkElement.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/Models/MetadataElement.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/Models/OpenGraphElement.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/Metadata/PageMetadataBag.php (100%)
 rename packages/framework/src/{ => Framework}/Modules/README.md (100%)
 rename packages/framework/src/{ => Framework}/Services/AssetService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/BuildService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/BuildTaskService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/ChecksumService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/DiscoveryService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/DocumentationSearchService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/MarkdownService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/RebuildService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/RssFeedService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/SemanticDocumentationArticle.php (100%)
 rename packages/framework/src/{ => Framework}/Services/SitemapService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/ValidationService.php (100%)
 rename packages/framework/src/{ => Framework}/Services/YamlConfigurationService.php (100%)
 rename packages/framework/src/{ => Framework}/Views/Components/LinkComponent.php (100%)
 rename packages/framework/src/{ => Framework}/helpers.php (100%)

diff --git a/packages/framework/src/Actions/BladeMatterParser.php b/packages/framework/src/Framework/Actions/BladeMatterParser.php
similarity index 100%
rename from packages/framework/src/Actions/BladeMatterParser.php
rename to packages/framework/src/Framework/Actions/BladeMatterParser.php
diff --git a/packages/framework/src/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
similarity index 100%
rename from packages/framework/src/Actions/Constructors/FindsContentLengthForImageObject.php
rename to packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
diff --git a/packages/framework/src/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
similarity index 100%
rename from packages/framework/src/Actions/Constructors/FindsNavigationDataForPage.php
rename to packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
diff --git a/packages/framework/src/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
similarity index 100%
rename from packages/framework/src/Actions/Constructors/FindsTitleForPage.php
rename to packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
diff --git a/packages/framework/src/Actions/ConvertsArrayToFrontMatter.php b/packages/framework/src/Framework/Actions/ConvertsArrayToFrontMatter.php
similarity index 100%
rename from packages/framework/src/Actions/ConvertsArrayToFrontMatter.php
rename to packages/framework/src/Framework/Actions/ConvertsArrayToFrontMatter.php
diff --git a/packages/framework/src/Actions/CreatesNewMarkdownPostFile.php b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
similarity index 100%
rename from packages/framework/src/Actions/CreatesNewMarkdownPostFile.php
rename to packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
diff --git a/packages/framework/src/Actions/CreatesNewPageSourceFile.php b/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
similarity index 100%
rename from packages/framework/src/Actions/CreatesNewPageSourceFile.php
rename to packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
diff --git a/packages/framework/src/Actions/GeneratesSidebarTableOfContents.php b/packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php
similarity index 100%
rename from packages/framework/src/Actions/GeneratesSidebarTableOfContents.php
rename to packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php
diff --git a/packages/framework/src/Actions/MarkdownConverter.php b/packages/framework/src/Framework/Actions/MarkdownConverter.php
similarity index 100%
rename from packages/framework/src/Actions/MarkdownConverter.php
rename to packages/framework/src/Framework/Actions/MarkdownConverter.php
diff --git a/packages/framework/src/Actions/MarkdownFileParser.php b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
similarity index 100%
rename from packages/framework/src/Actions/MarkdownFileParser.php
rename to packages/framework/src/Framework/Actions/MarkdownFileParser.php
diff --git a/packages/framework/src/Actions/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
similarity index 100%
rename from packages/framework/src/Actions/PostBuildTasks/GenerateBuildManifest.php
rename to packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
diff --git a/packages/framework/src/Actions/PostBuildTasks/GenerateRssFeed.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
similarity index 100%
rename from packages/framework/src/Actions/PostBuildTasks/GenerateRssFeed.php
rename to packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
diff --git a/packages/framework/src/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
similarity index 100%
rename from packages/framework/src/Actions/PostBuildTasks/GenerateSearch.php
rename to packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
diff --git a/packages/framework/src/Actions/PostBuildTasks/GenerateSitemap.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
similarity index 100%
rename from packages/framework/src/Actions/PostBuildTasks/GenerateSitemap.php
rename to packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
diff --git a/packages/framework/src/Actions/PublishesHomepageView.php b/packages/framework/src/Framework/Actions/PublishesHomepageView.php
similarity index 100%
rename from packages/framework/src/Actions/PublishesHomepageView.php
rename to packages/framework/src/Framework/Actions/PublishesHomepageView.php
diff --git a/packages/framework/src/Actions/PublishesHydeViews.php b/packages/framework/src/Framework/Actions/PublishesHydeViews.php
similarity index 100%
rename from packages/framework/src/Actions/PublishesHydeViews.php
rename to packages/framework/src/Framework/Actions/PublishesHydeViews.php
diff --git a/packages/framework/src/Actions/SourceFileParser.php b/packages/framework/src/Framework/Actions/SourceFileParser.php
similarity index 100%
rename from packages/framework/src/Actions/SourceFileParser.php
rename to packages/framework/src/Framework/Actions/SourceFileParser.php
diff --git a/packages/framework/src/Actions/StaticPageBuilder.php b/packages/framework/src/Framework/Actions/StaticPageBuilder.php
similarity index 100%
rename from packages/framework/src/Actions/StaticPageBuilder.php
rename to packages/framework/src/Framework/Actions/StaticPageBuilder.php
diff --git a/packages/framework/src/Commands/HydeBuildRssFeedCommand.php b/packages/framework/src/Framework/Commands/HydeBuildRssFeedCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeBuildRssFeedCommand.php
rename to packages/framework/src/Framework/Commands/HydeBuildRssFeedCommand.php
diff --git a/packages/framework/src/Commands/HydeBuildSearchCommand.php b/packages/framework/src/Framework/Commands/HydeBuildSearchCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeBuildSearchCommand.php
rename to packages/framework/src/Framework/Commands/HydeBuildSearchCommand.php
diff --git a/packages/framework/src/Commands/HydeBuildSiteCommand.php b/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeBuildSiteCommand.php
rename to packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
diff --git a/packages/framework/src/Commands/HydeBuildSitemapCommand.php b/packages/framework/src/Framework/Commands/HydeBuildSitemapCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeBuildSitemapCommand.php
rename to packages/framework/src/Framework/Commands/HydeBuildSitemapCommand.php
diff --git a/packages/framework/src/Commands/HydeDebugCommand.php b/packages/framework/src/Framework/Commands/HydeDebugCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeDebugCommand.php
rename to packages/framework/src/Framework/Commands/HydeDebugCommand.php
diff --git a/packages/framework/src/Commands/HydeMakePageCommand.php b/packages/framework/src/Framework/Commands/HydeMakePageCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeMakePageCommand.php
rename to packages/framework/src/Framework/Commands/HydeMakePageCommand.php
diff --git a/packages/framework/src/Commands/HydeMakePostCommand.php b/packages/framework/src/Framework/Commands/HydeMakePostCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeMakePostCommand.php
rename to packages/framework/src/Framework/Commands/HydeMakePostCommand.php
diff --git a/packages/framework/src/Commands/HydePackageDiscoverCommand.php b/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydePackageDiscoverCommand.php
rename to packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
diff --git a/packages/framework/src/Commands/HydePublishHomepageCommand.php b/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydePublishHomepageCommand.php
rename to packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
diff --git a/packages/framework/src/Commands/HydePublishViewsCommand.php b/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydePublishViewsCommand.php
rename to packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
diff --git a/packages/framework/src/Commands/HydeRebuildStaticSiteCommand.php b/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeRebuildStaticSiteCommand.php
rename to packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
diff --git a/packages/framework/src/Commands/HydeRouteListCommand.php b/packages/framework/src/Framework/Commands/HydeRouteListCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeRouteListCommand.php
rename to packages/framework/src/Framework/Commands/HydeRouteListCommand.php
diff --git a/packages/framework/src/Commands/HydeServeCommand.php b/packages/framework/src/Framework/Commands/HydeServeCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeServeCommand.php
rename to packages/framework/src/Framework/Commands/HydeServeCommand.php
diff --git a/packages/framework/src/Commands/HydeUpdateConfigsCommand.php b/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeUpdateConfigsCommand.php
rename to packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
diff --git a/packages/framework/src/Commands/HydeValidateCommand.php b/packages/framework/src/Framework/Commands/HydeValidateCommand.php
similarity index 100%
rename from packages/framework/src/Commands/HydeValidateCommand.php
rename to packages/framework/src/Framework/Commands/HydeValidateCommand.php
diff --git a/packages/framework/src/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
similarity index 100%
rename from packages/framework/src/Concerns/AbstractBuildTask.php
rename to packages/framework/src/Framework/Concerns/AbstractBuildTask.php
diff --git a/packages/framework/src/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
similarity index 100%
rename from packages/framework/src/Concerns/BaseMarkdownPage.php
rename to packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
diff --git a/packages/framework/src/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
similarity index 100%
rename from packages/framework/src/Concerns/HydePage.php
rename to packages/framework/src/Framework/Concerns/HydePage.php
diff --git a/packages/framework/src/Concerns/InteractsWithDirectories.php b/packages/framework/src/Framework/Concerns/InteractsWithDirectories.php
similarity index 100%
rename from packages/framework/src/Concerns/InteractsWithDirectories.php
rename to packages/framework/src/Framework/Concerns/InteractsWithDirectories.php
diff --git a/packages/framework/src/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
similarity index 100%
rename from packages/framework/src/Concerns/Internal/ConstructsPageSchemas.php
rename to packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
diff --git a/packages/framework/src/Concerns/Internal/SetsUpMarkdownConverter.php b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
similarity index 100%
rename from packages/framework/src/Concerns/Internal/SetsUpMarkdownConverter.php
rename to packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
diff --git a/packages/framework/src/Concerns/JsonSerializesArrayable.php b/packages/framework/src/Framework/Concerns/JsonSerializesArrayable.php
similarity index 100%
rename from packages/framework/src/Concerns/JsonSerializesArrayable.php
rename to packages/framework/src/Framework/Concerns/JsonSerializesArrayable.php
diff --git a/packages/framework/src/Concerns/RegistersFileLocations.php b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
similarity index 100%
rename from packages/framework/src/Concerns/RegistersFileLocations.php
rename to packages/framework/src/Framework/Concerns/RegistersFileLocations.php
diff --git a/packages/framework/src/Concerns/ValidatesExistence.php b/packages/framework/src/Framework/Concerns/ValidatesExistence.php
similarity index 100%
rename from packages/framework/src/Concerns/ValidatesExistence.php
rename to packages/framework/src/Framework/Concerns/ValidatesExistence.php
diff --git a/packages/framework/src/Contracts/BuildTaskContract.php b/packages/framework/src/Framework/Contracts/BuildTaskContract.php
similarity index 100%
rename from packages/framework/src/Contracts/BuildTaskContract.php
rename to packages/framework/src/Framework/Contracts/BuildTaskContract.php
diff --git a/packages/framework/src/Contracts/CompilableContract.php b/packages/framework/src/Framework/Contracts/CompilableContract.php
similarity index 100%
rename from packages/framework/src/Contracts/CompilableContract.php
rename to packages/framework/src/Framework/Contracts/CompilableContract.php
diff --git a/packages/framework/src/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
similarity index 100%
rename from packages/framework/src/Contracts/FrontMatter/BlogPostSchema.php
rename to packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
diff --git a/packages/framework/src/Contracts/FrontMatter/DocumentationPageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
similarity index 100%
rename from packages/framework/src/Contracts/FrontMatter/DocumentationPageSchema.php
rename to packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
diff --git a/packages/framework/src/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/PageSchema.php
similarity index 100%
rename from packages/framework/src/Contracts/FrontMatter/PageSchema.php
rename to packages/framework/src/Framework/Contracts/FrontMatter/PageSchema.php
diff --git a/packages/framework/src/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
similarity index 100%
rename from packages/framework/src/Contracts/FrontMatter/Support/FeaturedImageSchema.php
rename to packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
diff --git a/packages/framework/src/Contracts/FrontMatter/Support/NavigationSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
similarity index 100%
rename from packages/framework/src/Contracts/FrontMatter/Support/NavigationSchema.php
rename to packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
diff --git a/packages/framework/src/Contracts/MarkdownDocumentContract.php b/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
similarity index 100%
rename from packages/framework/src/Contracts/MarkdownDocumentContract.php
rename to packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
diff --git a/packages/framework/src/Contracts/MarkdownPostProcessorContract.php b/packages/framework/src/Framework/Contracts/MarkdownPostProcessorContract.php
similarity index 100%
rename from packages/framework/src/Contracts/MarkdownPostProcessorContract.php
rename to packages/framework/src/Framework/Contracts/MarkdownPostProcessorContract.php
diff --git a/packages/framework/src/Contracts/MarkdownPreProcessorContract.php b/packages/framework/src/Framework/Contracts/MarkdownPreProcessorContract.php
similarity index 100%
rename from packages/framework/src/Contracts/MarkdownPreProcessorContract.php
rename to packages/framework/src/Framework/Contracts/MarkdownPreProcessorContract.php
diff --git a/packages/framework/src/Contracts/MarkdownShortcodeContract.php b/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
similarity index 100%
rename from packages/framework/src/Contracts/MarkdownShortcodeContract.php
rename to packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
diff --git a/packages/framework/src/Exceptions/BaseUrlNotSetException.php b/packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php
similarity index 100%
rename from packages/framework/src/Exceptions/BaseUrlNotSetException.php
rename to packages/framework/src/Framework/Exceptions/BaseUrlNotSetException.php
diff --git a/packages/framework/src/Exceptions/FileConflictException.php b/packages/framework/src/Framework/Exceptions/FileConflictException.php
similarity index 100%
rename from packages/framework/src/Exceptions/FileConflictException.php
rename to packages/framework/src/Framework/Exceptions/FileConflictException.php
diff --git a/packages/framework/src/Exceptions/FileNotFoundException.php b/packages/framework/src/Framework/Exceptions/FileNotFoundException.php
similarity index 100%
rename from packages/framework/src/Exceptions/FileNotFoundException.php
rename to packages/framework/src/Framework/Exceptions/FileNotFoundException.php
diff --git a/packages/framework/src/Exceptions/RouteNotFoundException.php b/packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
similarity index 100%
rename from packages/framework/src/Exceptions/RouteNotFoundException.php
rename to packages/framework/src/Framework/Exceptions/RouteNotFoundException.php
diff --git a/packages/framework/src/Exceptions/UnsupportedPageTypeException.php b/packages/framework/src/Framework/Exceptions/UnsupportedPageTypeException.php
similarity index 100%
rename from packages/framework/src/Exceptions/UnsupportedPageTypeException.php
rename to packages/framework/src/Framework/Exceptions/UnsupportedPageTypeException.php
diff --git a/packages/framework/src/Foundation/Application.php b/packages/framework/src/Framework/Foundation/Application.php
similarity index 100%
rename from packages/framework/src/Foundation/Application.php
rename to packages/framework/src/Framework/Foundation/Application.php
diff --git a/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php b/packages/framework/src/Framework/Foundation/Concerns/BaseFoundationCollection.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
rename to packages/framework/src/Framework/Foundation/Concerns/BaseFoundationCollection.php
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Framework/Foundation/Concerns/ForwardsFilesystem.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
rename to packages/framework/src/Framework/Foundation/Concerns/ForwardsFilesystem.php
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Framework/Foundation/Concerns/ForwardsHyperlinks.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
rename to packages/framework/src/Framework/Foundation/Concerns/ForwardsHyperlinks.php
diff --git a/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php b/packages/framework/src/Framework/Foundation/Concerns/HandlesFoundationCollections.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
rename to packages/framework/src/Framework/Foundation/Concerns/HandlesFoundationCollections.php
diff --git a/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php b/packages/framework/src/Framework/Foundation/Concerns/ImplementsStringHelpers.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
rename to packages/framework/src/Framework/Foundation/Concerns/ImplementsStringHelpers.php
diff --git a/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php b/packages/framework/src/Framework/Foundation/Concerns/ManagesHydeKernel.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
rename to packages/framework/src/Framework/Foundation/Concerns/ManagesHydeKernel.php
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Framework/Foundation/Concerns/ManagesViewData.php
similarity index 100%
rename from packages/framework/src/Foundation/Concerns/ManagesViewData.php
rename to packages/framework/src/Framework/Foundation/Concerns/ManagesViewData.php
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Framework/Foundation/FileCollection.php
similarity index 100%
rename from packages/framework/src/Foundation/FileCollection.php
rename to packages/framework/src/Framework/Foundation/FileCollection.php
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Framework/Foundation/Filesystem.php
similarity index 100%
rename from packages/framework/src/Foundation/Filesystem.php
rename to packages/framework/src/Framework/Foundation/Filesystem.php
diff --git a/packages/framework/src/Foundation/Hyperlinks.php b/packages/framework/src/Framework/Foundation/Hyperlinks.php
similarity index 100%
rename from packages/framework/src/Foundation/Hyperlinks.php
rename to packages/framework/src/Framework/Foundation/Hyperlinks.php
diff --git a/packages/framework/src/Foundation/PageCollection.php b/packages/framework/src/Framework/Foundation/PageCollection.php
similarity index 100%
rename from packages/framework/src/Foundation/PageCollection.php
rename to packages/framework/src/Framework/Foundation/PageCollection.php
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Framework/Foundation/RouteCollection.php
similarity index 100%
rename from packages/framework/src/Foundation/RouteCollection.php
rename to packages/framework/src/Framework/Foundation/RouteCollection.php
diff --git a/packages/framework/src/Helpers/Asset.php b/packages/framework/src/Framework/Helpers/Asset.php
similarity index 100%
rename from packages/framework/src/Helpers/Asset.php
rename to packages/framework/src/Framework/Helpers/Asset.php
diff --git a/packages/framework/src/Helpers/Features.php b/packages/framework/src/Framework/Helpers/Features.php
similarity index 100%
rename from packages/framework/src/Helpers/Features.php
rename to packages/framework/src/Framework/Helpers/Features.php
diff --git a/packages/framework/src/Helpers/Includes.php b/packages/framework/src/Framework/Helpers/Includes.php
similarity index 100%
rename from packages/framework/src/Helpers/Includes.php
rename to packages/framework/src/Framework/Helpers/Includes.php
diff --git a/packages/framework/src/Helpers/Meta.php b/packages/framework/src/Framework/Helpers/Meta.php
similarity index 100%
rename from packages/framework/src/Helpers/Meta.php
rename to packages/framework/src/Framework/Helpers/Meta.php
diff --git a/packages/framework/src/Helpers/Redirect.php b/packages/framework/src/Framework/Helpers/Redirect.php
similarity index 100%
rename from packages/framework/src/Helpers/Redirect.php
rename to packages/framework/src/Framework/Helpers/Redirect.php
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Framework/Hyde.php
similarity index 100%
rename from packages/framework/src/Hyde.php
rename to packages/framework/src/Framework/Hyde.php
diff --git a/packages/framework/src/HydeKernel.php b/packages/framework/src/Framework/HydeKernel.php
similarity index 100%
rename from packages/framework/src/HydeKernel.php
rename to packages/framework/src/Framework/HydeKernel.php
diff --git a/packages/framework/src/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
similarity index 100%
rename from packages/framework/src/HydeServiceProvider.php
rename to packages/framework/src/Framework/HydeServiceProvider.php
diff --git a/packages/framework/src/Models/Markdown/FrontMatter.php b/packages/framework/src/Framework/Models/Markdown/FrontMatter.php
similarity index 100%
rename from packages/framework/src/Models/Markdown/FrontMatter.php
rename to packages/framework/src/Framework/Models/Markdown/FrontMatter.php
diff --git a/packages/framework/src/Models/Markdown/Markdown.php b/packages/framework/src/Framework/Models/Markdown/Markdown.php
similarity index 100%
rename from packages/framework/src/Models/Markdown/Markdown.php
rename to packages/framework/src/Framework/Models/Markdown/Markdown.php
diff --git a/packages/framework/src/Models/Markdown/MarkdownDocument.php b/packages/framework/src/Framework/Models/Markdown/MarkdownDocument.php
similarity index 100%
rename from packages/framework/src/Models/Markdown/MarkdownDocument.php
rename to packages/framework/src/Framework/Models/Markdown/MarkdownDocument.php
diff --git a/packages/framework/src/Models/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
similarity index 100%
rename from packages/framework/src/Models/Navigation/DocumentationSidebar.php
rename to packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
diff --git a/packages/framework/src/Models/Navigation/NavItem.php b/packages/framework/src/Framework/Models/Navigation/NavItem.php
similarity index 100%
rename from packages/framework/src/Models/Navigation/NavItem.php
rename to packages/framework/src/Framework/Models/Navigation/NavItem.php
diff --git a/packages/framework/src/Models/Navigation/NavigationData.php b/packages/framework/src/Framework/Models/Navigation/NavigationData.php
similarity index 100%
rename from packages/framework/src/Models/Navigation/NavigationData.php
rename to packages/framework/src/Framework/Models/Navigation/NavigationData.php
diff --git a/packages/framework/src/Models/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
similarity index 100%
rename from packages/framework/src/Models/Navigation/NavigationMenu.php
rename to packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
diff --git a/packages/framework/src/Models/Pages/BladePage.php b/packages/framework/src/Framework/Models/Pages/BladePage.php
similarity index 100%
rename from packages/framework/src/Models/Pages/BladePage.php
rename to packages/framework/src/Framework/Models/Pages/BladePage.php
diff --git a/packages/framework/src/Models/Pages/DocumentationPage.php b/packages/framework/src/Framework/Models/Pages/DocumentationPage.php
similarity index 100%
rename from packages/framework/src/Models/Pages/DocumentationPage.php
rename to packages/framework/src/Framework/Models/Pages/DocumentationPage.php
diff --git a/packages/framework/src/Models/Pages/HtmlPage.php b/packages/framework/src/Framework/Models/Pages/HtmlPage.php
similarity index 100%
rename from packages/framework/src/Models/Pages/HtmlPage.php
rename to packages/framework/src/Framework/Models/Pages/HtmlPage.php
diff --git a/packages/framework/src/Models/Pages/MarkdownPage.php b/packages/framework/src/Framework/Models/Pages/MarkdownPage.php
similarity index 100%
rename from packages/framework/src/Models/Pages/MarkdownPage.php
rename to packages/framework/src/Framework/Models/Pages/MarkdownPage.php
diff --git a/packages/framework/src/Models/Pages/MarkdownPost.php b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
similarity index 100%
rename from packages/framework/src/Models/Pages/MarkdownPost.php
rename to packages/framework/src/Framework/Models/Pages/MarkdownPost.php
diff --git a/packages/framework/src/Models/Support/Author.php b/packages/framework/src/Framework/Models/Support/Author.php
similarity index 100%
rename from packages/framework/src/Models/Support/Author.php
rename to packages/framework/src/Framework/Models/Support/Author.php
diff --git a/packages/framework/src/Models/Support/DateString.php b/packages/framework/src/Framework/Models/Support/DateString.php
similarity index 100%
rename from packages/framework/src/Models/Support/DateString.php
rename to packages/framework/src/Framework/Models/Support/DateString.php
diff --git a/packages/framework/src/Models/Support/File.php b/packages/framework/src/Framework/Models/Support/File.php
similarity index 100%
rename from packages/framework/src/Models/Support/File.php
rename to packages/framework/src/Framework/Models/Support/File.php
diff --git a/packages/framework/src/Models/Support/Image.php b/packages/framework/src/Framework/Models/Support/Image.php
similarity index 100%
rename from packages/framework/src/Models/Support/Image.php
rename to packages/framework/src/Framework/Models/Support/Image.php
diff --git a/packages/framework/src/Models/Support/Route.php b/packages/framework/src/Framework/Models/Support/Route.php
similarity index 100%
rename from packages/framework/src/Models/Support/Route.php
rename to packages/framework/src/Framework/Models/Support/Route.php
diff --git a/packages/framework/src/Models/Support/Site.php b/packages/framework/src/Framework/Models/Support/Site.php
similarity index 100%
rename from packages/framework/src/Models/Support/Site.php
rename to packages/framework/src/Framework/Models/Support/Site.php
diff --git a/packages/framework/src/Models/Support/ValidationResult.php b/packages/framework/src/Framework/Models/Support/ValidationResult.php
similarity index 100%
rename from packages/framework/src/Models/Support/ValidationResult.php
rename to packages/framework/src/Framework/Models/Support/ValidationResult.php
diff --git a/packages/framework/src/Modules/DataCollections/DataCollection.php b/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
similarity index 100%
rename from packages/framework/src/Modules/DataCollections/DataCollection.php
rename to packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
diff --git a/packages/framework/src/Modules/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
similarity index 100%
rename from packages/framework/src/Modules/DataCollections/DataCollectionServiceProvider.php
rename to packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
diff --git a/packages/framework/src/Modules/DataCollections/Facades/MarkdownCollection.php b/packages/framework/src/Framework/Modules/DataCollections/Facades/MarkdownCollection.php
similarity index 100%
rename from packages/framework/src/Modules/DataCollections/Facades/MarkdownCollection.php
rename to packages/framework/src/Framework/Modules/DataCollections/Facades/MarkdownCollection.php
diff --git a/packages/framework/src/Modules/Markdown/BladeDownProcessor.php b/packages/framework/src/Framework/Modules/Markdown/BladeDownProcessor.php
similarity index 100%
rename from packages/framework/src/Modules/Markdown/BladeDownProcessor.php
rename to packages/framework/src/Framework/Modules/Markdown/BladeDownProcessor.php
diff --git a/packages/framework/src/Modules/Markdown/CodeblockFilepathProcessor.php b/packages/framework/src/Framework/Modules/Markdown/CodeblockFilepathProcessor.php
similarity index 100%
rename from packages/framework/src/Modules/Markdown/CodeblockFilepathProcessor.php
rename to packages/framework/src/Framework/Modules/Markdown/CodeblockFilepathProcessor.php
diff --git a/packages/framework/src/Modules/Markdown/ShortcodeProcessor.php b/packages/framework/src/Framework/Modules/Markdown/ShortcodeProcessor.php
similarity index 100%
rename from packages/framework/src/Modules/Markdown/ShortcodeProcessor.php
rename to packages/framework/src/Framework/Modules/Markdown/ShortcodeProcessor.php
diff --git a/packages/framework/src/Modules/Markdown/Shortcodes/ColoredBlockquotes.php b/packages/framework/src/Framework/Modules/Markdown/Shortcodes/ColoredBlockquotes.php
similarity index 100%
rename from packages/framework/src/Modules/Markdown/Shortcodes/ColoredBlockquotes.php
rename to packages/framework/src/Framework/Modules/Markdown/Shortcodes/ColoredBlockquotes.php
diff --git a/packages/framework/src/Modules/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/GlobalMetadataBag.php
rename to packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
diff --git a/packages/framework/src/Modules/Metadata/MetadataBag.php b/packages/framework/src/Framework/Modules/Metadata/MetadataBag.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/MetadataBag.php
rename to packages/framework/src/Framework/Modules/Metadata/MetadataBag.php
diff --git a/packages/framework/src/Modules/Metadata/MetadataElementContract.php b/packages/framework/src/Framework/Modules/Metadata/MetadataElementContract.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/MetadataElementContract.php
rename to packages/framework/src/Framework/Modules/Metadata/MetadataElementContract.php
diff --git a/packages/framework/src/Modules/Metadata/Models/LinkElement.php b/packages/framework/src/Framework/Modules/Metadata/Models/LinkElement.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/Models/LinkElement.php
rename to packages/framework/src/Framework/Modules/Metadata/Models/LinkElement.php
diff --git a/packages/framework/src/Modules/Metadata/Models/MetadataElement.php b/packages/framework/src/Framework/Modules/Metadata/Models/MetadataElement.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/Models/MetadataElement.php
rename to packages/framework/src/Framework/Modules/Metadata/Models/MetadataElement.php
diff --git a/packages/framework/src/Modules/Metadata/Models/OpenGraphElement.php b/packages/framework/src/Framework/Modules/Metadata/Models/OpenGraphElement.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/Models/OpenGraphElement.php
rename to packages/framework/src/Framework/Modules/Metadata/Models/OpenGraphElement.php
diff --git a/packages/framework/src/Modules/Metadata/PageMetadataBag.php b/packages/framework/src/Framework/Modules/Metadata/PageMetadataBag.php
similarity index 100%
rename from packages/framework/src/Modules/Metadata/PageMetadataBag.php
rename to packages/framework/src/Framework/Modules/Metadata/PageMetadataBag.php
diff --git a/packages/framework/src/Modules/README.md b/packages/framework/src/Framework/Modules/README.md
similarity index 100%
rename from packages/framework/src/Modules/README.md
rename to packages/framework/src/Framework/Modules/README.md
diff --git a/packages/framework/src/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
similarity index 100%
rename from packages/framework/src/Services/AssetService.php
rename to packages/framework/src/Framework/Services/AssetService.php
diff --git a/packages/framework/src/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
similarity index 100%
rename from packages/framework/src/Services/BuildService.php
rename to packages/framework/src/Framework/Services/BuildService.php
diff --git a/packages/framework/src/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
similarity index 100%
rename from packages/framework/src/Services/BuildTaskService.php
rename to packages/framework/src/Framework/Services/BuildTaskService.php
diff --git a/packages/framework/src/Services/ChecksumService.php b/packages/framework/src/Framework/Services/ChecksumService.php
similarity index 100%
rename from packages/framework/src/Services/ChecksumService.php
rename to packages/framework/src/Framework/Services/ChecksumService.php
diff --git a/packages/framework/src/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
similarity index 100%
rename from packages/framework/src/Services/DiscoveryService.php
rename to packages/framework/src/Framework/Services/DiscoveryService.php
diff --git a/packages/framework/src/Services/DocumentationSearchService.php b/packages/framework/src/Framework/Services/DocumentationSearchService.php
similarity index 100%
rename from packages/framework/src/Services/DocumentationSearchService.php
rename to packages/framework/src/Framework/Services/DocumentationSearchService.php
diff --git a/packages/framework/src/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
similarity index 100%
rename from packages/framework/src/Services/MarkdownService.php
rename to packages/framework/src/Framework/Services/MarkdownService.php
diff --git a/packages/framework/src/Services/RebuildService.php b/packages/framework/src/Framework/Services/RebuildService.php
similarity index 100%
rename from packages/framework/src/Services/RebuildService.php
rename to packages/framework/src/Framework/Services/RebuildService.php
diff --git a/packages/framework/src/Services/RssFeedService.php b/packages/framework/src/Framework/Services/RssFeedService.php
similarity index 100%
rename from packages/framework/src/Services/RssFeedService.php
rename to packages/framework/src/Framework/Services/RssFeedService.php
diff --git a/packages/framework/src/Services/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
similarity index 100%
rename from packages/framework/src/Services/SemanticDocumentationArticle.php
rename to packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
diff --git a/packages/framework/src/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
similarity index 100%
rename from packages/framework/src/Services/SitemapService.php
rename to packages/framework/src/Framework/Services/SitemapService.php
diff --git a/packages/framework/src/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
similarity index 100%
rename from packages/framework/src/Services/ValidationService.php
rename to packages/framework/src/Framework/Services/ValidationService.php
diff --git a/packages/framework/src/Services/YamlConfigurationService.php b/packages/framework/src/Framework/Services/YamlConfigurationService.php
similarity index 100%
rename from packages/framework/src/Services/YamlConfigurationService.php
rename to packages/framework/src/Framework/Services/YamlConfigurationService.php
diff --git a/packages/framework/src/Views/Components/LinkComponent.php b/packages/framework/src/Framework/Views/Components/LinkComponent.php
similarity index 100%
rename from packages/framework/src/Views/Components/LinkComponent.php
rename to packages/framework/src/Framework/Views/Components/LinkComponent.php
diff --git a/packages/framework/src/helpers.php b/packages/framework/src/Framework/helpers.php
similarity index 100%
rename from packages/framework/src/helpers.php
rename to packages/framework/src/Framework/helpers.php

From 4050b5b8889c507bf104ba29ff53a2dd9741761c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 18:47:48 +0200
Subject: [PATCH 002/768] Update namespace mapping

---
 packages/framework/composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/composer.json b/packages/framework/composer.json
index e2a637bd149..01cd127ead2 100644
--- a/packages/framework/composer.json
+++ b/packages/framework/composer.json
@@ -4,10 +4,10 @@
     "license": "MIT",
     "autoload": {
         "psr-4": {
-            "Hyde\\Framework\\": "src/"
+            "Hyde\\": "src/"
         },
         "files": [
-            "src/helpers.php"
+            "src/Framework/helpers.php"
         ]
     },
     "autoload-dev": {

From 089abf7d3bd8d57252b767d75f5c63f8bfa70d46 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 18:54:50 +0200
Subject: [PATCH 003/768] Update composer.lock

---
 composer.lock | 96 +++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3f334fc890a..62617ccfa8a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -707,16 +707,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.1",
+            "version": "2.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
+                "reference": "67c26b443f348a51926030c83481b85718457d3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+                "reference": "67c26b443f348a51926030c83481b85718457d3d",
                 "shasum": ""
             },
             "require": {
@@ -806,7 +806,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.3"
             },
             "funding": [
                 {
@@ -822,7 +822,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:45:39+00:00"
+            "time": "2022-10-26T14:07:24+00:00"
         },
         {
             "name": "hyde/framework",
@@ -830,7 +830,7 @@
             "dist": {
                 "type": "path",
                 "url": "./packages/framework",
-                "reference": "d94d45d9d9ccbb6948656eee2c15e60dc02f437b"
+                "reference": "322dce9cf80a72175eb027dbc9d151accabcb42c"
             },
             "require": {
                 "illuminate/support": "^9.5",
@@ -849,10 +849,10 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Hyde\\Framework\\": "src/"
+                    "Hyde\\": "src/"
                 },
                 "files": [
-                    "src/helpers.php"
+                    "src/Framework/helpers.php"
                 ]
             },
             "autoload-dev": {
@@ -876,7 +876,7 @@
         },
         {
             "name": "illuminate/bus",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/bus.git",
@@ -929,7 +929,7 @@
         },
         {
             "name": "illuminate/cache",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/cache.git",
@@ -989,7 +989,7 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
@@ -1044,7 +1044,7 @@
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -1090,7 +1090,7 @@
         },
         {
             "name": "illuminate/config",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/config.git",
@@ -1138,7 +1138,7 @@
         },
         {
             "name": "illuminate/console",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/console.git",
@@ -1200,7 +1200,7 @@
         },
         {
             "name": "illuminate/container",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
@@ -1251,7 +1251,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -1299,7 +1299,7 @@
         },
         {
             "name": "illuminate/events",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
@@ -1354,16 +1354,16 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "bdd396ccfe64a3dabe55cc06acf5971a027b7af5"
+                "reference": "05fdbbb60fa0bb17209d43ce231aa0a0bdf5465d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/bdd396ccfe64a3dabe55cc06acf5971a027b7af5",
-                "reference": "bdd396ccfe64a3dabe55cc06acf5971a027b7af5",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/05fdbbb60fa0bb17209d43ce231aa0a0bdf5465d",
+                "reference": "05fdbbb60fa0bb17209d43ce231aa0a0bdf5465d",
                 "shasum": ""
             },
             "require": {
@@ -1412,20 +1412,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-10-19T19:17:03+00:00"
+            "time": "2022-10-24T08:47:15+00:00"
         },
         {
             "name": "illuminate/http",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/http.git",
-                "reference": "3b9b03794016b3b8574d75d89936fad114ac13ff"
+                "reference": "211d9d77707adc1773ead9dba30537ad571c3c8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/http/zipball/3b9b03794016b3b8574d75d89936fad114ac13ff",
-                "reference": "3b9b03794016b3b8574d75d89936fad114ac13ff",
+                "url": "https://api.github.com/repos/illuminate/http/zipball/211d9d77707adc1773ead9dba30537ad571c3c8e",
+                "reference": "211d9d77707adc1773ead9dba30537ad571c3c8e",
                 "shasum": ""
             },
             "require": {
@@ -1471,11 +1471,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-10-20T13:48:43+00:00"
+            "time": "2022-10-24T13:29:55+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -1521,7 +1521,7 @@
         },
         {
             "name": "illuminate/pipeline",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/pipeline.git",
@@ -1569,7 +1569,7 @@
         },
         {
             "name": "illuminate/session",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/session.git",
@@ -1625,16 +1625,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "9cb95dbb30af8ee2fba58e732c0c472f7f77ade6"
+                "reference": "f194a3b1435ed4f2542d127efb8652c7d41980ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/9cb95dbb30af8ee2fba58e732c0c472f7f77ade6",
-                "reference": "9cb95dbb30af8ee2fba58e732c0c472f7f77ade6",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/f194a3b1435ed4f2542d127efb8652c7d41980ea",
+                "reference": "f194a3b1435ed4f2542d127efb8652c7d41980ea",
                 "shasum": ""
             },
             "require": {
@@ -1691,20 +1691,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-10-20T13:35:15+00:00"
+            "time": "2022-10-24T09:54:34+00:00"
         },
         {
             "name": "illuminate/testing",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/testing.git",
-                "reference": "8f4458aab2539496e411eb8bdf5cc8bfc60beec4"
+                "reference": "86e6618722fefa1059fb32518268199e6f267782"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/testing/zipball/8f4458aab2539496e411eb8bdf5cc8bfc60beec4",
-                "reference": "8f4458aab2539496e411eb8bdf5cc8bfc60beec4",
+                "url": "https://api.github.com/repos/illuminate/testing/zipball/86e6618722fefa1059fb32518268199e6f267782",
+                "reference": "86e6618722fefa1059fb32518268199e6f267782",
                 "shasum": ""
             },
             "require": {
@@ -1749,11 +1749,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-10-17T13:59:30+00:00"
+            "time": "2022-10-25T13:12:24+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v9.36.4",
+            "version": "v9.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
@@ -2202,16 +2202,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.10.1",
+            "version": "3.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "9857d7208a94fc63c7bf09caf223280e59ac7274"
+                "reference": "b9bd194b016114d6ff6765c09d40c7d427e4e3f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9857d7208a94fc63c7bf09caf223280e59ac7274",
-                "reference": "9857d7208a94fc63c7bf09caf223280e59ac7274",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b9bd194b016114d6ff6765c09d40c7d427e4e3f6",
+                "reference": "b9bd194b016114d6ff6765c09d40c7d427e4e3f6",
                 "shasum": ""
             },
             "require": {
@@ -2273,7 +2273,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.10.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.10.2"
             },
             "funding": [
                 {
@@ -2289,7 +2289,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-21T18:57:47+00:00"
+            "time": "2022-10-25T07:01:47+00:00"
         },
         {
             "name": "league/mime-type-detection",

From e08e6e999deb8e43bb4f8f186585fa3db4cfddc6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:05:26 +0200
Subject: [PATCH 004/768] Update sources

---
 .idea/develop.iml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/develop.iml b/.idea/develop.iml
index 5fc0fdeda3f..f3fc5e568d0 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -3,7 +3,7 @@
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="App\" />
-      <sourceFolder url="file://$MODULE_DIR$/packages/framework/src" isTestSource="false" packagePrefix="Hyde\Framework\" />
+      <sourceFolder url="file://$MODULE_DIR$/packages/framework/src" isTestSource="false" packagePrefix="Hyde\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests" isTestSource="true" packagePrefix="Hyde\Framework\Testing\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/realtime-compiler/src" isTestSource="false" packagePrefix="Hyde\RealtimeCompiler\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Hyde\Testing\" />

From 36deeade7f386559a06c2243bff2a2aac79f6709 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:06:19 +0200
Subject: [PATCH 005/768] Move main Hyde facade to root Hyde namespace

---
 config/app.php                                                | 4 ++--
 config/hyde.php                                               | 2 +-
 packages/framework/config/hyde.php                            | 2 +-
 .../framework/src/Framework/Actions/BladeMatterParser.php     | 2 +-
 .../Actions/Constructors/FindsContentLengthForImageObject.php | 2 +-
 .../src/Framework/Actions/Constructors/FindsTitleForPage.php  | 2 +-
 .../src/Framework/Actions/CreatesNewMarkdownPostFile.php      | 2 +-
 .../src/Framework/Actions/CreatesNewPageSourceFile.php        | 2 +-
 .../framework/src/Framework/Actions/MarkdownFileParser.php    | 2 +-
 .../Actions/PostBuildTasks/GenerateBuildManifest.php          | 2 +-
 .../src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php  | 2 +-
 .../src/Framework/Actions/PostBuildTasks/GenerateSitemap.php  | 2 +-
 .../framework/src/Framework/Actions/PublishesHomepageView.php | 2 +-
 .../framework/src/Framework/Actions/PublishesHydeViews.php    | 2 +-
 .../framework/src/Framework/Actions/StaticPageBuilder.php     | 2 +-
 .../framework/src/Framework/Commands/HydeBuildSiteCommand.php | 2 +-
 .../framework/src/Framework/Commands/HydeDebugCommand.php     | 2 +-
 .../src/Framework/Commands/HydePackageDiscoverCommand.php     | 2 +-
 .../src/Framework/Commands/HydePublishHomepageCommand.php     | 2 +-
 .../src/Framework/Commands/HydePublishViewsCommand.php        | 2 +-
 .../src/Framework/Commands/HydeRebuildStaticSiteCommand.php   | 2 +-
 .../framework/src/Framework/Commands/HydeRouteListCommand.php | 2 +-
 .../framework/src/Framework/Commands/HydeServeCommand.php     | 2 +-
 .../src/Framework/Commands/HydeUpdateConfigsCommand.php       | 2 +-
 .../framework/src/Framework/Concerns/AbstractBuildTask.php    | 2 +-
 .../framework/src/Framework/Concerns/BaseMarkdownPage.php     | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php        | 2 +-
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 2 +-
 .../framework/src/Framework/Concerns/ValidatesExistence.php   | 2 +-
 packages/framework/src/Framework/Foundation/Filesystem.php    | 2 +-
 packages/framework/src/Framework/Helpers/Features.php         | 2 +-
 packages/framework/src/Framework/Helpers/Includes.php         | 2 +-
 packages/framework/src/Framework/Helpers/Redirect.php         | 2 +-
 packages/framework/src/Framework/HydeKernel.php               | 2 +-
 packages/framework/src/Framework/HydeServiceProvider.php      | 1 +
 .../src/Framework/Models/Navigation/DocumentationSidebar.php  | 2 +-
 .../framework/src/Framework/Models/Navigation/NavItem.php     | 2 +-
 .../src/Framework/Models/Navigation/NavigationMenu.php        | 2 +-
 packages/framework/src/Framework/Models/Support/File.php      | 2 +-
 packages/framework/src/Framework/Models/Support/Image.php     | 2 +-
 packages/framework/src/Framework/Models/Support/Route.php     | 2 +-
 .../src/Framework/Modules/DataCollections/DataCollection.php  | 2 +-
 .../Modules/DataCollections/DataCollectionServiceProvider.php | 2 +-
 .../src/Framework/Modules/Metadata/GlobalMetadataBag.php      | 2 +-
 packages/framework/src/Framework/Services/AssetService.php    | 2 +-
 packages/framework/src/Framework/Services/BuildService.php    | 2 +-
 .../framework/src/Framework/Services/BuildTaskService.php     | 2 +-
 packages/framework/src/Framework/Services/ChecksumService.php | 2 +-
 .../framework/src/Framework/Services/DiscoveryService.php     | 2 +-
 .../src/Framework/Services/DocumentationSearchService.php     | 2 +-
 packages/framework/src/Framework/Services/RebuildService.php  | 2 +-
 packages/framework/src/Framework/Services/RssFeedService.php  | 2 +-
 packages/framework/src/Framework/Services/SitemapService.php  | 2 +-
 .../framework/src/Framework/Services/ValidationService.php    | 2 +-
 .../src/Framework/Services/YamlConfigurationService.php       | 2 +-
 .../src/Framework/Views/Components/LinkComponent.php          | 2 +-
 packages/framework/src/{Framework => }/Hyde.php               | 3 ++-
 .../tests/Feature/Actions/CreatesNewPageSourceFileTest.php    | 2 +-
 .../tests/Feature/Actions/PublishesHomepageViewTest.php       | 2 +-
 .../tests/Feature/Actions/PublishesHydeViewsTest.php          | 2 +-
 packages/framework/tests/Feature/AssetServiceTest.php         | 2 +-
 .../framework/tests/Feature/AuthorPostsIntegrationTest.php    | 2 +-
 .../tests/Feature/BuildOutputDirectoryCanBeChangedTest.php    | 2 +-
 .../tests/Feature/Commands/HydeBuildRssFeedCommandTest.php    | 2 +-
 .../tests/Feature/Commands/HydeBuildSearchCommandTest.php     | 2 +-
 .../tests/Feature/Commands/HydeBuildSitemapCommandTest.php    | 2 +-
 .../tests/Feature/Commands/HydeMakePageCommandTest.php        | 2 +-
 .../tests/Feature/Commands/HydePackageDiscoverCommandTest.php | 2 +-
 .../tests/Feature/Commands/HydePublishHomepageCommandTest.php | 2 +-
 .../tests/Feature/Commands/HydePublishViewsCommandTest.php    | 2 +-
 .../Feature/Commands/HydeRebuildStaticSiteCommandTest.php     | 2 +-
 .../tests/Feature/Commands/HydeUpdateConfigsCommandTest.php   | 2 +-
 .../framework/tests/Feature/Commands/MakePostCommandTest.php  | 2 +-
 .../Feature/Commands/StaticSiteBuilderPostModuleTest.php      | 2 +-
 packages/framework/tests/Feature/DataCollectionTest.php       | 2 +-
 packages/framework/tests/Feature/DiscoveryServiceTest.php     | 2 +-
 packages/framework/tests/Feature/FileCollectionTest.php       | 2 +-
 packages/framework/tests/Feature/FileTest.php                 | 2 +-
 .../framework/tests/Feature/Foundation/FilesystemTest.php     | 2 +-
 packages/framework/tests/Feature/HelpersTest.php              | 2 +-
 packages/framework/tests/Feature/HydeKernelTest.php           | 4 ++--
 packages/framework/tests/Feature/HydePageTest.php             | 2 +-
 packages/framework/tests/Feature/IncludesFacadeTest.php       | 2 +-
 packages/framework/tests/Feature/MarkdownFileParserTest.php   | 2 +-
 packages/framework/tests/Feature/MarkdownPageTest.php         | 2 +-
 packages/framework/tests/Feature/MetadataViewTest.php         | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php       | 2 +-
 packages/framework/tests/Feature/PageCollectionTest.php       | 2 +-
 .../framework/tests/Feature/PageModelConstructorsTest.php     | 2 +-
 packages/framework/tests/Feature/RedirectTest.php             | 2 +-
 packages/framework/tests/Feature/RouteCollectionTest.php      | 2 +-
 packages/framework/tests/Feature/RouteTest.php                | 2 +-
 .../framework/tests/Feature/Services/BuildTaskServiceTest.php | 2 +-
 .../framework/tests/Feature/Services/ChecksumServiceTest.php  | 2 +-
 .../tests/Feature/Services/DocumentationSearchServiceTest.php | 2 +-
 .../tests/Feature/Services/DocumentationSidebarTest.php       | 2 +-
 .../framework/tests/Feature/Services/HydeSmartDocsTest.php    | 2 +-
 .../framework/tests/Feature/Services/RssFeedServiceTest.php   | 2 +-
 .../framework/tests/Feature/Services/SitemapServiceTest.php   | 2 +-
 .../tests/Feature/Services/ValidationServiceTest.php          | 2 +-
 .../tests/Feature/SourceDirectoriesCanBeChangedTest.php       | 2 +-
 packages/framework/tests/Feature/StaticPageBuilderTest.php    | 2 +-
 packages/framework/tests/Feature/StaticSiteServiceTest.php    | 2 +-
 .../tests/Unit/BlogPostFrontMatterIsOptionalTest.php          | 2 +-
 packages/framework/tests/Unit/DocumentationPageTest.php       | 2 +-
 .../Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php   | 2 +-
 .../tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php     | 2 +-
 packages/framework/tests/Unit/GenerateBuildManifestTest.php   | 2 +-
 packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php  | 2 +-
 .../framework/tests/Unit/HydeBasePathCanBeChangedTest.php     | 2 +-
 .../framework/tests/Unit/HydeConfigFilesAreMatchingTest.php   | 2 +-
 packages/framework/tests/Unit/HydeFileHelpersTest.php         | 2 +-
 .../framework/tests/Unit/HydeGetBasePathHasFallbackTest.php   | 2 +-
 .../framework/tests/Unit/HydeHelperFacadeMakeTitleTest.php    | 2 +-
 packages/framework/tests/Unit/HydeHelperFacadeTest.php        | 2 +-
 packages/framework/tests/Unit/HydePathHelperTest.php          | 2 +-
 packages/framework/tests/Unit/HydeServiceProviderTest.php     | 2 +-
 packages/framework/tests/Unit/HydeVendorPathHelperTest.php    | 2 +-
 .../tests/Unit/InteractsWithDirectoriesConcernTest.php        | 2 +-
 packages/framework/tests/Unit/MarkdownDocumentTest.php        | 2 +-
 packages/framework/tests/Unit/MarkdownPostParserTest.php      | 2 +-
 .../framework/tests/Unit/PageModelGetAllFilesHelperTest.php   | 2 +-
 packages/framework/tests/Unit/PageModelGetHelperTest.php      | 2 +-
 packages/framework/tests/Unit/PageModelParseHelperTest.php    | 2 +-
 .../Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php     | 2 +-
 .../Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php  | 2 +-
 .../TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php  | 2 +-
 .../framework/tests/Unit/Views/ArticleExcerptViewTest.php     | 2 +-
 .../framework/tests/Unit/Views/NavigationMenuViewTest.php     | 2 +-
 .../framework/tests/Unit/Views/ScriptsComponentViewTest.php   | 2 +-
 .../framework/tests/Unit/Views/StylesComponentViewTest.php    | 2 +-
 packages/realtime-compiler/src/Actions/RendersSearchPage.php  | 2 +-
 packages/testing/src/CreatesApplication.php                   | 2 +-
 packages/testing/src/ResetsApplication.php                    | 2 +-
 packages/testing/src/TestCase.php                             | 2 +-
 projects/shelf/admin/src/AdminServiceProvider.php             | 2 +-
 projects/shelf/single-file-dashboard/dashboard.php            | 2 +-
 tests/Benchmarks/PageParserBenchmark.php                      | 2 +-
 tests/Benchmarks/SearchIndexBenchmark.php                     | 2 +-
 tests/Benchmarks/StaticSiteBuilderBenchmark.php               | 2 +-
 tests/Browser/HighLevelViewTest.php                           | 2 +-
 tests/Hyde/Feature/DefaultContentTest.php                     | 2 +-
 tests/Hyde/Feature/StaticSiteBuilderTest.php                  | 2 +-
 143 files changed, 146 insertions(+), 144 deletions(-)
 rename packages/framework/src/{Framework => }/Hyde.php (98%)

diff --git a/config/app.php b/config/app.php
index b96a32051fa..f59506d3d44 100644
--- a/config/app.php
+++ b/config/app.php
@@ -45,7 +45,7 @@
     |
     */
 
-    'version' => Hyde\Framework\Hyde::version(),
+    'version' => Hyde\Hyde::version(),
 
     /*
     |--------------------------------------------------------------------------
@@ -93,7 +93,7 @@
     */
 
     'aliases' => [
-        'Hyde' => Hyde\Framework\Hyde::class,
+        'Hyde' => Hyde\Hyde::class,
         'Asset' => Hyde\Framework\Helpers\Asset::class,
         'Site' => \Hyde\Framework\Models\Support\Site::class,
         'Route' => \Hyde\Framework\Models\Support\Route::class,
diff --git a/config/hyde.php b/config/hyde.php
index 6cfb626a1ff..986c339ac89 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -36,7 +36,7 @@
         // Meta::name('twitter:creator', '@HydeFramework'),
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
-        Meta::name('generator', 'HydePHP '.Hyde\Framework\Hyde::version()),
+        Meta::name('generator', 'HydePHP '. Hyde\Hyde::version()),
         Meta::property('site_name', config('site.name', 'HydePHP')),
     ],
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 6cfb626a1ff..986c339ac89 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -36,7 +36,7 @@
         // Meta::name('twitter:creator', '@HydeFramework'),
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
-        Meta::name('generator', 'HydePHP '.Hyde\Framework\Hyde::version()),
+        Meta::name('generator', 'HydePHP '. Hyde\Hyde::version()),
         Meta::property('site_name', config('site.name', 'HydePHP')),
     ],
 
diff --git a/packages/framework/src/Framework/Actions/BladeMatterParser.php b/packages/framework/src/Framework/Actions/BladeMatterParser.php
index f111a1e2de4..fba0c0132b5 100644
--- a/packages/framework/src/Framework/Actions/BladeMatterParser.php
+++ b/packages/framework/src/Framework/Actions/BladeMatterParser.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use RuntimeException;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
index 17ee71be2a0..218121bbca7 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Image;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
index 6a478599a89..439285139ba 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
diff --git a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
index f6b2370c9ee..724e5832d1b 100644
--- a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
+++ b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Actions;
 
 use Hyde\Framework\Exceptions\FileConflictException;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php b/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
index fae26e10d66..be4f3530a66 100644
--- a/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
+++ b/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
@@ -7,10 +7,10 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Exceptions\FileConflictException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
+use Hyde\Hyde;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/MarkdownFileParser.php b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
index 568bb3256c2..8ed7e87a774 100644
--- a/packages/framework/src/Framework/Actions/MarkdownFileParser.php
+++ b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\MarkdownDocument;
+use Hyde\Hyde;
 use Spatie\YamlFrontMatter\YamlFrontMatter;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
index cf9738a8ce2..ddc3483ff7f 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
@@ -6,8 +6,8 @@
 
 use Hyde\Framework\Concerns\AbstractBuildTask;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\ChecksumService;
+use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
index 732b9b97eb2..746643b37ad 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
 use Hyde\Framework\Concerns\AbstractBuildTask;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\RssFeedService;
+use Hyde\Hyde;
 
 class GenerateRssFeed extends AbstractBuildTask
 {
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
index 48bac93486d..54ce9bbd704 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
 use Hyde\Framework\Concerns\AbstractBuildTask;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\SitemapService;
+use Hyde\Hyde;
 
 class GenerateSitemap extends AbstractBuildTask
 {
diff --git a/packages/framework/src/Framework/Actions/PublishesHomepageView.php b/packages/framework/src/Framework/Actions/PublishesHomepageView.php
index 58145ed170b..1040f91ef98 100644
--- a/packages/framework/src/Framework/Actions/PublishesHomepageView.php
+++ b/packages/framework/src/Framework/Actions/PublishesHomepageView.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Publish one of the Hyde homepages.
diff --git a/packages/framework/src/Framework/Actions/PublishesHydeViews.php b/packages/framework/src/Framework/Actions/PublishesHydeViews.php
index cf487124a4f..ec1195e5635 100644
--- a/packages/framework/src/Framework/Actions/PublishesHydeViews.php
+++ b/packages/framework/src/Framework/Actions/PublishesHydeViews.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\File;
 
 /*
diff --git a/packages/framework/src/Framework/Actions/StaticPageBuilder.php b/packages/framework/src/Framework/Actions/StaticPageBuilder.php
index 605af0d4cfc..b295e194fc1 100644
--- a/packages/framework/src/Framework/Actions/StaticPageBuilder.php
+++ b/packages/framework/src/Framework/Actions/StaticPageBuilder.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Converts a Page Model into a static HTML page.
diff --git a/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php b/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
index 0fa5d9f0ee8..3d40639c7e1 100644
--- a/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
@@ -9,10 +9,10 @@
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use LaravelZero\Framework\Commands\Command;
 
diff --git a/packages/framework/src/Framework/Commands/HydeDebugCommand.php b/packages/framework/src/Framework/Commands/HydeDebugCommand.php
index 0a7fb8d7489..0b2868cf356 100644
--- a/packages/framework/src/Framework/Commands/HydeDebugCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeDebugCommand.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Commands;
 
 use Composer\InstalledVersions;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php b/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
index d0fff93a017..fd15ceb064d 100644
--- a/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
+++ b/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Foundation\Console\PackageDiscoverCommand as BaseCommand;
 use Illuminate\Foundation\PackageManifest;
 
diff --git a/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php b/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
index 94a3e62a3af..de05387d985 100644
--- a/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
+++ b/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Commands;
 
 use Hyde\Framework\Actions\PublishesHomepageView;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\ChecksumService;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Artisan;
 use LaravelZero\Framework\Commands\Command;
 
diff --git a/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php b/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
index bb172485326..6cb8d1faff8 100644
--- a/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
+++ b/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Commands;
 
 use Hyde\Framework\Actions\PublishesHydeViews;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php b/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
index 769c5771a28..808295b7270 100644
--- a/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Commands;
 
 use Exception;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Framework\Services\RebuildService;
+use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Commands/HydeRouteListCommand.php b/packages/framework/src/Framework/Commands/HydeRouteListCommand.php
index 3f2e1bd040f..e1bb9cc2101 100644
--- a/packages/framework/src/Framework/Commands/HydeRouteListCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeRouteListCommand.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Commands;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Commands/HydeServeCommand.php b/packages/framework/src/Framework/Commands/HydeServeCommand.php
index e7146137aa4..b1247ca8469 100644
--- a/packages/framework/src/Framework/Commands/HydeServeCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeServeCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php b/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
index 5bb45f7f0d8..7e395691841 100644
--- a/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
+++ b/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\File;
 use LaravelZero\Framework\Commands\Command;
 
diff --git a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
index 2545c980636..eb2843aa648 100644
--- a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Framework\Contracts\BuildTaskContract;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Throwable;
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index 3fc8ddd4946..957fbb4e0b8 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Framework\Contracts\MarkdownDocumentContract;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Hyde;
 
 /**
  * The base class for all Markdown-based page models.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 7b3f028984e..9c9f80793ab 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -9,12 +9,12 @@
 use Hyde\Framework\Contracts\CompilableContract;
 use Hyde\Framework\Contracts\FrontMatter\PageSchema;
 use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Navigation\NavigationData;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Modules\Metadata\PageMetadataBag;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Illuminate\Support\Arr;
 
 /**
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 9ca87b96ace..e948d04fad0 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -7,11 +7,11 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Author;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Framework\Models\Support\Image;
+use Hyde\Hyde;
 
 trait ConstructsPageSchemas
 {
diff --git a/packages/framework/src/Framework/Concerns/ValidatesExistence.php b/packages/framework/src/Framework/Concerns/ValidatesExistence.php
index 92ef194c000..a544da69bb0 100644
--- a/packages/framework/src/Framework/Concerns/ValidatesExistence.php
+++ b/packages/framework/src/Framework/Concerns/ValidatesExistence.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Validate the existence of a Page model's source file.
diff --git a/packages/framework/src/Framework/Foundation/Filesystem.php b/packages/framework/src/Framework/Foundation/Filesystem.php
index aed1118361d..7fe9f9b98a5 100644
--- a/packages/framework/src/Framework/Foundation/Filesystem.php
+++ b/packages/framework/src/Framework/Foundation/Filesystem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Foundation;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
@@ -12,6 +11,7 @@
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 
 /**
  * File helper methods, bound to the HydeKernel instance, and is an integral part of the framework.
diff --git a/packages/framework/src/Framework/Helpers/Features.php b/packages/framework/src/Framework/Helpers/Features.php
index 3c64e785f26..42f4092ebc5 100644
--- a/packages/framework/src/Framework/Helpers/Features.php
+++ b/packages/framework/src/Framework/Helpers/Features.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Helpers;
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 use JsonSerializable;
diff --git a/packages/framework/src/Framework/Helpers/Includes.php b/packages/framework/src/Framework/Helpers/Includes.php
index d5933db2f49..5f16aec6888 100644
--- a/packages/framework/src/Framework/Helpers/Includes.php
+++ b/packages/framework/src/Framework/Helpers/Includes.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Helpers;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Blade;
 
 class Includes
diff --git a/packages/framework/src/Framework/Helpers/Redirect.php b/packages/framework/src/Framework/Helpers/Redirect.php
index c944580b536..3d5a8f3e9bd 100644
--- a/packages/framework/src/Framework/Helpers/Redirect.php
+++ b/packages/framework/src/Framework/Helpers/Redirect.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Helpers;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * A basic redirect page. Is not discoverable by Hyde, instead you manually need to create the pages.
diff --git a/packages/framework/src/Framework/HydeKernel.php b/packages/framework/src/Framework/HydeKernel.php
index 99009b5cc74..3f53aa99d6c 100644
--- a/packages/framework/src/Framework/HydeKernel.php
+++ b/packages/framework/src/Framework/HydeKernel.php
@@ -18,7 +18,7 @@
 /**
  * Encapsulates a HydePHP project, providing helpful methods for interacting with it.
  *
- * @see \Hyde\Framework\Hyde for the facade commonly used to access this class.
+ * @see \Hyde\Hyde for the facade commonly used to access this class.
  *
  * @author  Caen De Silva <caen@desilva.se>
  * @copyright 2022 Caen De Silva
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 8c35905879d..f5323259c35 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -13,6 +13,7 @@
 use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
index d27092aade5..a811c6be301 100644
--- a/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Models\Navigation;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Models/Navigation/NavItem.php b/packages/framework/src/Framework/Models/Navigation/NavItem.php
index 3e9d4e78d90..cf8411ef4aa 100644
--- a/packages/framework/src/Framework/Models/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Models/Navigation/NavItem.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Models\Navigation;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Illuminate\Support\Str;
 use Stringable;
 
diff --git a/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
index 3e42957fa99..f0c9c1fc10b 100644
--- a/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Models\Navigation;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Models/Support/File.php b/packages/framework/src/Framework/Models/Support/File.php
index cebc88f9da4..93f93ad44c4 100644
--- a/packages/framework/src/Framework/Models/Support/File.php
+++ b/packages/framework/src/Framework/Models/Support/File.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Models\Support;
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
diff --git a/packages/framework/src/Framework/Models/Support/Image.php b/packages/framework/src/Framework/Models/Support/Image.php
index b15317558ae..e0aff73cfc8 100644
--- a/packages/framework/src/Framework/Models/Support/Image.php
+++ b/packages/framework/src/Framework/Models/Support/Image.php
@@ -7,7 +7,7 @@
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Framework\Contracts\FrontMatter\Support\FeaturedImageSchema;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Framework/Models/Support/Route.php b/packages/framework/src/Framework/Models/Support/Route.php
index dc92a76511f..a9e8f91559d 100644
--- a/packages/framework/src/Framework/Models/Support/Route.php
+++ b/packages/framework/src/Framework/Models/Support/Route.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Framework\Foundation\RouteCollection;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
diff --git a/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php b/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
index f40d146219d..d5aca948094 100644
--- a/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
+++ b/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Modules\DataCollections;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
index bbb07b4e33c..5469c0002cd 100644
--- a/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Modules\DataCollections;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
index 9d7ba9c1c6e..5cf22843f57 100644
--- a/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
@@ -7,8 +7,8 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\RssFeedService;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\View;
 
 /**
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index d681ecc9ba6..67cb9dbc4fe 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Handles the retrieval of core asset files. Commonly used through the Asset facade.
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 0b2a222097c..7346ade646c 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -8,9 +8,9 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Foundation\RouteCollection;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Models\Support\Site;
+use Hyde\Hyde;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index 88842322706..0d00f67c684 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Contracts\BuildTaskContract;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
 
 /**
diff --git a/packages/framework/src/Framework/Services/ChecksumService.php b/packages/framework/src/Framework/Services/ChecksumService.php
index 3ec812bfe7f..014edcfa764 100644
--- a/packages/framework/src/Framework/Services/ChecksumService.php
+++ b/packages/framework/src/Framework/Services/ChecksumService.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Helper methods to interact with the filecache. The filecache is used to compare
diff --git a/packages/framework/src/Framework/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
index 017beab2586..d694cb5f412 100644
--- a/packages/framework/src/Framework/Services/DiscoveryService.php
+++ b/packages/framework/src/Framework/Services/DiscoveryService.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\File;
+use Hyde\Hyde;
 
 /**
  * The core service that powers all HydePHP file auto-discovery.
diff --git a/packages/framework/src/Framework/Services/DocumentationSearchService.php b/packages/framework/src/Framework/Services/DocumentationSearchService.php
index 57c0f4b0699..6bc5299d9b1 100644
--- a/packages/framework/src/Framework/Services/DocumentationSearchService.php
+++ b/packages/framework/src/Framework/Services/DocumentationSearchService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Hyde;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use JetBrains\PhpStorm\ArrayShape;
diff --git a/packages/framework/src/Framework/Services/RebuildService.php b/packages/framework/src/Framework/Services/RebuildService.php
index 071f3bfc519..78c00f68933 100644
--- a/packages/framework/src/Framework/Services/RebuildService.php
+++ b/packages/framework/src/Framework/Services/RebuildService.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * Build static pages, but intelligently.
diff --git a/packages/framework/src/Framework/Services/RssFeedService.php b/packages/framework/src/Framework/Services/RssFeedService.php
index 24c1ade9b4a..1582c007cd8 100644
--- a/packages/framework/src/Framework/Services/RssFeedService.php
+++ b/packages/framework/src/Framework/Services/RssFeedService.php
@@ -8,8 +8,8 @@
 namespace Hyde\Framework\Services;
 
 use Exception;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index d3b5334dc25..7f993e4e04a 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -7,12 +7,12 @@
 namespace Hyde\Framework\Services;
 
 use Exception;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 0aabab41698..ce4f7be07a5 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\ValidationResult as Result;
+use Hyde\Hyde;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/src/Framework/Services/YamlConfigurationService.php b/packages/framework/src/Framework/Services/YamlConfigurationService.php
index cdc12ee5087..81d99d36399 100644
--- a/packages/framework/src/Framework/Services/YamlConfigurationService.php
+++ b/packages/framework/src/Framework/Services/YamlConfigurationService.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use Symfony\Component\Yaml\Yaml;
 
diff --git a/packages/framework/src/Framework/Views/Components/LinkComponent.php b/packages/framework/src/Framework/Views/Components/LinkComponent.php
index e6db699c1ba..2e51ddcd21a 100644
--- a/packages/framework/src/Framework/Views/Components/LinkComponent.php
+++ b/packages/framework/src/Framework/Views/Components/LinkComponent.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Views\Components;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
diff --git a/packages/framework/src/Framework/Hyde.php b/packages/framework/src/Hyde.php
similarity index 98%
rename from packages/framework/src/Framework/Hyde.php
rename to packages/framework/src/Hyde.php
index 9da5096ba4d..e3dbacddcdc 100644
--- a/packages/framework/src/Framework/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework;
+namespace Hyde;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Foundation\FileCollection;
 use Hyde\Framework\Foundation\PageCollection;
 use Hyde\Framework\Foundation\RouteCollection;
 use Hyde\Framework\Helpers\Features;
+use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Support\Route;
 use Illuminate\Support\Facades\Facade;
 
diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
index a21c26a64fa..18d95fef9e0 100644
--- a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
+++ b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
@@ -7,9 +7,9 @@
 use Hyde\Framework\Actions\CreatesNewPageSourceFile;
 use Hyde\Framework\Exceptions\FileConflictException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Actions/PublishesHomepageViewTest.php b/packages/framework/tests/Feature/Actions/PublishesHomepageViewTest.php
index f00aec56b52..d2dffcd52c1 100644
--- a/packages/framework/tests/Feature/Actions/PublishesHomepageViewTest.php
+++ b/packages/framework/tests/Feature/Actions/PublishesHomepageViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature\Actions;
 
 use Hyde\Framework\Actions\PublishesHomepageView;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Actions/PublishesHydeViewsTest.php b/packages/framework/tests/Feature/Actions/PublishesHydeViewsTest.php
index 8e116ac5b5e..93034f1678a 100644
--- a/packages/framework/tests/Feature/Actions/PublishesHydeViewsTest.php
+++ b/packages/framework/tests/Feature/Actions/PublishesHydeViewsTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature\Actions;
 
 use Hyde\Framework\Actions\PublishesHydeViews;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/AssetServiceTest.php b/packages/framework/tests/Feature/AssetServiceTest.php
index 671fe746dde..0250046c1ba 100644
--- a/packages/framework/tests/Feature/AssetServiceTest.php
+++ b/packages/framework/tests/Feature/AssetServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\AssetService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index 8a8d0e08129..2bc63aa2146 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Author;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
diff --git a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
index d19ea7994f4..b8d7e24fa04 100644
--- a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\RebuildService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
index d710b593ecc..24826a9ffaa 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
index 67c905d3230..867b68d923b 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Site;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
index ae34a071173..3e8007b5d48 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
index 420d3e872a8..b20970261dc 100644
--- a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
@@ -6,7 +6,7 @@
 
 use Exception;
 use Hyde\Framework\Exceptions\FileConflictException;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
index e984cb654cc..f6cdde9fff3 100644
--- a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Foundation\PackageManifest;
 
diff --git a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
index 27493a48ba8..99a153984e5 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
index 95d6339fd01..1b6b2f5e11a 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
index 30273d50fc4..457ee191f46 100644
--- a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
index de59adf956c..70ed94fa9fd 100644
--- a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
index be2c038189e..e4c957a5388 100644
--- a/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePostCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class MakePostCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php
index 0d19bf5e096..be5c8086a61 100644
--- a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature\Commands;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index c1d22f64a1a..88b038b849b 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\MarkdownDocument;
 use Hyde\Framework\Modules\DataCollections\DataCollection;
 use Hyde\Framework\Modules\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\Modules\DataCollections\Facades\MarkdownCollection;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
diff --git a/packages/framework/tests/Feature/DiscoveryServiceTest.php b/packages/framework/tests/Feature/DiscoveryServiceTest.php
index 079fd8dc9cb..db7221c541d 100644
--- a/packages/framework/tests/Feature/DiscoveryServiceTest.php
+++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/FileCollectionTest.php b/packages/framework/tests/Feature/FileCollectionTest.php
index d5d22ab86e7..185580a4602 100644
--- a/packages/framework/tests/Feature/FileCollectionTest.php
+++ b/packages/framework/tests/Feature/FileCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Foundation\FileCollection;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\File;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 256a1e066e1..ad400c99dfa 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Support\File;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index d6026660d96..af592fca386 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
 use Hyde\Framework\Foundation\Filesystem;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index 7a572f41326..ba9e4ee5260 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class HelpersTest extends TestCase
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 1f8b406fe82..0a75e8c956c 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -6,13 +6,13 @@
 
 use Composer\InstalledVersions;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
@@ -22,7 +22,7 @@
  * as most of the logic actually resides in linked service classes.
  *
  * @covers \Hyde\Framework\HydeKernel
- * @covers \Hyde\Framework\Hyde
+ * @covers \Hyde\Hyde
  *
  * @see \Hyde\Framework\Testing\Unit\HydeHelperFacadeMakeTitleTest
  */
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index c156ff5fc02..869bf7fe982 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index f530eea7b21..fa4eaa0a1ba 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Includes;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/MarkdownFileParserTest.php b/packages/framework/tests/Feature/MarkdownFileParserTest.php
index aab72451d42..14373b48716 100644
--- a/packages/framework/tests/Feature/MarkdownFileParserTest.php
+++ b/packages/framework/tests/Feature/MarkdownFileParserTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Markdown\MarkdownDocument;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class MarkdownFileParserTest extends TestCase
diff --git a/packages/framework/tests/Feature/MarkdownPageTest.php b/packages/framework/tests/Feature/MarkdownPageTest.php
index 71d3dc95420..de075e31f32 100644
--- a/packages/framework/tests/Feature/MarkdownPageTest.php
+++ b/packages/framework/tests/Feature/MarkdownPageTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/MetadataViewTest.php b/packages/framework/tests/Feature/MetadataViewTest.php
index 44fe3283dd1..517de89d529 100644
--- a/packages/framework/tests/Feature/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/MetadataViewTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 17f91eecdff..6d63b0f69f0 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Navigation\NavigationMenu;
 use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/PageCollectionTest.php b/packages/framework/tests/Feature/PageCollectionTest.php
index 5fb01794bf6..e32c3f0eaf8 100644
--- a/packages/framework/tests/Feature/PageCollectionTest.php
+++ b/packages/framework/tests/Feature/PageCollectionTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index fb2d13c125e..f5e910d9a4e 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/RedirectTest.php b/packages/framework/tests/Feature/RedirectTest.php
index 4983f06625b..66fdabfc207 100644
--- a/packages/framework/tests/Feature/RedirectTest.php
+++ b/packages/framework/tests/Feature/RedirectTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Redirect;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index fc0758d4b5c..0d64d6f6b30 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Foundation\RouteCollection;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 8326934c0a0..3d8b9d2c4b9 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index 454a8aba2e1..ef039917c1c 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Concerns\AbstractBuildTask;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\BuildTaskService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Services/ChecksumServiceTest.php b/packages/framework/tests/Feature/Services/ChecksumServiceTest.php
index c9314132c22..e04cc1d02df 100644
--- a/packages/framework/tests/Feature/Services/ChecksumServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ChecksumServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\ChecksumService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
index 226ef4225e1..c013228b181 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\DocumentationSearchService as Service;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 20830de3e28..c2c779a41c4 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Navigation\DocumentationSidebar;
 use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index e08b9e5159e..42e2ec17361 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\SemanticDocumentationArticle;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index bc76cccfe12..55816480958 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\RssFeedService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index 185e8eca2fa..e27a09d4a96 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\SitemapService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 755ba5c88ac..6fd2a11bb7d 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\ValidationResult;
 use Hyde\Framework\Services\ValidationService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
index 2d35687bd80..77d6b6f0dbe 100644
--- a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php
index 37e4ac1ff25..2c0150aebf5 100644
--- a/packages/framework/tests/Feature/StaticPageBuilderTest.php
+++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
@@ -13,6 +12,7 @@
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 5ab3d3c0b11..60f3460129c 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Site;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
index 60457b8aa04..3d470195aab 100644
--- a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
+++ b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 5d7e6c0bc24..6ba72fb4f39 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
index 37947a4b52f..31363e22232 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
index fbcf18e96ae..06e7295a806 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/GenerateBuildManifestTest.php b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
index 6b4e9e96ada..8834e8b28d1 100644
--- a/packages/framework/tests/Unit/GenerateBuildManifestTest.php
+++ b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Services\ChecksumService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
index 8cddecfbc82..e7f0a82ed38 100644
--- a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
+++ b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php b/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
index d0531251f26..93b5e110f1e 100644
--- a/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
+++ b/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeConfigFilesAreMatchingTest.php b/packages/framework/tests/Unit/HydeConfigFilesAreMatchingTest.php
index c2bfbabdda5..3b398a979bc 100644
--- a/packages/framework/tests/Unit/HydeConfigFilesAreMatchingTest.php
+++ b/packages/framework/tests/Unit/HydeConfigFilesAreMatchingTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use PHPUnit\Framework\Constraint\IsEqual;
 
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index 3985c18767b..adbd3c56221 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php b/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
index dfbdfa029f0..a811a2868e0 100644
--- a/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
+++ b/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeMakeTitleTest.php b/packages/framework/tests/Unit/HydeHelperFacadeMakeTitleTest.php
index 98c68e24bf6..cbd872e3a65 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeMakeTitleTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeMakeTitleTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class HydeHelperFacadeMakeTitleTest extends TestCase
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeTest.php b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
index c5ea0611b53..f6ecb0a835f 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydePathHelperTest.php b/packages/framework/tests/Unit/HydePathHelperTest.php
index 3e846b3b569..65cef938b33 100644
--- a/packages/framework/tests/Unit/HydePathHelperTest.php
+++ b/packages/framework/tests/Unit/HydePathHelperTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index e1ccf7f5ba4..8adb469ef30 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
@@ -13,6 +12,7 @@
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Modules\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\Services\AssetService;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/packages/framework/tests/Unit/HydeVendorPathHelperTest.php b/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
index 6520f6c87a5..a23506b7ede 100644
--- a/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
+++ b/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class HydeVendorPathHelperTest extends TestCase
diff --git a/packages/framework/tests/Unit/InteractsWithDirectoriesConcernTest.php b/packages/framework/tests/Unit/InteractsWithDirectoriesConcernTest.php
index d8f41cc58c0..77aa529ae82 100644
--- a/packages/framework/tests/Unit/InteractsWithDirectoriesConcernTest.php
+++ b/packages/framework/tests/Unit/InteractsWithDirectoriesConcernTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/MarkdownDocumentTest.php b/packages/framework/tests/Unit/MarkdownDocumentTest.php
index 39edf339fb8..4378ab90a30 100644
--- a/packages/framework/tests/Unit/MarkdownDocumentTest.php
+++ b/packages/framework/tests/Unit/MarkdownDocumentTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Models\Markdown\MarkdownDocument;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/MarkdownPostParserTest.php b/packages/framework/tests/Unit/MarkdownPostParserTest.php
index 99b30398979..0d5f81c6fc1 100644
--- a/packages/framework/tests/Unit/MarkdownPostParserTest.php
+++ b/packages/framework/tests/Unit/MarkdownPostParserTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
index ad267a912d3..7f2f124e61c 100644
--- a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/PageModelGetHelperTest.php b/packages/framework/tests/Unit/PageModelGetHelperTest.php
index cba529a08fb..6f3be829cda 100644
--- a/packages/framework/tests/Unit/PageModelGetHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Unit/PageModelParseHelperTest.php b/packages/framework/tests/Unit/PageModelParseHelperTest.php
index acdb9011f77..bcc75f01bf1 100644
--- a/packages/framework/tests/Unit/PageModelParseHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelParseHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
index abc8fdb5406..4366d2d12e8 100644
--- a/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
+++ b/packages/framework/tests/Unit/RelativeLinksAcrossPagesRetainsIntegrityTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
index cfc9134921a..63337682905 100644
--- a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
+++ b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php b/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
index c52c1ace911..d4e1e4984e4 100644
--- a/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
+++ b/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index 4a7efe4d901..d4c166188db 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;
 
diff --git a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
index a46f69f7daf..d348e71939d 100644
--- a/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationMenuViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
index eee5c9570f2..7c1214d319b 100644
--- a/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/ScriptsComponentViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;
 
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index f39b2ccd865..67f86c5b1ce 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Framework\Helpers\Asset;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;
 
diff --git a/packages/realtime-compiler/src/Actions/RendersSearchPage.php b/packages/realtime-compiler/src/Actions/RendersSearchPage.php
index f783d03dc96..18b8ae34aea 100644
--- a/packages/realtime-compiler/src/Actions/RendersSearchPage.php
+++ b/packages/realtime-compiler/src/Actions/RendersSearchPage.php
@@ -2,7 +2,7 @@
 
 namespace Hyde\RealtimeCompiler\Actions;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Illuminate\Support\Facades\Blade;
 
diff --git a/packages/testing/src/CreatesApplication.php b/packages/testing/src/CreatesApplication.php
index 8f5e25c0156..e480a8d7a24 100644
--- a/packages/testing/src/CreatesApplication.php
+++ b/packages/testing/src/CreatesApplication.php
@@ -2,8 +2,8 @@
 
 namespace Hyde\Testing;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\HydeKernel;
+use Hyde\Hyde;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Application;
 
diff --git a/packages/testing/src/ResetsApplication.php b/packages/testing/src/ResetsApplication.php
index 040ae5b73f6..eacdee6698d 100644
--- a/packages/testing/src/ResetsApplication.php
+++ b/packages/testing/src/ResetsApplication.php
@@ -2,7 +2,7 @@
 
 namespace Hyde\Testing;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 /**
  * @internal
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 9d89eafa364..7209185bc94 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -4,9 +4,9 @@
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Hyde;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 
diff --git a/projects/shelf/admin/src/AdminServiceProvider.php b/projects/shelf/admin/src/AdminServiceProvider.php
index f5b7dd1450e..5e71791df80 100644
--- a/projects/shelf/admin/src/AdminServiceProvider.php
+++ b/projects/shelf/admin/src/AdminServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace Hyde\Admin;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Illuminate\Support\ServiceProvider;
 
 class AdminServiceProvider extends ServiceProvider
diff --git a/projects/shelf/single-file-dashboard/dashboard.php b/projects/shelf/single-file-dashboard/dashboard.php
index 0f77f32537d..0b608c757ac 100644
--- a/projects/shelf/single-file-dashboard/dashboard.php
+++ b/projects/shelf/single-file-dashboard/dashboard.php
@@ -12,12 +12,12 @@
 
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\BladePage;
 use Hyde\Framework\Models\DocumentationPage;
 use Hyde\Framework\Models\MarkdownPage;
 use Hyde\Framework\Models\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
 
 const VERSION = 'dev-master';
 
diff --git a/tests/Benchmarks/PageParserBenchmark.php b/tests/Benchmarks/PageParserBenchmark.php
index b2e37f920f0..9670e243e87 100644
--- a/tests/Benchmarks/PageParserBenchmark.php
+++ b/tests/Benchmarks/PageParserBenchmark.php
@@ -4,11 +4,11 @@
 
 namespace Tests\Benchmarks;
 
-use Hyde\Framework\Hyde;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Hyde;
 use Tests\Benchmarks\CBench\Benchmark;
 
 class PageParserBenchmark extends BenchCase
diff --git a/tests/Benchmarks/SearchIndexBenchmark.php b/tests/Benchmarks/SearchIndexBenchmark.php
index 47c34e8fdda..2f396d766d6 100644
--- a/tests/Benchmarks/SearchIndexBenchmark.php
+++ b/tests/Benchmarks/SearchIndexBenchmark.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Benchmarks;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 
 class SearchIndexBenchmark extends BenchCase
 {
diff --git a/tests/Benchmarks/StaticSiteBuilderBenchmark.php b/tests/Benchmarks/StaticSiteBuilderBenchmark.php
index 8f88fdc344f..7de145fce35 100644
--- a/tests/Benchmarks/StaticSiteBuilderBenchmark.php
+++ b/tests/Benchmarks/StaticSiteBuilderBenchmark.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Benchmarks;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Tests\Benchmarks\CBench\Benchmark;
 
 class StaticSiteBuilderBenchmark extends BenchCase
diff --git a/tests/Browser/HighLevelViewTest.php b/tests/Browser/HighLevelViewTest.php
index efec3f6e950..d1c1850ed64 100644
--- a/tests/Browser/HighLevelViewTest.php
+++ b/tests/Browser/HighLevelViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Testing\Browser;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\DuskTestCase;
 use Illuminate\Support\Str;
 use Laravel\Dusk\Browser;
diff --git a/tests/Hyde/Feature/DefaultContentTest.php b/tests/Hyde/Feature/DefaultContentTest.php
index 89d8115c7ab..cceda6bd319 100644
--- a/tests/Hyde/Feature/DefaultContentTest.php
+++ b/tests/Hyde/Feature/DefaultContentTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Testing\Hyde\Feature;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 class DefaultContentTest extends TestCase
diff --git a/tests/Hyde/Feature/StaticSiteBuilderTest.php b/tests/Hyde/Feature/StaticSiteBuilderTest.php
index c06a1f1faf8..07b8e70934d 100644
--- a/tests/Hyde/Feature/StaticSiteBuilderTest.php
+++ b/tests/Hyde/Feature/StaticSiteBuilderTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Testing\Hyde\Feature;
 
-use Hyde\Framework\Hyde;
+use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 

From 60d931811c4b8b5ac3f825529c9c3769ad05c6f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:07:58 +0200
Subject: [PATCH 006/768] Move Foundation namespace to root Hyde namespace

---
 app/bootstrap.php                             |  2 +-
 .../Foundation/Application.php                |  2 +-
 .../Concerns/BaseFoundationCollection.php     |  8 +++----
 .../Concerns/ForwardsFilesystem.php           |  2 +-
 .../Concerns/ForwardsHyperlinks.php           |  2 +-
 .../Concerns/HandlesFoundationCollections.php |  8 +++----
 .../Concerns/ImplementsStringHelpers.php      |  2 +-
 .../Foundation/Concerns/ManagesHydeKernel.php |  8 +++----
 .../Foundation/Concerns/ManagesViewData.php   |  2 +-
 .../Foundation/FileCollection.php             |  4 ++--
 .../{Framework => }/Foundation/Filesystem.php |  2 +-
 .../{Framework => }/Foundation/Hyperlinks.php |  2 +-
 .../Foundation/PageCollection.php             |  6 ++---
 .../Foundation/RouteCollection.php            |  6 ++---
 .../src/Framework/Concerns/HydePage.php       |  4 ++--
 .../framework/src/Framework/HydeKernel.php    | 24 +++++++++----------
 .../Framework/Models/Pages/MarkdownPost.php   |  4 ++--
 .../src/Framework/Models/Support/Route.php    |  4 ++--
 .../src/Framework/Services/BuildService.php   |  4 ++--
 packages/framework/src/Hyde.php               |  6 ++---
 .../tests/Feature/FileCollectionTest.php      |  6 ++---
 .../Feature/Foundation/FilesystemTest.php     |  8 +++----
 .../Feature/Foundation/HyperlinksTest.php     |  7 +++---
 .../tests/Feature/PageCollectionTest.php      |  6 ++---
 .../tests/Feature/RouteCollectionTest.php     |  6 ++---
 .../HyperlinkFileHelperRelativeLinkTest.php   |  2 +-
 .../HyperlinkFormatHtmlPathTest.php           |  2 +-
 .../HyperlinksUrlPathHelpersTest.php          |  6 ++---
 28 files changed, 72 insertions(+), 73 deletions(-)
 rename packages/framework/src/{Framework => }/Foundation/Application.php (94%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/BaseFoundationCollection.php (78%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/ForwardsFilesystem.php (97%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/ForwardsHyperlinks.php (94%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/HandlesFoundationCollections.php (78%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/ImplementsStringHelpers.php (91%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/ManagesHydeKernel.php (82%)
 rename packages/framework/src/{Framework => }/Foundation/Concerns/ManagesViewData.php (95%)
 rename packages/framework/src/{Framework => }/Foundation/FileCollection.php (96%)
 rename packages/framework/src/{Framework => }/Foundation/Filesystem.php (99%)
 rename packages/framework/src/{Framework => }/Foundation/Hyperlinks.php (98%)
 rename packages/framework/src/{Framework => }/Foundation/PageCollection.php (94%)
 rename packages/framework/src/{Framework => }/Foundation/RouteCollection.php (93%)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index d09863a99f5..c9f44913394 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -11,7 +11,7 @@
 |
 */
 
-$app = new \Hyde\Framework\Foundation\Application(
+$app = new \Hyde\Foundation\Application(
     dirname(__DIR__)
 );
 
diff --git a/packages/framework/src/Framework/Foundation/Application.php b/packages/framework/src/Foundation/Application.php
similarity index 94%
rename from packages/framework/src/Framework/Foundation/Application.php
rename to packages/framework/src/Foundation/Application.php
index 00f0a6bf7f6..3ae96e00df9 100644
--- a/packages/framework/src/Framework/Foundation/Application.php
+++ b/packages/framework/src/Foundation/Application.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\PackageManifest;
diff --git a/packages/framework/src/Framework/Foundation/Concerns/BaseFoundationCollection.php b/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
similarity index 78%
rename from packages/framework/src/Framework/Foundation/Concerns/BaseFoundationCollection.php
rename to packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
index 6a006d23c35..fde7ff46a19 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/BaseFoundationCollection.php
+++ b/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\HydeKernel;
 use Illuminate\Support\Collection;
@@ -10,9 +10,9 @@
 /**
  * @internal Base class for the kernel auto-discovery collections.
  *
- * @see \Hyde\Framework\Foundation\FileCollection
- * @see \Hyde\Framework\Foundation\PageCollection
- * @see \Hyde\Framework\Foundation\RouteCollection
+ * @see \Hyde\Foundation\FileCollection
+ * @see \Hyde\Foundation\PageCollection
+ * @see \Hyde\Foundation\RouteCollection
  */
 abstract class BaseFoundationCollection extends Collection
 {
diff --git a/packages/framework/src/Framework/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
similarity index 97%
rename from packages/framework/src/Framework/Foundation/Concerns/ForwardsFilesystem.php
rename to packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 9af2db15641..974697cc550 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
diff --git a/packages/framework/src/Framework/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
similarity index 94%
rename from packages/framework/src/Framework/Foundation/Concerns/ForwardsHyperlinks.php
rename to packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index b0b577d3d67..52b4be02a94 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
diff --git a/packages/framework/src/Framework/Foundation/Concerns/HandlesFoundationCollections.php b/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
similarity index 78%
rename from packages/framework/src/Framework/Foundation/Concerns/HandlesFoundationCollections.php
rename to packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
index 919bb62cf3c..b96b8935509 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/HandlesFoundationCollections.php
+++ b/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
-use Hyde\Framework\Foundation\FileCollection;
-use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Foundation\RouteCollection;
+use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\PageCollection;
+use Hyde\Foundation\RouteCollection;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
diff --git a/packages/framework/src/Framework/Foundation/Concerns/ImplementsStringHelpers.php b/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
similarity index 91%
rename from packages/framework/src/Framework/Foundation/Concerns/ImplementsStringHelpers.php
rename to packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
index 96e43adb780..1010f4e7b47 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/ImplementsStringHelpers.php
+++ b/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Foundation/Concerns/ManagesHydeKernel.php b/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
similarity index 82%
rename from packages/framework/src/Framework/Foundation/Concerns/ManagesHydeKernel.php
rename to packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
index fe53d3df2aa..26b3e3988b9 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/ManagesHydeKernel.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
-use Hyde\Framework\Foundation\FileCollection;
-use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Foundation\RouteCollection;
+use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\PageCollection;
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\HydeKernel;
 
 /**
diff --git a/packages/framework/src/Framework/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
similarity index 95%
rename from packages/framework/src/Framework/Foundation/Concerns/ManagesViewData.php
rename to packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 1228fade760..92c8dd2a840 100644
--- a/packages/framework/src/Framework/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation\Concerns;
+namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Models\Support\Route;
diff --git a/packages/framework/src/Framework/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
similarity index 96%
rename from packages/framework/src/Framework/Foundation/FileCollection.php
rename to packages/framework/src/Foundation/FileCollection.php
index a29df4bd691..c258327fe3a 100644
--- a/packages/framework/src/Framework/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
+use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
diff --git a/packages/framework/src/Framework/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
similarity index 99%
rename from packages/framework/src/Framework/Foundation/Filesystem.php
rename to packages/framework/src/Foundation/Filesystem.php
index 7fe9f9b98a5..57aa07a8e55 100644
--- a/packages/framework/src/Framework/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
 use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
diff --git a/packages/framework/src/Framework/Foundation/Hyperlinks.php b/packages/framework/src/Foundation/Hyperlinks.php
similarity index 98%
rename from packages/framework/src/Framework/Foundation/Hyperlinks.php
rename to packages/framework/src/Foundation/Hyperlinks.php
index 1a0be56d96f..16386d4602f 100644
--- a/packages/framework/src/Framework/Foundation/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Hyperlinks.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\HydeKernel;
diff --git a/packages/framework/src/Framework/Foundation/PageCollection.php b/packages/framework/src/Foundation/PageCollection.php
similarity index 94%
rename from packages/framework/src/Framework/Foundation/PageCollection.php
rename to packages/framework/src/Foundation/PageCollection.php
index 9c24d0bbc8e..e862e1eeccd 100644
--- a/packages/framework/src/Framework/Foundation/PageCollection.php
+++ b/packages/framework/src/Foundation/PageCollection.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
+use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
@@ -16,7 +16,7 @@
 use Illuminate\Support\Collection;
 
 /**
- * @see \Hyde\Framework\Foundation\RouteCollection
+ * @see \Hyde\Foundation\RouteCollection
  * @see \Hyde\Framework\Testing\Feature\PageCollectionTest
  */
 final class PageCollection extends BaseFoundationCollection
diff --git a/packages/framework/src/Framework/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
similarity index 93%
rename from packages/framework/src/Framework/Foundation/RouteCollection.php
rename to packages/framework/src/Foundation/RouteCollection.php
index 58c02474b0e..07bdf3a31a4 100644
--- a/packages/framework/src/Framework/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -2,16 +2,16 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Foundation;
+namespace Hyde\Foundation;
 
+use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Models\Support\Route;
 
 /**
  * Pseudo-Router for Hyde.
  *
- * @see \Hyde\Framework\Foundation\PageCollection
+ * @see \Hyde\Foundation\PageCollection
  * @see \Hyde\Framework\Testing\Feature\RouteTest
  * @see \Hyde\Framework\Testing\Feature\RouteCollectionTest
  *
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 9c9f80793ab..1546591ac2a 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Concerns;
 
+use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Contracts\CompilableContract;
 use Hyde\Framework\Contracts\FrontMatter\PageSchema;
-use Hyde\Framework\Foundation\PageCollection;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Navigation\NavigationData;
 use Hyde\Framework\Models\Support\Route;
@@ -91,7 +91,7 @@ public static function files(): array|false
     /**
      * Get a collection of all pages, parsed into page models.
      *
-     * @return \Hyde\Framework\Foundation\PageCollection<\Hyde\Framework\Concerns\HydePage
+     * @return \Hyde\Foundation\PageCollection<\Hyde\Framework\Concerns\HydePage
      */
     public static function all(): PageCollection
     {
diff --git a/packages/framework/src/Framework/HydeKernel.php b/packages/framework/src/Framework/HydeKernel.php
index 3f53aa99d6c..e0e98a7f0cc 100644
--- a/packages/framework/src/Framework/HydeKernel.php
+++ b/packages/framework/src/Framework/HydeKernel.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework;
 
+use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\Filesystem;
+use Hyde\Foundation\Hyperlinks;
+use Hyde\Foundation\PageCollection;
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
-use Hyde\Framework\Foundation\FileCollection;
-use Hyde\Framework\Foundation\Filesystem;
-use Hyde\Framework\Foundation\Hyperlinks;
-use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Foundation\RouteCollection;
 use Hyde\Framework\Helpers\Features;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
@@ -38,12 +38,12 @@
  */
 class HydeKernel implements Arrayable, JsonSerializable
 {
-    use Foundation\Concerns\HandlesFoundationCollections;
-    use Foundation\Concerns\ImplementsStringHelpers;
-    use Foundation\Concerns\ForwardsHyperlinks;
-    use Foundation\Concerns\ForwardsFilesystem;
-    use Foundation\Concerns\ManagesHydeKernel;
-    use Foundation\Concerns\ManagesViewData;
+    use \Hyde\Foundation\Concerns\HandlesFoundationCollections;
+    use \Hyde\Foundation\Concerns\ImplementsStringHelpers;
+    use \Hyde\Foundation\Concerns\ForwardsHyperlinks;
+    use \Hyde\Foundation\Concerns\ForwardsFilesystem;
+    use \Hyde\Foundation\Concerns\ManagesHydeKernel;
+    use \Hyde\Foundation\Concerns\ManagesViewData;
 
     use JsonSerializesArrayable;
     use Macroable;
@@ -87,7 +87,7 @@ public function hasFeature(string $feature): bool
 
     /**
      * @inheritDoc
-     * @psalm-return array{basePath: string, features: \Hyde\Framework\Helpers\Features, pages: \Hyde\Framework\Foundation\PageCollection, routes: \Hyde\Framework\Foundation\RouteCollection}
+     * @psalm-return array{basePath: string, features: \Hyde\Framework\Helpers\Features, pages: \Hyde\Foundation\PageCollection, routes: \Hyde\Foundation\RouteCollection}
      */
     public function toArray(): array
     {
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
index 7837cf1e516..50262032ec3 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
+++ b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Models\Pages;
 
+use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Foundation\PageCollection;
 use Hyde\Framework\Models\Support\Author;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Framework\Models\Support\Image;
@@ -32,7 +32,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?Author $author = null;
     public ?Image $image = null;
 
-    /** @return \Hyde\Framework\Foundation\PageCollection<\Hyde\Framework\Models\Pages\MarkdownPost> */
+    /** @return \Hyde\Foundation\PageCollection<\Hyde\Framework\Models\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
     {
         return static::all()->sortByDesc('matter.date');
diff --git a/packages/framework/src/Framework/Models/Support/Route.php b/packages/framework/src/Framework/Models/Support/Route.php
index a9e8f91559d..7cc8407d6e6 100644
--- a/packages/framework/src/Framework/Models/Support/Route.php
+++ b/packages/framework/src/Framework/Models/Support/Route.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Models\Support;
 
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Foundation\RouteCollection;
 use Hyde\Hyde;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
@@ -226,7 +226,7 @@ public static function getFromModel(HydePage $page): Route
     /**
      * Get all routes from the route index.
      *
-     * @return \Hyde\Framework\Foundation\RouteCollection<\Hyde\Framework\Models\Support\Route>
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Framework\Models\Support\Route>
      */
     public static function all(): RouteCollection
     {
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 7346ade646c..776bfe5b8a2 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Services;
 
 use Closure;
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Foundation\RouteCollection;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
@@ -73,7 +73,7 @@ function ($filepath) {
     }
 
     /**
-     * @return \Hyde\Framework\Foundation\RouteCollection<array-key, class-string<\Hyde\Framework\Concerns\HydePage>>
+     * @return \Hyde\Foundation\RouteCollection<array-key, class-string<\Hyde\Framework\Concerns\HydePage>>
      */
     protected function getDiscoveredModels(): RouteCollection
     {
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index e3dbacddcdc..a9c678e3001 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -4,10 +4,10 @@
 
 namespace Hyde;
 
+use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\PageCollection;
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Foundation\FileCollection;
-use Hyde\Framework\Foundation\PageCollection;
-use Hyde\Framework\Foundation\RouteCollection;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Support\Route;
diff --git a/packages/framework/tests/Feature/FileCollectionTest.php b/packages/framework/tests/Feature/FileCollectionTest.php
index 185580a4602..4f3767ae831 100644
--- a/packages/framework/tests/Feature/FileCollectionTest.php
+++ b/packages/framework/tests/Feature/FileCollectionTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Foundation\FileCollection;
+use Hyde\Foundation\FileCollection;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -15,8 +15,8 @@
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Foundation\FileCollection
- * @covers \Hyde\Framework\Foundation\Concerns\BaseFoundationCollection
+ * @covers \Hyde\Foundation\FileCollection
+ * @covers \Hyde\Foundation\Concerns\BaseFoundationCollection
  */
 class FileCollectionTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index af592fca386..8232417e8a2 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
-use Hyde\Framework\Foundation\Filesystem;
+use Hyde\Foundation\Filesystem;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -14,7 +14,7 @@
 
 /**
  * @covers \Hyde\Framework\HydeKernel
- * @covers \Hyde\Framework\Foundation\Filesystem
+ * @covers \Hyde\Foundation\Filesystem
  */
 class FilesystemTest extends TestCase
 {
@@ -91,7 +91,7 @@ public function test_path_method_returns_expected_value_regardless_of_trailing_d
 
     public function test_vendor_path_method_exists()
     {
-        $this->assertTrue(method_exists(Filesystem::class, 'vendorPath'));
+        $this->assertTrue(method_exists(\Hyde\Foundation\Filesystem::class, 'vendorPath'));
     }
 
     public function test_vendor_path_method_returns_string()
@@ -113,7 +113,7 @@ public function test_vendor_path_method_returns_expected_value_regardless_of_tra
     public function test_copy_method()
     {
         touch(Hyde::path('foo'));
-        $this->assertTrue(method_exists(Filesystem::class, 'copy'));
+        $this->assertTrue(method_exists(\Hyde\Foundation\Filesystem::class, 'copy'));
         $this->assertTrue(Hyde::copy('foo', 'bar'));
         $this->assertFileExists(Hyde::path('bar'));
         unlink(Hyde::path('foo'));
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index c4d69ad5b9c..d4983063e62 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -4,22 +4,21 @@
 
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
-use Hyde\Framework\Foundation\Hyperlinks;
 use Hyde\Framework\HydeKernel;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Foundation\Hyperlinks
+ * @covers \Hyde\Foundation\Hyperlinks
  */
 class HyperlinksTest extends TestCase
 {
-    protected Hyperlinks $class;
+    protected \Hyde\Foundation\Hyperlinks $class;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->class = new Hyperlinks(HydeKernel::getInstance());
+        $this->class = new \Hyde\Foundation\Hyperlinks(HydeKernel::getInstance());
     }
 
     public function test_image_helper_gets_relative_web_link_to_image_stored_in_site_media_folder()
diff --git a/packages/framework/tests/Feature/PageCollectionTest.php b/packages/framework/tests/Feature/PageCollectionTest.php
index e32c3f0eaf8..cd470afba32 100644
--- a/packages/framework/tests/Feature/PageCollectionTest.php
+++ b/packages/framework/tests/Feature/PageCollectionTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Foundation\PageCollection;
+use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -15,8 +15,8 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Foundation\PageCollection
- * @covers \Hyde\Framework\Foundation\Concerns\BaseFoundationCollection
+ * @covers \Hyde\Foundation\PageCollection
+ * @covers \Hyde\Foundation\Concerns\BaseFoundationCollection
  */
 class PageCollectionTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 0d64d6f6b30..68c21798376 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Foundation\RouteCollection;
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -15,8 +15,8 @@
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Foundation\RouteCollection
- * @covers \Hyde\Framework\Foundation\Concerns\BaseFoundationCollection
+ * @covers \Hyde\Foundation\RouteCollection
+ * @covers \Hyde\Foundation\Concerns\BaseFoundationCollection
  */
 class RouteCollectionTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
index 31363e22232..05cf2ea7271 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Foundation\Hyperlinks::relativeLink
+ * @covers \Hyde\Foundation\Hyperlinks::relativeLink
  */
 class HyperlinkFileHelperRelativeLinkTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
index 06e7295a806..5d30e501990 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Foundation\Hyperlinks::formatLink
+ * @covers \Hyde\Foundation\Hyperlinks::formatLink
  */
 class HyperlinkformatLinkTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index ac794fb9862..128e165aa3c 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
+use Hyde\Foundation\Hyperlinks;
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
-use Hyde\Framework\Foundation\Hyperlinks;
 use Hyde\Framework\HydeKernel;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Foundation\Hyperlinks::hasSiteUrl
- * @covers \Hyde\Framework\Foundation\Hyperlinks::url
+ * @covers \Hyde\Foundation\Hyperlinks::hasSiteUrl
+ * @covers \Hyde\Foundation\Hyperlinks::url
  * @covers \Hyde\Framework\Exceptions\BaseUrlNotSetException
  */
 class HyperlinksUrlPathHelpersTest extends TestCase

From 2ca7ba41b4b87bc769ceaaf608365497cebf1125 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:08:50 +0200
Subject: [PATCH 007/768] Move HydeKernel into Foundation namespace

---
 app/bootstrap.php                                         | 8 ++++----
 .../src/Foundation/Concerns/BaseFoundationCollection.php  | 2 +-
 .../src/Foundation/Concerns/ForwardsFilesystem.php        | 2 +-
 .../src/Foundation/Concerns/ForwardsHyperlinks.php        | 2 +-
 .../Foundation/Concerns/HandlesFoundationCollections.php  | 2 +-
 .../src/Foundation/Concerns/ImplementsStringHelpers.php   | 2 +-
 .../src/Foundation/Concerns/ManagesHydeKernel.php         | 4 ++--
 .../framework/src/Foundation/Concerns/ManagesViewData.php | 2 +-
 packages/framework/src/Foundation/Filesystem.php          | 1 -
 .../src/{Framework => Foundation}/HydeKernel.php          | 7 +------
 packages/framework/src/Foundation/Hyperlinks.php          | 1 -
 packages/framework/src/Framework/HydeServiceProvider.php  | 1 +
 packages/framework/src/Framework/helpers.php              | 4 ++--
 packages/framework/src/Hyde.php                           | 4 ++--
 .../framework/tests/Feature/Foundation/FilesystemTest.php | 2 +-
 .../framework/tests/Feature/Foundation/HyperlinksTest.php | 2 +-
 packages/framework/tests/Feature/HelpersTest.php          | 2 +-
 packages/framework/tests/Feature/HydeKernelTest.php       | 4 ++--
 packages/framework/tests/Feature/MetadataViewTest.php     | 2 +-
 .../Unit/Foundation/HyperlinksUrlPathHelpersTest.php      | 2 +-
 .../framework/tests/Unit/HydeBasePathCanBeChangedTest.php | 6 +++---
 packages/framework/tests/Unit/HydeFileHelpersTest.php     | 2 +-
 .../tests/Unit/HydeGetBasePathHasFallbackTest.php         | 2 +-
 packages/framework/tests/Unit/HydeHelperFacadeTest.php    | 2 +-
 packages/framework/tests/Unit/HydePathHelperTest.php      | 4 ++--
 .../framework/tests/Unit/HydeVendorPathHelperTest.php     | 2 +-
 packages/testing/src/CreatesApplication.php               | 2 +-
 27 files changed, 35 insertions(+), 41 deletions(-)
 rename packages/framework/src/{Framework => Foundation}/HydeKernel.php (93%)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index c9f44913394..0f68f229466 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -47,17 +47,17 @@
 |
 */
 
-$hyde = new Hyde\Framework\HydeKernel(
+$hyde = new \Hyde\Foundation\HydeKernel(
     dirname(__DIR__)
 );
 
 $app->singleton(
-    Hyde\Framework\HydeKernel::class, function () {
-        return Hyde\Framework\HydeKernel::getInstance();
+    \Hyde\Foundation\HydeKernel::class, function () {
+        return \Hyde\Foundation\HydeKernel::getInstance();
     }
 );
 
-Hyde\Framework\HydeKernel::setInstance($hyde);
+\Hyde\Foundation\HydeKernel::setInstance($hyde);
 
 /*
 |--------------------------------------------------------------------------
diff --git a/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php b/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
index fde7ff46a19..142eb55d4ea 100644
--- a/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
+++ b/packages/framework/src/Foundation/Concerns/BaseFoundationCollection.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Foundation\Concerns;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
index 974697cc550..09fea7b7f9b 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsFilesystem.php
@@ -7,7 +7,7 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait ForwardsFilesystem
 {
diff --git a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
index 52b4be02a94..3e7e6482779 100644
--- a/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
+++ b/packages/framework/src/Foundation/Concerns/ForwardsHyperlinks.php
@@ -7,7 +7,7 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait ForwardsHyperlinks
 {
diff --git a/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php b/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
index b96b8935509..ca045508c96 100644
--- a/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
+++ b/packages/framework/src/Foundation/Concerns/HandlesFoundationCollections.php
@@ -11,7 +11,7 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait HandlesFoundationCollections
 {
diff --git a/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php b/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
index 1010f4e7b47..7e810ad2d3a 100644
--- a/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
+++ b/packages/framework/src/Foundation/Concerns/ImplementsStringHelpers.php
@@ -9,7 +9,7 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait ImplementsStringHelpers
 {
diff --git a/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php b/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
index 26b3e3988b9..f57adcce309 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesHydeKernel.php
@@ -5,14 +5,14 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PageCollection;
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\HydeKernel;
 
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait ManagesHydeKernel
 {
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 92c8dd2a840..1996841210b 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -11,7 +11,7 @@
 /**
  * @internal Single-use trait for the HydeKernel class.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  */
 trait ManagesViewData
 {
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
index 57aa07a8e55..59ff715a371 100644
--- a/packages/framework/src/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
diff --git a/packages/framework/src/Framework/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
similarity index 93%
rename from packages/framework/src/Framework/HydeKernel.php
rename to packages/framework/src/Foundation/HydeKernel.php
index e0e98a7f0cc..42c5c30d0e5 100644
--- a/packages/framework/src/Framework/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -2,13 +2,8 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework;
+namespace Hyde\Foundation;
 
-use Hyde\Foundation\FileCollection;
-use Hyde\Foundation\Filesystem;
-use Hyde\Foundation\Hyperlinks;
-use Hyde\Foundation\PageCollection;
-use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Helpers\Features;
 use Illuminate\Contracts\Support\Arrayable;
diff --git a/packages/framework/src/Foundation/Hyperlinks.php b/packages/framework/src/Foundation/Hyperlinks.php
index 16386d4602f..9d8b46c2bb9 100644
--- a/packages/framework/src/Foundation/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Hyperlinks.php
@@ -5,7 +5,6 @@
 namespace Hyde\Foundation;
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
-use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 
 /**
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index f5323259c35..86fb8a109c5 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework;
 
+use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Hyde\Framework\Models\Pages\BladePage;
diff --git a/packages/framework/src/Framework/helpers.php b/packages/framework/src/Framework/helpers.php
index f4efd179eb4..f8b6becb848 100644
--- a/packages/framework/src/Framework/helpers.php
+++ b/packages/framework/src/Framework/helpers.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 
 if (! function_exists('hyde')) {
     /**
      * Get the available HydeKernel instance.
      *
-     * @return \Hyde\Framework\HydeKernel
+     * @return \Hyde\Foundation\HydeKernel
      */
     function hyde(): HydeKernel
     {
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index a9c678e3001..7fd44305fbb 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -5,18 +5,18 @@
 namespace Hyde;
 
 use Hyde\Foundation\FileCollection;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PageCollection;
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Support\Route;
 use Illuminate\Support\Facades\Facade;
 
 /**
  * General facade for Hyde services.
  *
- * @see \Hyde\Framework\HydeKernel
+ * @see \Hyde\Foundation\HydeKernel
  *
  * @author  Caen De Silva <caen@desilva.se>
  * @copyright 2022 Caen De Silva
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 8232417e8a2..1b42b65862a 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -13,7 +13,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\HydeKernel
+ * @covers \Hyde\Foundation\HydeKernel
  * @covers \Hyde\Foundation\Filesystem
  */
 class FilesystemTest extends TestCase
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index d4983063e62..304ef087e8a 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/HelpersTest.php b/packages/framework/tests/Feature/HelpersTest.php
index ba9e4ee5260..84f832b93fb 100644
--- a/packages/framework/tests/Feature/HelpersTest.php
+++ b/packages/framework/tests/Feature/HelpersTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 0a75e8c956c..d1e0d7c37ca 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Composer\InstalledVersions;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\HydeKernel;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
@@ -21,7 +21,7 @@
  * This test class runs high-level tests on the HydeKernel class,
  * as most of the logic actually resides in linked service classes.
  *
- * @covers \Hyde\Framework\HydeKernel
+ * @covers \Hyde\Foundation\HydeKernel
  * @covers \Hyde\Hyde
  *
  * @see \Hyde\Framework\Testing\Unit\HydeHelperFacadeMakeTitleTest
diff --git a/packages/framework/tests/Feature/MetadataViewTest.php b/packages/framework/tests/Feature/MetadataViewTest.php
index 517de89d529..08303304908 100644
--- a/packages/framework/tests/Feature/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/MetadataViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index 128e165aa3c..45930b82837 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Unit\Foundation;
 
+use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\Hyperlinks;
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
-use Hyde\Framework\HydeKernel;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php b/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
index 93b5e110f1e..3eff9f91dd1 100644
--- a/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
+++ b/packages/framework/tests/Unit/HydeBasePathCanBeChangedTest.php
@@ -10,9 +10,9 @@
 /**
  * Class HydeBasePathCanBeChangedTest.
  *
- * @covers \Hyde\Framework\HydeKernel::getBasePath
- * @covers \Hyde\Framework\HydeKernel::setBasePath
- * @covers \Hyde\Framework\HydeKernel::path
+ * @covers \Hyde\Foundation\HydeKernel::getBasePath
+ * @covers \Hyde\Foundation\HydeKernel::setBasePath
+ * @covers \Hyde\Foundation\HydeKernel::path
  */
 class HydeBasePathCanBeChangedTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index adbd3c56221..86244813fcb 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -9,7 +9,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\HydeKernel
+ * @covers \Hyde\Foundation\HydeKernel
  */
 class HydeFileHelpersTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php b/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
index a811a2868e0..cdb7eb66daf 100644
--- a/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
+++ b/packages/framework/tests/Unit/HydeGetBasePathHasFallbackTest.php
@@ -10,7 +10,7 @@
 /**
  * Class HydeGetBasePathHasFallbackTest.
  *
- * @covers \Hyde\Framework\HydeKernel::getBasePath
+ * @covers \Hyde\Foundation\HydeKernel::getBasePath
  */
 class HydeGetBasePathHasFallbackTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeTest.php b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
index f6ecb0a835f..2ad4c283784 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
@@ -9,7 +9,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\HydeKernel
+ * @covers \Hyde\Foundation\HydeKernel
  */
 class HydeHelperFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydePathHelperTest.php b/packages/framework/tests/Unit/HydePathHelperTest.php
index 65cef938b33..29bb6e797e3 100644
--- a/packages/framework/tests/Unit/HydePathHelperTest.php
+++ b/packages/framework/tests/Unit/HydePathHelperTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
  * Class HydePathHelperTest.
  *
- * @covers \Hyde\Framework\HydeKernel::path
+ * @covers \Hyde\Foundation\HydeKernel::path
  */
 class HydePathHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeVendorPathHelperTest.php b/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
index a23506b7ede..df27dbd38c1 100644
--- a/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
+++ b/packages/framework/tests/Unit/HydeVendorPathHelperTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/testing/src/CreatesApplication.php b/packages/testing/src/CreatesApplication.php
index e480a8d7a24..6339cc0287d 100644
--- a/packages/testing/src/CreatesApplication.php
+++ b/packages/testing/src/CreatesApplication.php
@@ -2,7 +2,7 @@
 
 namespace Hyde\Testing;
 
-use Hyde\Framework\HydeKernel;
+use Hyde\Foundation\HydeKernel;
 use Hyde\Hyde;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Foundation\Application;

From 5d1eac6d101f352750301b7c0a3a36dc6e8d0f39 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:08:53 +0200
Subject: [PATCH 008/768] Cleanup code

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

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 42c5c30d0e5..8174282794c 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -4,6 +4,12 @@
 
 namespace Hyde\Foundation;
 
+use Hyde\Foundation\Concerns\ForwardsFilesystem;
+use Hyde\Foundation\Concerns\ForwardsHyperlinks;
+use Hyde\Foundation\Concerns\HandlesFoundationCollections;
+use Hyde\Foundation\Concerns\ImplementsStringHelpers;
+use Hyde\Foundation\Concerns\ManagesHydeKernel;
+use Hyde\Foundation\Concerns\ManagesViewData;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Helpers\Features;
 use Illuminate\Contracts\Support\Arrayable;
@@ -33,12 +39,12 @@
  */
 class HydeKernel implements Arrayable, JsonSerializable
 {
-    use \Hyde\Foundation\Concerns\HandlesFoundationCollections;
-    use \Hyde\Foundation\Concerns\ImplementsStringHelpers;
-    use \Hyde\Foundation\Concerns\ForwardsHyperlinks;
-    use \Hyde\Foundation\Concerns\ForwardsFilesystem;
-    use \Hyde\Foundation\Concerns\ManagesHydeKernel;
-    use \Hyde\Foundation\Concerns\ManagesViewData;
+    use HandlesFoundationCollections;
+    use ImplementsStringHelpers;
+    use ForwardsHyperlinks;
+    use ForwardsFilesystem;
+    use ManagesHydeKernel;
+    use ManagesViewData;
 
     use JsonSerializesArrayable;
     use Macroable;

From 4f2bdde9641b3295d714723f05137a6b06e1e24a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:09:46 +0200
Subject: [PATCH 009/768] Import namespace group

---
 .../framework/src/Foundation/HydeKernel.php   | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 8174282794c..a17d92cf0d6 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -4,14 +4,9 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Foundation\Concerns\ForwardsFilesystem;
-use Hyde\Foundation\Concerns\ForwardsHyperlinks;
-use Hyde\Foundation\Concerns\HandlesFoundationCollections;
-use Hyde\Foundation\Concerns\ImplementsStringHelpers;
-use Hyde\Foundation\Concerns\ManagesHydeKernel;
-use Hyde\Foundation\Concerns\ManagesViewData;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Helpers\Features;
+use Hyde\Foundation\Concerns;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
 use JsonSerializable;
@@ -39,12 +34,12 @@
  */
 class HydeKernel implements Arrayable, JsonSerializable
 {
-    use HandlesFoundationCollections;
-    use ImplementsStringHelpers;
-    use ForwardsHyperlinks;
-    use ForwardsFilesystem;
-    use ManagesHydeKernel;
-    use ManagesViewData;
+    use Concerns\HandlesFoundationCollections;
+    use Concerns\ImplementsStringHelpers;
+    use Concerns\ForwardsHyperlinks;
+    use Concerns\ForwardsFilesystem;
+    use Concerns\ManagesHydeKernel;
+    use Concerns\ManagesViewData;
 
     use JsonSerializesArrayable;
     use Macroable;

From 221e805d77c32e8688bf3f7fd346f535a6dfd205 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:11:54 +0200
Subject: [PATCH 010/768] Move helpers.php to root src directory

---
 packages/framework/composer.json                   | 2 +-
 packages/framework/src/{Framework => }/helpers.php | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/src/{Framework => }/helpers.php (100%)

diff --git a/packages/framework/composer.json b/packages/framework/composer.json
index 01cd127ead2..3af3bbb2d20 100644
--- a/packages/framework/composer.json
+++ b/packages/framework/composer.json
@@ -7,7 +7,7 @@
             "Hyde\\": "src/"
         },
         "files": [
-            "src/Framework/helpers.php"
+            "src/helpers.php"
         ]
     },
     "autoload-dev": {
diff --git a/packages/framework/src/Framework/helpers.php b/packages/framework/src/helpers.php
similarity index 100%
rename from packages/framework/src/Framework/helpers.php
rename to packages/framework/src/helpers.php

From 2a89a35ec21022ecdd1e0d40f7a5adf63bd75135 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:12:30 +0200
Subject: [PATCH 011/768] Update composer.lock

---
 composer.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 62617ccfa8a..da4f7b9b416 100644
--- a/composer.lock
+++ b/composer.lock
@@ -830,7 +830,7 @@
             "dist": {
                 "type": "path",
                 "url": "./packages/framework",
-                "reference": "322dce9cf80a72175eb027dbc9d151accabcb42c"
+                "reference": "6d64cb61b879f53097eda4cf1ae4ad9845ba7390"
             },
             "require": {
                 "illuminate/support": "^9.5",
@@ -852,7 +852,7 @@
                     "Hyde\\": "src/"
                 },
                 "files": [
-                    "src/Framework/helpers.php"
+                    "src/helpers.php"
                 ]
             },
             "autoload-dev": {

From 4e48741ade9c1de20c9192d2162da7d4f715fd37 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 26 Oct 2022 17:13:32 +0000
Subject: [PATCH 012/768] Apply fixes from StyleCI

---
 config/hyde.php                                  | 2 +-
 packages/framework/config/hyde.php               | 2 +-
 packages/framework/src/Foundation/HydeKernel.php | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 986c339ac89..2bcf6cd9fff 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -36,7 +36,7 @@
         // Meta::name('twitter:creator', '@HydeFramework'),
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
-        Meta::name('generator', 'HydePHP '. Hyde\Hyde::version()),
+        Meta::name('generator', 'HydePHP '.Hyde\Hyde::version()),
         Meta::property('site_name', config('site.name', 'HydePHP')),
     ],
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 986c339ac89..2bcf6cd9fff 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -36,7 +36,7 @@
         // Meta::name('twitter:creator', '@HydeFramework'),
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
-        Meta::name('generator', 'HydePHP '. Hyde\Hyde::version()),
+        Meta::name('generator', 'HydePHP '.Hyde\Hyde::version()),
         Meta::property('site_name', config('site.name', 'HydePHP')),
     ],
 
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index a17d92cf0d6..d29622ef8d6 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -6,7 +6,6 @@
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Foundation\Concerns;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
 use JsonSerializable;

From 2a8c4e195477495f69cf905e0593b580efd95369 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:16:51 +0200
Subject: [PATCH 013/768] Update resource paths

---
 packages/framework/src/Framework/HydeServiceProvider.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 86fb8a109c5..f7b02b0fe23 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -69,18 +69,18 @@ public function register(): void
      */
     public function boot(): void
     {
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'hyde');
+        $this->loadViewsFrom(__DIR__.'/../../resources/views', 'hyde');
 
         $this->publishes([
-            __DIR__.'/../config' => config_path(),
+            __DIR__.'/../../config' => config_path(),
         ], 'configs');
 
         $this->publishes([
-            __DIR__.'/../resources/views/layouts' => resource_path('views/vendor/hyde/layouts'),
+            __DIR__.'/../../resources/views/layouts' => resource_path('views/vendor/hyde/layouts'),
         ], 'hyde-layouts');
 
         $this->publishes([
-            __DIR__.'/../resources/views/components' => resource_path('views/vendor/hyde/components'),
+            __DIR__.'/../../resources/views/components' => resource_path('views/vendor/hyde/components'),
         ], 'hyde-components');
 
         $this->publishes([

From 60df64710f55842ff1ee4f8a0e2d56f5fa53fd75 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:19:57 +0200
Subject: [PATCH 014/768] Move Metadata module to root Hyde namespace

---
 .../src/Framework/Concerns/HydePage.php       |  2 +-
 .../framework/src/Framework/Helpers/Meta.php  | 14 ++++++-------
 .../src/Framework/Models/Support/Site.php     |  2 +-
 .../Metadata/GlobalMetadataBag.php            |  2 +-
 .../Modules => }/Metadata/MetadataBag.php     | 12 +++++------
 .../Metadata/MetadataElementContract.php      |  2 +-
 .../Metadata/Models/LinkElement.php           |  4 ++--
 .../Metadata/Models/MetadataElement.php       |  4 ++--
 .../Metadata/Models/OpenGraphElement.php      |  4 ++--
 .../Modules => }/Metadata/PageMetadataBag.php |  2 +-
 .../tests/Feature/GlobalMetadataBagTest.php   |  4 ++--
 .../tests/Feature/MetadataHelperTest.php      |  2 +-
 .../framework/tests/Feature/MetadataTest.php  | 20 +++++++++----------
 .../tests/Feature/MetadataViewTest.php        |  6 +++---
 packages/framework/tests/Feature/SiteTest.php |  2 +-
 15 files changed, 41 insertions(+), 41 deletions(-)
 rename packages/framework/src/{Framework/Modules => }/Metadata/GlobalMetadataBag.php (97%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/MetadataBag.php (84%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/MetadataElementContract.php (93%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/Models/LinkElement.php (89%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/Models/MetadataElement.php (82%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/Models/OpenGraphElement.php (87%)
 rename packages/framework/src/{Framework/Modules => }/Metadata/PageMetadataBag.php (98%)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 1546591ac2a..8d4ebae0894 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -12,9 +12,9 @@
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Navigation\NavigationData;
 use Hyde\Framework\Models\Support\Route;
-use Hyde\Framework\Modules\Metadata\PageMetadataBag;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Metadata\PageMetadataBag;
 use Illuminate\Support\Arr;
 
 /**
diff --git a/packages/framework/src/Framework/Helpers/Meta.php b/packages/framework/src/Framework/Helpers/Meta.php
index 8be29476785..3f2f4f0154f 100644
--- a/packages/framework/src/Framework/Helpers/Meta.php
+++ b/packages/framework/src/Framework/Helpers/Meta.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Helpers;
 
-use Hyde\Framework\Modules\Metadata\GlobalMetadataBag;
-use Hyde\Framework\Modules\Metadata\Models\LinkElement;
-use Hyde\Framework\Modules\Metadata\Models\MetadataElement;
-use Hyde\Framework\Modules\Metadata\Models\OpenGraphElement;
+use Hyde\Metadata\GlobalMetadataBag;
+use Hyde\Metadata\Models\LinkElement;
+use Hyde\Metadata\Models\MetadataElement;
+use Hyde\Metadata\Models\OpenGraphElement;
 
 /**
  * Helpers to fluently declare HTML meta elements using their object representations.
@@ -21,7 +21,7 @@ class Meta
      *
      * @param  string  $name  The meta tag's name attribute.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Framework\Modules\Metadata\Models\MetadataElement
+     * @return \Hyde\Metadata\Models\MetadataElement
      *
      * @link https://www.w3schools.com/tags/tag_meta.asp
      */
@@ -35,7 +35,7 @@ public static function name(string $name, string $content): MetadataElement
      *
      * @param  string  $property  The meta tag's property attribute. The "og:" prefix is optional.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Framework\Modules\Metadata\Models\OpenGraphElement
+     * @return \Hyde\Metadata\Models\OpenGraphElement
      *
      * @link https://ogp.me/
      */
@@ -50,7 +50,7 @@ public static function property(string $property, string $content): OpenGraphEle
      * @param  string  $rel  The link tag's rel attribute.
      * @param  string  $href  The link tag's href attribute.
      * @param  array  $attr  An optional key-value array of additional attributes.
-     * @return \Hyde\Framework\Modules\Metadata\Models\LinkElement
+     * @return \Hyde\Metadata\Models\LinkElement
      *
      * @link https://www.w3schools.com/tags/tag_link.asp
      */
diff --git a/packages/framework/src/Framework/Models/Support/Site.php b/packages/framework/src/Framework/Models/Support/Site.php
index f0883aa9d08..2e3f6aadb53 100644
--- a/packages/framework/src/Framework/Models/Support/Site.php
+++ b/packages/framework/src/Framework/Models/Support/Site.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Models\Support;
 
-use Hyde\Framework\Modules\Metadata\GlobalMetadataBag;
+use Hyde\Metadata\GlobalMetadataBag;
 
 /**
  * Object representation for the HydePHP site.
diff --git a/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php b/packages/framework/src/Metadata/GlobalMetadataBag.php
similarity index 97%
rename from packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
rename to packages/framework/src/Metadata/GlobalMetadataBag.php
index 5cf22843f57..4687c323590 100644
--- a/packages/framework/src/Framework/Modules/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Metadata/GlobalMetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata;
+namespace Hyde\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
diff --git a/packages/framework/src/Framework/Modules/Metadata/MetadataBag.php b/packages/framework/src/Metadata/MetadataBag.php
similarity index 84%
rename from packages/framework/src/Framework/Modules/Metadata/MetadataBag.php
rename to packages/framework/src/Metadata/MetadataBag.php
index d15c82fa4ac..a555e341f6a 100644
--- a/packages/framework/src/Framework/Modules/Metadata/MetadataBag.php
+++ b/packages/framework/src/Metadata/MetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata;
+namespace Hyde\Metadata;
 
 use Illuminate\Contracts\Support\Htmlable;
 
@@ -10,8 +10,8 @@
  * Holds the metadata tags for a page or the site model.
  *
  * @see \Hyde\Framework\Testing\Feature\MetadataTest
- * @see \Hyde\Framework\Modules\Metadata\PageMetadataBag
- * @see \Hyde\Framework\Modules\Metadata\GlobalMetadataBag
+ * @see \Hyde\Metadata\PageMetadataBag
+ * @see \Hyde\Metadata\GlobalMetadataBag
  */
 class MetadataBag implements Htmlable
 {
@@ -42,15 +42,15 @@ public function get(): array
 
     public function add(MetadataElementContract|string $element): static
     {
-        if ($element instanceof Models\LinkElement) {
+        if ($element instanceof \Hyde\Metadata\Models\LinkElement) {
             return $this->addElement('links', $element);
         }
 
-        if ($element instanceof Models\MetadataElement) {
+        if ($element instanceof \Hyde\Metadata\Models\MetadataElement) {
             return $this->addElement('metadata', $element);
         }
 
-        if ($element instanceof Models\OpenGraphElement) {
+        if ($element instanceof \Hyde\Metadata\Models\OpenGraphElement) {
             return $this->addElement('properties', $element);
         }
 
diff --git a/packages/framework/src/Framework/Modules/Metadata/MetadataElementContract.php b/packages/framework/src/Metadata/MetadataElementContract.php
similarity index 93%
rename from packages/framework/src/Framework/Modules/Metadata/MetadataElementContract.php
rename to packages/framework/src/Metadata/MetadataElementContract.php
index ac062452482..64b724aaf26 100644
--- a/packages/framework/src/Framework/Modules/Metadata/MetadataElementContract.php
+++ b/packages/framework/src/Metadata/MetadataElementContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata;
+namespace Hyde\Metadata;
 
 use Stringable;
 
diff --git a/packages/framework/src/Framework/Modules/Metadata/Models/LinkElement.php b/packages/framework/src/Metadata/Models/LinkElement.php
similarity index 89%
rename from packages/framework/src/Framework/Modules/Metadata/Models/LinkElement.php
rename to packages/framework/src/Metadata/Models/LinkElement.php
index 57c8f700da9..6b7807599a1 100644
--- a/packages/framework/src/Framework/Modules/Metadata/Models/LinkElement.php
+++ b/packages/framework/src/Metadata/Models/LinkElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata\Models;
+namespace Hyde\Metadata\Models;
 
-use Hyde\Framework\Modules\Metadata\MetadataElementContract;
+use Hyde\Metadata\MetadataElementContract;
 
 class LinkElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Framework/Modules/Metadata/Models/MetadataElement.php b/packages/framework/src/Metadata/Models/MetadataElement.php
similarity index 82%
rename from packages/framework/src/Framework/Modules/Metadata/Models/MetadataElement.php
rename to packages/framework/src/Metadata/Models/MetadataElement.php
index ed78718c4e0..035d3688b4b 100644
--- a/packages/framework/src/Framework/Modules/Metadata/Models/MetadataElement.php
+++ b/packages/framework/src/Metadata/Models/MetadataElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata\Models;
+namespace Hyde\Metadata\Models;
 
-use Hyde\Framework\Modules\Metadata\MetadataElementContract;
+use Hyde\Metadata\MetadataElementContract;
 
 class MetadataElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Framework/Modules/Metadata/Models/OpenGraphElement.php b/packages/framework/src/Metadata/Models/OpenGraphElement.php
similarity index 87%
rename from packages/framework/src/Framework/Modules/Metadata/Models/OpenGraphElement.php
rename to packages/framework/src/Metadata/Models/OpenGraphElement.php
index 8abc9d4479f..85eeed4dde0 100644
--- a/packages/framework/src/Framework/Modules/Metadata/Models/OpenGraphElement.php
+++ b/packages/framework/src/Metadata/Models/OpenGraphElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata\Models;
+namespace Hyde\Metadata\Models;
 
-use Hyde\Framework\Modules\Metadata\MetadataElementContract;
+use Hyde\Metadata\MetadataElementContract;
 
 class OpenGraphElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Framework/Modules/Metadata/PageMetadataBag.php b/packages/framework/src/Metadata/PageMetadataBag.php
similarity index 98%
rename from packages/framework/src/Framework/Modules/Metadata/PageMetadataBag.php
rename to packages/framework/src/Metadata/PageMetadataBag.php
index 80e08373576..680d0c4d997 100644
--- a/packages/framework/src/Framework/Modules/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Metadata/PageMetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Metadata;
+namespace Hyde\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Meta;
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index 51470a3bcaf..9abe0447490 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Helpers\Meta;
 use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Modules\Metadata\GlobalMetadataBag;
+use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\View;
 
 /**
- * @covers \Hyde\Framework\Modules\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Metadata\GlobalMetadataBag
  */
 class GlobalMetadataBagTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataHelperTest.php b/packages/framework/tests/Feature/MetadataHelperTest.php
index 8e528ce5cb9..932f98c6c79 100644
--- a/packages/framework/tests/Feature/MetadataHelperTest.php
+++ b/packages/framework/tests/Feature/MetadataHelperTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Modules\Metadata\GlobalMetadataBag;
+use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index 56edf663631..a83b60e3f0c 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -8,19 +8,19 @@
 use Hyde\Framework\Helpers\Meta;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
-use Hyde\Framework\Modules\Metadata\MetadataBag;
-use Hyde\Framework\Modules\Metadata\Models\LinkElement;
-use Hyde\Framework\Modules\Metadata\Models\MetadataElement;
-use Hyde\Framework\Modules\Metadata\Models\OpenGraphElement;
+use Hyde\Metadata\MetadataBag;
+use Hyde\Metadata\Models\LinkElement;
+use Hyde\Metadata\Models\MetadataElement;
+use Hyde\Metadata\Models\OpenGraphElement;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Modules\Metadata\MetadataBag
- * @covers \Hyde\Framework\Modules\Metadata\PageMetadataBag
- * @covers \Hyde\Framework\Modules\Metadata\GlobalMetadataBag
- * @covers \Hyde\Framework\Modules\Metadata\Models\LinkElement
- * @covers \Hyde\Framework\Modules\Metadata\Models\MetadataElement
- * @covers \Hyde\Framework\Modules\Metadata\Models\OpenGraphElement
+ * @covers \Hyde\Metadata\MetadataBag
+ * @covers \Hyde\Metadata\PageMetadataBag
+ * @covers \Hyde\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Metadata\Models\LinkElement
+ * @covers \Hyde\Metadata\Models\MetadataElement
+ * @covers \Hyde\Metadata\Models\OpenGraphElement
  */
 class MetadataTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataViewTest.php b/packages/framework/tests/Feature/MetadataViewTest.php
index 08303304908..2ca023589df 100644
--- a/packages/framework/tests/Feature/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/MetadataViewTest.php
@@ -15,9 +15,9 @@
  *
  * This test is useful both as a regression test, and also to ensure all tags are covered.
  *
- * @covers \Hyde\Framework\Modules\Metadata\MetadataBag
- * @covers \Hyde\Framework\Modules\Metadata\PageMetadataBag
- * @covers \Hyde\Framework\Modules\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Metadata\MetadataBag
+ * @covers \Hyde\Metadata\PageMetadataBag
+ * @covers \Hyde\Metadata\GlobalMetadataBag
  */
 class MetadataViewTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index cfcf72be63a..af5c6204d78 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Models\Support\Site;
-use Hyde\Framework\Modules\Metadata\GlobalMetadataBag;
+use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Testing\TestCase;
 
 /**

From aff08a986991f040984a984c8bf45074b5c8685d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:23:14 +0200
Subject: [PATCH 015/768] Move Markdown module to root Hyde namespace

---
 .../Internal/SetsUpMarkdownConverter.php         |  6 +++---
 .../Contracts/MarkdownShortcodeContract.php      |  2 +-
 .../Modules => }/Markdown/BladeDownProcessor.php |  2 +-
 .../Markdown/CodeblockFilepathProcessor.php      |  2 +-
 .../Modules => }/Markdown/ShortcodeProcessor.php |  4 ++--
 .../Markdown/Shortcodes/ColoredBlockquotes.php   |  2 +-
 .../Feature/ColoredBlockquoteShortcodesTest.php  |  4 ++--
 .../Feature/Services/BladeDownProcessorTest.php  |  4 ++--
 .../Markdown/CodeblockFilepathProcessorTest.php  | 16 ++++++++--------
 .../Services/Markdown/ShortcodeProcessorTest.php | 12 ++++++------
 10 files changed, 27 insertions(+), 27 deletions(-)
 rename packages/framework/src/{Framework/Modules => }/Markdown/BladeDownProcessor.php (98%)
 rename packages/framework/src/{Framework/Modules => }/Markdown/CodeblockFilepathProcessor.php (98%)
 rename packages/framework/src/{Framework/Modules => }/Markdown/ShortcodeProcessor.php (96%)
 rename packages/framework/src/{Framework/Modules => }/Markdown/Shortcodes/ColoredBlockquotes.php (96%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
index 5e96add099f..a016487bce9 100644
--- a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
+++ b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
-use Hyde\Framework\Modules\Markdown\BladeDownProcessor;
-use Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor;
-use Hyde\Framework\Modules\Markdown\ShortcodeProcessor;
+use Hyde\Markdown\BladeDownProcessor;
+use Hyde\Markdown\CodeblockFilepathProcessor;
+use Hyde\Markdown\ShortcodeProcessor;
 use Torchlight\Commonmark\V2\TorchlightExtension;
 
 /**
diff --git a/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php b/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
index 8a66d12f6df..b7e5e0eecf1 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
+++ b/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts;
 
 /**
- * @see \Hyde\Framework\Modules\Markdown\ShortcodeProcessor to see how this is used.
+ * @see \Hyde\Markdown\ShortcodeProcessor to see how this is used.
  */
 interface MarkdownShortcodeContract
 {
diff --git a/packages/framework/src/Framework/Modules/Markdown/BladeDownProcessor.php b/packages/framework/src/Markdown/BladeDownProcessor.php
similarity index 98%
rename from packages/framework/src/Framework/Modules/Markdown/BladeDownProcessor.php
rename to packages/framework/src/Markdown/BladeDownProcessor.php
index 584d6ccfd1b..b3df0e6a8fc 100644
--- a/packages/framework/src/Framework/Modules/Markdown/BladeDownProcessor.php
+++ b/packages/framework/src/Markdown/BladeDownProcessor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Markdown;
+namespace Hyde\Markdown;
 
 use Hyde\Framework\Contracts\MarkdownPostProcessorContract;
 use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
diff --git a/packages/framework/src/Framework/Modules/Markdown/CodeblockFilepathProcessor.php b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
similarity index 98%
rename from packages/framework/src/Framework/Modules/Markdown/CodeblockFilepathProcessor.php
rename to packages/framework/src/Markdown/CodeblockFilepathProcessor.php
index 50cb38d4876..7e22fb25ac1 100644
--- a/packages/framework/src/Framework/Modules/Markdown/CodeblockFilepathProcessor.php
+++ b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Markdown;
+namespace Hyde\Markdown;
 
 use Hyde\Framework\Contracts\MarkdownPostProcessorContract;
 use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
diff --git a/packages/framework/src/Framework/Modules/Markdown/ShortcodeProcessor.php b/packages/framework/src/Markdown/ShortcodeProcessor.php
similarity index 96%
rename from packages/framework/src/Framework/Modules/Markdown/ShortcodeProcessor.php
rename to packages/framework/src/Markdown/ShortcodeProcessor.php
index c492ab9e00e..6f122d2df5b 100644
--- a/packages/framework/src/Framework/Modules/Markdown/ShortcodeProcessor.php
+++ b/packages/framework/src/Markdown/ShortcodeProcessor.php
@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Markdown;
+namespace Hyde\Markdown;
 
 use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
 use Hyde\Framework\Contracts\MarkdownShortcodeContract;
-use Hyde\Framework\Modules\Markdown\Shortcodes\ColoredBlockquotes;
+use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
 
 /**
  * Handle all shortcode processing for a Markdown conversion.
diff --git a/packages/framework/src/Framework/Modules/Markdown/Shortcodes/ColoredBlockquotes.php b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
similarity index 96%
rename from packages/framework/src/Framework/Modules/Markdown/Shortcodes/ColoredBlockquotes.php
rename to packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
index c15560115f6..fb846e96ab9 100644
--- a/packages/framework/src/Framework/Modules/Markdown/Shortcodes/ColoredBlockquotes.php
+++ b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\Markdown\Shortcodes;
+namespace Hyde\Markdown\Shortcodes;
 
 use Hyde\Framework\Contracts\MarkdownShortcodeContract;
 
diff --git a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
index 12217dfe1f3..b142a2c58f0 100644
--- a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
+++ b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Modules\Markdown\Shortcodes\ColoredBlockquotes;
+use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ColoredBlockquoteShortcodesTest.
  *
- * @covers \Hyde\Framework\Modules\Markdown\Shortcodes\ColoredBlockquotes
+ * @covers \Hyde\Markdown\Shortcodes\ColoredBlockquotes
  */
 class ColoredBlockquoteShortcodesTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php b/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
index 603eb454104..21a38012551 100644
--- a/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Modules\Markdown\BladeDownProcessor;
+use Hyde\Markdown\BladeDownProcessor;
 use Hyde\Testing\TestCase;
 
 /**
  * Class BladeDownProcessorTest.
  *
- * @covers \Hyde\Framework\Modules\Markdown\BladeDownProcessor
+ * @covers \Hyde\Markdown\BladeDownProcessor
  */
 class BladeDownProcessorTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
index f3dd2d33622..90facf347f2 100644
--- a/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor;
+use Hyde\Markdown\CodeblockFilepathProcessor;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor
+ * @covers \Hyde\Markdown\CodeblockFilepathProcessor
  */
 class CodeblockFilepathProcessorTest extends TestCase
 {
@@ -37,7 +37,7 @@ public function test_preprocess_accepts_multiple_filepath_formats()
             $markdown = "\n```php\n{$pattern}foo.php\necho 'Hello World';\n```";
             $expected = "\n<!-- HYDE[Filepath]foo.php -->\n```php\necho 'Hello World';\n```";
 
-            $this->assertEquals($expected, CodeblockFilepathProcessor::preprocess($markdown));
+            $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
         }
     }
 
@@ -55,10 +55,10 @@ public function test_preprocess_accepts_multiple_languages()
             $markdown = "\n```{$language}\n// filepath: foo.{$language}\nfoo\n```";
             $expected = "\n<!-- HYDE[Filepath]foo.{$language} -->\n```{$language}\nfoo\n```";
 
-            $this->assertEquals($expected, \Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+            $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
         }
 
-        $this->assertEquals($expected, \Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_preprocess_accepts_multiple_input_blocks()
@@ -114,7 +114,7 @@ public function test_preprocess_accepts_multi_line_codeblocks()
         ```
         MD;
 
-        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_space_after_filepath_is_optional()
@@ -136,8 +136,8 @@ public function test_space_after_filepath_is_optional()
         ```
         MD;
 
-        $this->assertEqualsIgnoringLineReturnType(\Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor::preprocess($expected),
-            \Hyde\Framework\Modules\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEqualsIgnoringLineReturnType(\Hyde\Markdown\CodeblockFilepathProcessor::preprocess($expected),
+            \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_processor_expands_filepath_directive_in_standard_codeblock()
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index a88d23f2cf5..4a72e001206 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
 use Hyde\Framework\Contracts\MarkdownShortcodeContract;
-use Hyde\Framework\Modules\Markdown\ShortcodeProcessor;
+use Hyde\Markdown\ShortcodeProcessor;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Modules\Markdown\ShortcodeProcessor
+ * @covers \Hyde\Markdown\ShortcodeProcessor
  */
 class ShortcodeProcessorTest extends TestCase
 {
@@ -23,7 +23,7 @@ public function test_constructor_discovers_default_shortcodes()
 
     public function test_discovered_shortcodes_are_used_to_process_input()
     {
-        $processor = new \Hyde\Framework\Modules\Markdown\ShortcodeProcessor('>info foo');
+        $processor = new \Hyde\Markdown\ShortcodeProcessor('>info foo');
 
         $this->assertEquals('<blockquote class="info">foo</blockquote>',
             $processor->run());
@@ -31,7 +31,7 @@ public function test_discovered_shortcodes_are_used_to_process_input()
 
     public function test_string_without_shortcode_is_not_modified()
     {
-        $processor = new \Hyde\Framework\Modules\Markdown\ShortcodeProcessor('foo');
+        $processor = new \Hyde\Markdown\ShortcodeProcessor('foo');
 
         $this->assertEquals('foo', $processor->run());
     }
@@ -39,12 +39,12 @@ public function test_string_without_shortcode_is_not_modified()
     public function test_process_static_shorthand()
     {
         $this->assertEquals('<blockquote class="info">foo</blockquote>',
-            ShortcodeProcessor::preprocess('>info foo'));
+            \Hyde\Markdown\ShortcodeProcessor::preprocess('>info foo'));
     }
 
     public function test_shortcodes_can_be_added_to_processor()
     {
-        $processor = new \Hyde\Framework\Modules\Markdown\ShortcodeProcessor('foo');
+        $processor = new \Hyde\Markdown\ShortcodeProcessor('foo');
 
         $processor->addShortcode(new class implements MarkdownShortcodeContract
         {

From 79a69645a1b35883b553d2631dd5ac3752ab80f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:31:07 +0200
Subject: [PATCH 016/768] Move DataCollections module to root Hyde namespace

---
 docs/digging-deeper/collections.md                   |  2 +-
 .../Modules => }/DataCollections/DataCollection.php  |  2 +-
 .../DataCollectionServiceProvider.php                |  4 ++--
 .../DataCollections/Facades/MarkdownCollection.php   |  4 ++--
 .../framework/src/Framework/HydeServiceProvider.php  |  2 +-
 .../framework/tests/Feature/DataCollectionTest.php   | 12 ++++++------
 .../framework/tests/Unit/HydeServiceProviderTest.php |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/framework/src/{Framework/Modules => }/DataCollections/DataCollection.php (97%)
 rename packages/framework/src/{Framework/Modules => }/DataCollections/DataCollectionServiceProvider.php (88%)
 rename packages/framework/src/{Framework/Modules => }/DataCollections/Facades/MarkdownCollection.php (69%)

diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index 82cfad48b5d..be41b07cd6b 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -88,7 +88,7 @@ MarkdownCollection::get('subdirectory_name')
 
 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 class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\Framework\Modules\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
+<pre class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
 
 
 #### Implementing it in a Blade view
diff --git a/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php b/packages/framework/src/DataCollections/DataCollection.php
similarity index 97%
rename from packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
rename to packages/framework/src/DataCollections/DataCollection.php
index d5aca948094..9cea37df393 100644
--- a/packages/framework/src/Framework/Modules/DataCollections/DataCollection.php
+++ b/packages/framework/src/DataCollections/DataCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\DataCollections;
+namespace Hyde\DataCollections;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
similarity index 88%
rename from packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
rename to packages/framework/src/DataCollections/DataCollectionServiceProvider.php
index 5469c0002cd..1c60c6da21d 100644
--- a/packages/framework/src/Framework/Modules/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\DataCollections;
+namespace Hyde\DataCollections;
 
 use Hyde\Framework\Helpers\Features;
 use Hyde\Hyde;
@@ -19,7 +19,7 @@ public function register()
         // Register the class alias
         AliasLoader::getInstance()->alias(
             'MarkdownCollection',
-            Facades\MarkdownCollection::class
+            \Hyde\DataCollections\Facades\MarkdownCollection::class
         );
     }
 
diff --git a/packages/framework/src/Framework/Modules/DataCollections/Facades/MarkdownCollection.php b/packages/framework/src/DataCollections/Facades/MarkdownCollection.php
similarity index 69%
rename from packages/framework/src/Framework/Modules/DataCollections/Facades/MarkdownCollection.php
rename to packages/framework/src/DataCollections/Facades/MarkdownCollection.php
index 54100494691..795816ca26a 100644
--- a/packages/framework/src/Framework/Modules/DataCollections/Facades/MarkdownCollection.php
+++ b/packages/framework/src/DataCollections/Facades/MarkdownCollection.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Modules\DataCollections\Facades;
+namespace Hyde\DataCollections\Facades;
 
-use Hyde\Framework\Modules\DataCollections\DataCollection;
+use Hyde\DataCollections\DataCollection;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\DataCollectionTest
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index f7b02b0fe23..9a9e1204ceb 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -134,6 +134,6 @@ protected function registerHydeConsoleCommands(): void
      */
     protected function registerModuleServiceProviders(): void
     {
-        $this->app->register(Modules\DataCollections\DataCollectionServiceProvider::class);
+        $this->app->register(\Hyde\DataCollections\DataCollectionServiceProvider::class);
     }
 }
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 88b038b849b..30aab0ad3c2 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\DataCollections\DataCollection;
+use Hyde\DataCollections\DataCollectionServiceProvider;
+use Hyde\DataCollections\Facades\MarkdownCollection;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Models\Markdown\MarkdownDocument;
-use Hyde\Framework\Modules\DataCollections\DataCollection;
-use Hyde\Framework\Modules\DataCollections\DataCollectionServiceProvider;
-use Hyde\Framework\Modules\DataCollections\Facades\MarkdownCollection;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Foundation\AliasLoader;
@@ -16,9 +16,9 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Modules\DataCollections\DataCollection
- * @covers \Hyde\Framework\Modules\DataCollections\DataCollectionServiceProvider
- * @covers \Hyde\Framework\Modules\DataCollections\Facades\MarkdownCollection
+ * @covers \Hyde\DataCollections\DataCollection
+ * @covers \Hyde\DataCollections\DataCollectionServiceProvider
+ * @covers \Hyde\DataCollections\Facades\MarkdownCollection
  */
 class DataCollectionTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 8adb469ef30..9702e85928d 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Models\Pages\BladePage;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
-use Hyde\Framework\Modules\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;

From d9e0276807ba4061ea644a763d38169cfcbe6f4b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:40:42 +0200
Subject: [PATCH 017/768] Delete Modules\README.md

---
 packages/framework/src/Framework/Modules/README.md | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Modules/README.md

diff --git a/packages/framework/src/Framework/Modules/README.md b/packages/framework/src/Framework/Modules/README.md
deleted file mode 100644
index 57fff10f6f5..00000000000
--- a/packages/framework/src/Framework/Modules/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Hyde Modules
-
-This directory contains self-contained code modules,
-that may eventually be extracted into packages.
-
-They may also be merged into the Hyde core.
-
-As these modules may be experimental,
-the namespaces used may be changed without notice
-as per the current 0.x semantic versioning range.

From db4d79b74d419debeb474c35704e8db83e2e8567 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:50:30 +0200
Subject: [PATCH 018/768] Delete projects/shelf directory

---
 projects/shelf/README.md                      |   3 -
 projects/shelf/admin/CONTRIBUTING.md          |  55 ---
 projects/shelf/admin/LICENSE.md               |  21 -
 projects/shelf/admin/README.md                |  52 --
 projects/shelf/admin/composer.json            |  55 ---
 projects/shelf/admin/config/config.php        |   8 -
 .../resources/views/components/card.blade.php |   3 -
 .../views/components/header.blade.php         |   8 -
 .../views/components/sidebar-link.blade.php   |  16 -
 .../admin/resources/views/dashboard.blade.php |  48 --
 .../resources/views/layouts/footer.blade.php  |  39 --
 .../views/layouts/navigation.blade.php        |  17 -
 .../resources/views/layouts/sidebar.blade.php |  58 ---
 .../admin/resources/views/pages/404.blade.php |  11 -
 .../resources/views/pages/dashboard.blade.php | 219 ---------
 .../resources/views/pages/docs.blade.php      |  59 ---
 .../resources/views/pages/media.blade.php     | 113 -----
 .../resources/views/pages/pages.blade.php     | 103 ----
 .../resources/views/pages/posts.blade.php     |  70 ---
 projects/shelf/admin/src/Admin.php            |   8 -
 projects/shelf/admin/src/AdminPage.php        |  49 --
 .../shelf/admin/src/AdminServiceProvider.php  |  18 -
 .../dashboard-manual.txt                      |  68 ---
 .../shelf/single-file-dashboard/dashboard.php | 465 ------------------
 24 files changed, 1566 deletions(-)
 delete mode 100644 projects/shelf/README.md
 delete mode 100644 projects/shelf/admin/CONTRIBUTING.md
 delete mode 100644 projects/shelf/admin/LICENSE.md
 delete mode 100644 projects/shelf/admin/README.md
 delete mode 100644 projects/shelf/admin/composer.json
 delete mode 100644 projects/shelf/admin/config/config.php
 delete mode 100644 projects/shelf/admin/resources/views/components/card.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/components/header.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/components/sidebar-link.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/dashboard.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/footer.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/navigation.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/sidebar.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/404.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/dashboard.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/docs.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/media.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/pages.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/posts.blade.php
 delete mode 100644 projects/shelf/admin/src/Admin.php
 delete mode 100644 projects/shelf/admin/src/AdminPage.php
 delete mode 100644 projects/shelf/admin/src/AdminServiceProvider.php
 delete mode 100644 projects/shelf/single-file-dashboard/dashboard-manual.txt
 delete mode 100644 projects/shelf/single-file-dashboard/dashboard.php

diff --git a/projects/shelf/README.md b/projects/shelf/README.md
deleted file mode 100644
index ff9fa6ffdbc..00000000000
--- a/projects/shelf/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The Shelf
-
-A collection of work-in-progress projects that may or may not work.
diff --git a/projects/shelf/admin/CONTRIBUTING.md b/projects/shelf/admin/CONTRIBUTING.md
deleted file mode 100644
index b4ae1c4a7cf..00000000000
--- a/projects/shelf/admin/CONTRIBUTING.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributing
-
-Contributions are **welcome** and will be fully **credited**.
-
-Please read and understand the contribution guide before creating an issue or pull request.
-
-## Etiquette
-
-This project is open source, and as such, the maintainers give their free time to build and maintain the source code
-held within. They make the code freely available in the hope that it will be of use to other developers. It would be
-extremely unfair for them to suffer abuse or anger for their hard work.
-
-Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
-world that developers are civilized and selfless people.
-
-It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
-quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
-
-## Viability
-
-When requesting or submitting new features, first consider whether it might be useful to others. Open
-source projects are used by many developers, who may have entirely different needs to your own. Think about
-whether or not your feature is likely to be used by other users of the project.
-
-## Procedure
-
-Before filing an issue:
-
-- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident.
-- Check to make sure your feature suggestion isn't already present within the project.
-- Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
-- Check the pull requests tab to ensure that the feature isn't already in progress.
-
-Before submitting a pull request:
-
-- Check the codebase to ensure that your feature doesn't already exist.
-- Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
-
-## Requirements
-
-If the project maintainer has any additional requirements, you will find them listed here.
-
-- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer).
-
-- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
-
-- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
-
-- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
-
-- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
-
-- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
-
-**Happy coding**!
diff --git a/projects/shelf/admin/LICENSE.md b/projects/shelf/admin/LICENSE.md
deleted file mode 100644
index f9d246d3801..00000000000
--- a/projects/shelf/admin/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Caen De Silva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/admin/README.md b/projects/shelf/admin/README.md
deleted file mode 100644
index b750da0a788..00000000000
--- a/projects/shelf/admin/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Very short description of the package
-
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
-[![Total Downloads](https://img.shields.io/packagist/dt/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
-![GitHub Actions](https://github.com/hyde/admin/actions/workflows/main.yml/badge.svg)
-
-This is where your description should go. Try and limit it to a paragraph or two, and maybe throw in a mention of what PSRs you support to avoid any confusion with users and contributors.
-
-## Installation
-
-You can install the package via composer:
-
-```bash
-composer require hyde/admin
-```
-
-## Usage
-
-```php
-// Usage description here
-```
-
-### Testing
-
-```bash
-composer test
-```
-
-### Changelog
-
-Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.
-
-## Contributing
-
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
-
-### Security
-
-If you discover any security related issues, please email caen@desilva.se instead of using the issue tracker.
-
-## Credits
-
--   [Caen De Silva](https://github.com/hyde)
--   [All Contributors](../../contributors)
-
-## License
-
-The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
-
-## Laravel Package Boilerplate
-
-This package was generated using the [Laravel Package Boilerplate](https://laravelpackageboilerplate.com).
diff --git a/projects/shelf/admin/composer.json b/projects/shelf/admin/composer.json
deleted file mode 100644
index a82bdf4a7bc..00000000000
--- a/projects/shelf/admin/composer.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "hyde/admin",
-    "description": "Experimental admin panel for local HydePHP development",
-    "keywords": [
-        "hyde",
-        "admin"
-    ],
-    "homepage": "https://github.com/hyde/admin",
-    "license": "MIT",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Caen De Silva",
-            "email": "caen@desilva.se",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^9.5",
-        "hyde/framework": "dev-master"
-    },
-    "require-dev": {
-        "orchestra/testbench": "^6.0",
-        "phpunit/phpunit": "^9.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Hyde\\Admin\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Hyde\\Admin\\Tests\\": "tests"
-        }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Hyde\\Admin\\AdminServiceProvider"
-            ],
-            "aliases": {
-                "Admin": "Hyde\\Admin\\AdminFacade"
-            }
-        }
-    }
-}
diff --git a/projects/shelf/admin/config/config.php b/projects/shelf/admin/config/config.php
deleted file mode 100644
index aaec0920123..00000000000
--- a/projects/shelf/admin/config/config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/*
- * You can place your custom package configuration in here.
- */
-return [
-
-];
diff --git a/projects/shelf/admin/resources/views/components/card.blade.php b/projects/shelf/admin/resources/views/components/card.blade.php
deleted file mode 100644
index 5c2009ebf83..00000000000
--- a/projects/shelf/admin/resources/views/components/card.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div {{ $attributes->merge(['class' => 'relative flex flex-col min-w-0 break-words bg-white w-full mb-6 px-6 py-4 shadow-lg rounded']) }}>
-    {{ $slot }}
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/header.blade.php b/projects/shelf/admin/resources/views/components/header.blade.php
deleted file mode 100644
index 35fc4964955..00000000000
--- a/projects/shelf/admin/resources/views/components/header.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Header -->
-<div class="relative bg-pink-600 md:pt-24 pb-32 pt-12">
-    <div class="px-4 md:px-10 mx-auto w-full">
-        <div>
-            {{ $slot }}
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/sidebar-link.blade.php b/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
deleted file mode 100644
index cbd9bec9e98..00000000000
--- a/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@props([
-    'route',
-    'label',
-    'icon' => 'file',
-    'active' => $page->route == $route
-])
-
-<a href="?route={{ $route }}" @class([
-        'text-xs uppercase py-3 font-bold block text-slate-700 hover:text-slate-500',
-        'text-pink-500 hover:text-pink-600' => $active ])>
-    <i @class([
-        "fas fa-$icon mr-2 text-sm",
-        'opacity-75' => $active,
-        'text-slate-300' => ! $active
-    ])></i>
-{{ $label }}</a>
diff --git a/projects/shelf/admin/resources/views/dashboard.blade.php b/projects/shelf/admin/resources/views/dashboard.blade.php
deleted file mode 100644
index 76fa4aff324..00000000000
--- a/projects/shelf/admin/resources/views/dashboard.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-=========================================================
-* Notus JS - v1.1.0 based on Tailwind Starter Kit by Creative Tim
-=========================================================
-
-* Product Page: https://www.creative-tim.com/product/notus-js
-* Copyright 2021 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/notus-js/blob/main/LICENSE.md)
-
-* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
-
-* Coded by Creative Tim
-
-=========================================================
-
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
--->
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css"
-        integrity="sha512-KfkfwYDsLkIlwQp6LFnl8zNdLGxu9YAA1QvwINks4PhcElQSvqcyVLLD9aMhXd13uQjoXtEKNosOWaZqXgel0g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <script src="https://cdn.tailwindcss.com?plugins=typography"></script>
-    <title>Dashboard | {{ config('hyde.name') }} Admin</title>
-</head>
-
-<body class="text-slate-700 antialiased">
-    <div id="root">
-        @include('hyde-admin::layouts.sidebar')
-
-        <div class="relative md:ml-64 min-h-screen flex flex-col bg-slate-50">
-            @include('hyde-admin::layouts.navigation')
-
-            <main class="relative pb-32 flex-1">
-                @include($page->view())
-            </main>
-       
-            @include('hyde-admin::layouts.footer')
-        </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/footer.blade.php b/projects/shelf/admin/resources/views/layouts/footer.blade.php
deleted file mode 100644
index 9bfde1b88d9..00000000000
--- a/projects/shelf/admin/resources/views/layouts/footer.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<footer class="block py-4">
-	<div class="container mx-auto px-4">
-		<hr class="mb-4 border-b-1 border-slate-200" />
-		<div class="flex flex-wrap items-center md:justify-between justify-center">
-			<div class="w-full md:w-4/12 px-4">
-				<div class="text-sm text-slate-500 font-semibold py-1 text-center md:text-left">
-					Copyright © <span id="get-current-year"></span>
-					<a href="https://www.creative-tim.com?ref=njs-dashboard"
-						class="text-slate-500 hover:text-slate-700 text-sm font-semibold py-1"> Creative
-						Tim </a>
-				</div>
-			</div>
-			<div class="w-full md:w-8/12 px-4">
-				<ul class="flex flex-wrap list-none md:justify-end justify-center">
-					<li>
-						<a href="https://www.creative-tim.com?ref=njs-dashboard"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Creative Tim </a>
-					</li>
-					<li>
-						<a href="https://www.creative-tim.com/presentation?ref=njs-dashboard"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							About Us </a>
-					</li>
-					<li>
-						<a href="https://demos.creative-tim.com/notus-js/pages/admin/dashboard.html"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Notus Demo </a>
-					</li>
-					<li>
-						<a href="https://www.creative-tim.com/learning-lab/tailwind/js/overview/notus"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Notus Docs </a>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</footer>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/navigation.blade.php b/projects/shelf/admin/resources/views/layouts/navigation.blade.php
deleted file mode 100644
index 9caed5e8351..00000000000
--- a/projects/shelf/admin/resources/views/layouts/navigation.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<nav
-	class="absolute py-8 top-0 left-0 w-full z-10 bg-transparent md:flex-row md:flex-nowrap md:justify-start flex items-center p-4">
-	<div class="w-full mx-autp items-center flex justify-between md:flex-nowrap flex-wrap md:px-10 px-4">
-		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="?route=dashboard">Dashboard</a>
-		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="{{ Route::home() }}">Back to site</a>
-		{{-- <form class="md:flex hidden flex-row flex-wrap items-center lg:ml-auto mr-3">
-			<div class="relative flex w-full flex-wrap items-stretch">
-				<span
-					class="z-10 h-full leading-snug font-normal text-center text-slate-300 absolute bg-transparent rounded text-base items-center justify-center w-8 pl-3 py-3">
-					<i class="fas fa-search"></i>
-				</span>
-				<input type="text" placeholder="Search here..."
-					class="border-0 px-3 py-3 placeholder-slate-300 text-slate-600 relative bg-white rounded text-sm shadow outline-none focus:outline-none focus:ring w-full pl-10" />
-			</div>
-		</form> --}}
-	</div>
-</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/sidebar.blade.php b/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
deleted file mode 100644
index ce79d113e84..00000000000
--- a/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<nav
-	class="md:left-0 md:block md:fixed md:top-0 md:bottom-0 md:overflow-y-auto md:flex-row md:flex-nowrap md:overflow-hidden shadow-xl bg-white flex flex-wrap items-center justify-between relative md:w-64 z-10 py-4 px-6">
-	<div
-		class="md:flex-col md:items-stretch md:min-h-full md:flex-nowrap px-0 flex flex-wrap items-center justify-between w-full mx-auto">
-		<button
-			class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
-			type="button" onclick="toggleNavbar('example-collapse-sidebar')">
-			<i class="fas fa-bars"></i>
-		</button>
-		<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
-			href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
-		
-		<div class="md:flex md:flex-col md:items-stretch md:opacity-100 md:relative md:shadow-none shadow absolute top-0 left-0 right-0 z-40 overflow-y-auto overflow-x-hidden h-auto items-center flex-1 rounded hidden"
-			id="example-collapse-sidebar">
-			<div class="md:min-w-full md:hidden block pb-4 mb-4 border-b border-solid border-slate-200">
-				<div class="flex flex-wrap">
-					<div class="w-6/12">
-						<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
-							href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
-					</div>
-					<div class="w-6/12 flex justify-end">
-						<button type="button"
-							class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
-							onclick="toggleNavbar('example-collapse-sidebar')">
-							<i class="fas fa-times"></i>
-						</button>
-					</div>
-				</div>
-			</div>
-			<form class="mt-6 mb-4 md:hidden">
-				<div class="mb-3 pt-0">
-					<input type="text" placeholder="Search"
-						class="px-3 py-2 h-12 border border-solid border-slate-500 placeholder-slate-300 text-slate-600 bg-white rounded text-base leading-snug shadow-none outline-none focus:outline-none w-full font-normal" />
-				</div>
-			</form>
-			<!-- Divider -->
-			<hr class="my-4 md:min-w-full" />
-			<!-- Heading -->
-			<h6 class="md:min-w-full text-slate-500 text-xs uppercase font-bold block pt-1 pb-4 no-underline">
-				Site Content </h6>
-			<!-- Navigation -->
-			<ul class="md:flex-col md:min-w-full flex flex-col list-none">
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="pages" label="Static Pages" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="posts" label="Blog Posts" icon="rss" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="docs" label="Documentation" icon="book" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="media" label="Media Library" icon="photo-film" />
-				</li>
-			</ul>
-		</div>
-	</div>
-</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/404.blade.php b/projects/shelf/admin/resources/views/pages/404.blade.php
deleted file mode 100644
index 28e9dbea345..00000000000
--- a/projects/shelf/admin/resources/views/pages/404.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>404 - Not found</h2>
-            <p class="lead">Sorry, that page could not be found.</p>
-
-            <a href="?route=dashboard" class="mr-3">Back to dashboard</a>
-            <a href="{{ Route::home() }}">Back to site</a>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/dashboard.blade.php b/projects/shelf/admin/resources/views/pages/dashboard.blade.php
deleted file mode 100644
index 10dc9bedd28..00000000000
--- a/projects/shelf/admin/resources/views/pages/dashboard.blade.php
+++ /dev/null
@@ -1,219 +0,0 @@
-@php
-use Hyde\Framework\Services\DiscoveryService;
-@endphp
-
-<x-hyde-admin::header>
-	<!-- Card stats -->
-	<div class="flex flex-wrap">
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Blade Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getBladePageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-red-500">
-								<i class="far fa-chart-bar"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-emerald-500 mr-2">
-									<i class="fas fa-arrow-up"></i> 3.48% </span>
-						<span class="whitespace-nowrap"> Since last month </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-orange-500">
-								<i class="fas fa-chart-pie"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-red-500 mr-2">
-									<i class="fas fa-arrow-down"></i> 3.48% </span>
-						<span class="whitespace-nowrap"> Since last week </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Documentation Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getDocumentationPageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-pink-500">
-								<i class="fas fa-users"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-orange-500 mr-2">
-									<i class="fas fa-arrow-down"></i> 1.10% </span>
-						<span class="whitespace-nowrap"> Since yesterday </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Posts </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPostFiles()) }}</b> posts </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-indigo-500">
-								<i class="fas fa-percent"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-emerald-500 mr-2">
-									<i class="fas fa-arrow-up"></i> 12% </span>
-						<span class="whitespace-nowrap"> Since last month </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-	</div>
-</x-hyde-admin::header>
-
-<!-- Content -->
-<div class="px-4 md:px-10 mx-auto w-full -m-24">
-	<div class="flex flex-wrap">
-		<div class="w-full xl:w-8/12 mb-12 xl:mb-0 px-4">
-			<div class="relative flex flex-col min-w-0 break-words w-full mb-6 ">
-				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white">
-					<header>
-						<div class="rounded-t px-0 py-3 border-0">
-							<div class="flex flex-wrap items-center">
-								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Blade Pages</h3>
-								</div>
-							</div>
-						</div>
-					</header>
-					<table class="table-auto dashboard-table mt-0">
-						<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Title</th>
-							<th class="px-3 pt-2">Source File</th>
-						</tr>
-						</thead>
-						<tbody>
-						@foreach (\Hyde\Framework\Models\Pages\BladePage::all() as $page)
-							<tr>
-								<td class="px-3">
-									<a href="{{ $page->getRoute() }}">
-										{{ Hyde::makeTitle($page->view) }}
-									</a>
-								</td>
-								<td class="px-3">
-									{{ $page->getSourcePath() }}
-								</td>
-							</tr>
-						@endforeach
-						</tbody>
-					</table>
-				</section>
-
-				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white mt-8">
-					<header>
-						<div class="rounded-t px-0 py-3 border-0">
-							<div class="flex flex-wrap items-center">
-								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Markdown Pages</h3>
-								</div>
-							</div>
-						</div>
-					</header>
-					<table class="table-auto dashboard-table mt-0">
-						<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Title</th>
-							<th class="px-3 pt-2">Source File</th>
-						</tr>
-						</thead>
-						<tbody>
-						@foreach (\Hyde\Framework\Models\Pages\MarkdownPage::all() as $page)
-							<tr>
-								<td class="px-3">
-									<a href="{{ $page->getRoute() }}">
-										{{ Hyde::makeTitle($page->view) }}
-									</a>
-								</td>
-								<td class="px-3">
-									{{ $page->getSourcePath() }}
-								</td>
-							</tr>
-						@endforeach
-						</tbody>
-					</table>
-				</section>
-			</div>
-		</div>
-		<div class="w-full xl:w-4/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white w-full mb-6 shadow-lg rounded">
-				<div class="rounded-t mb-0 px-4 py-3 bg-white">
-					<div class="flex flex-wrap items-center">
-						<div class="relative w-full max-w-full flex-grow flex-1">
-							<h6 class="uppercase text-slate-400 mb-1 text-xs font-semibold"> Welcome to Hyde!
-							</h6>
-							<h2 class="text-slate-700 text-xl font-semibold"> Project Details							</h2>
-						</div>
-					</div>
-				</div>
-				<div class="p-4 flex-auto">
-					<!-- Chart -->
-					<div class="relative prose">
-						<table class="-mt-3">
-							<tbody>
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Name:</th>
-									<td class="w-full">{{ config('hyde.name', Hyde::makeTitle(basename(Hyde::path()))) }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Path:</th>
-									<td class="w-full">{{ Hyde::path() }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Framework Version:</th>
-									<td class="w-full">{{ Hyde::version() }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">PHP Version:</th>
-									<td class="w-full">{{ PHP_VERSION }} <small>({{ PHP_SAPI }})</small></td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/projects/shelf/admin/resources/views/pages/docs.blade.php b/projects/shelf/admin/resources/views/pages/docs.blade.php
deleted file mode 100644
index ddcb9f13802..00000000000
--- a/projects/shelf/admin/resources/views/pages/docs.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\DocumentationPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your Documentation Pages</h2>
-            <p class="">Here you'll find an overview of your Documentation pages.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex">
-        <x-hyde-admin::card class="w-full">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Documentation Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (DocumentationPage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-					
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/media.blade.php b/projects/shelf/admin/resources/views/pages/media.blade.php
deleted file mode 100644
index a275c87633e..00000000000
--- a/projects/shelf/admin/resources/views/pages/media.blade.php
+++ /dev/null
@@ -1,113 +0,0 @@
-@php
-use Hyde\Framework\Services\DiscoveryService;
-@endphp
-
-<x-hyde-admin::header>
-	<x-hyde-admin::card>
-		<article class="prose">
-			<h2>Your Media Library</h2>
-			<p class="">Here you'll find an overview of your site's media assets.</p>
-		</article>
-	</x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-	<div class="flex -mx-3">
-		<x-hyde-admin::card class="w-2/3 mx-3">
-			<div class="rounded-t mb-3 px-0 py-3 border-0">
-				<div class="flex flex-wrap items-center">
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-						<h3 class="font-semibold text-lg text-slate-700"> Media Files </h3>
-					</div>
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-						{{-- <button
-							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-							type="button">
-							Upload
-						</button> --}}
-					</div>
-				</div>
-			</div>
-			<div class="block w-full overflow-x-auto prose max-w-full">
-				<!-- Projects table -->
-				<table class="table-auto dashboard-table">
-					<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Filename</th>
-							<th class="px-3 pt-2">Type</th>
-							<th class="px-3 pt-2">Size</th>
-							<th class="px-3 pt-2">Last modified</th>
-						</tr>
-					</thead>
-					<tbody>
-						@foreach (DiscoveryService::getMediaAssetFiles() as $file)
-						<tr>
-							<td class="px-3">
-								<a href="media/{{ basename($file) }}">
-									{{ basename($file) }}
-								</a>
-							</td>
-							<td class="px-3">
-								@php
-								$ext = pathinfo($file, PATHINFO_EXTENSION);
-								if (in_array($ext, ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg'])) {
-								echo 'Image';
-								} elseif (in_array($ext, ['css', 'scss', 'sass'])) {
-								echo 'Stylesheet';
-								} elseif (in_array($ext, ['js', 'ts', 'php'])) {
-								echo 'Script';
-								} elseif (in_array($ext, ['mp3', 'wav', 'ogg'])) {
-								echo 'Audio';
-								} elseif (in_array($ext, ['mp4', 'webm', 'ogg'])) {
-								echo 'Video';
-								} else {
-								echo 'File';
-								}
-								@endphp
-							</td>
-							<td class="px-3">
-								@php
-								$size = filesize($file);
-								if ($size < 1024) { echo $size . ' bytes' ; } elseif ($size < 1048576) { echo
-									round($size / 1024, 2) . ' KB' ; } else { echo round($size / 1048576, 2) . ' MB' ; }
-									@endphp </td>
-							<td class="px-3">
-								{{ \Carbon\Carbon::parse(filemtime($file))->diffForHumans() }}
-							</td>
-						</tr>
-						@endforeach
-					</tbody>
-				</table>
-			</div>
-		</x-hyde-admin::card>
-
-		<x-hyde-admin::card class="w-1/3 mx-3">
-			<div class="rounded-t mb-3 px-0 py-3 border-0">
-				<div class="flex flex-wrap items-center">
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-						<h3 class="font-semibold text-lg text-slate-700"> Image Gallery </h3>
-					</div>
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-						{{-- <button
-							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-							type="button">
-							Upload
-						</button> --}}
-					</div>
-				</div>
-			</div>
-			<div class="block w-full overflow-x-auto prose max-w-full">
-				<div class="flex flex-row flex-wrap">
-					@foreach (DiscoveryService::getMediaAssetFiles() as $file)
-					@if(in_array(pathinfo($file, PATHINFO_EXTENSION), ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg']))
-					<a href="media/{{ basename($file) }}">
-						<img width="64px" height="auto" class="block" src="media/{{ basename($file) }}"
-							alt="{{ basename($file) }}" title="{{ basename($file) }}">
-					</a>
-					@endif
-					@endforeach
-				</div>
-			</div>
-		</x-hyde-admin::card>
-	</div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/pages.blade.php b/projects/shelf/admin/resources/views/pages/pages.blade.php
deleted file mode 100644
index b8aaa1392eb..00000000000
--- a/projects/shelf/admin/resources/views/pages/pages.blade.php
+++ /dev/null
@@ -1,103 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your pages</h2>
-            <p class="">Here you'll find an overview of your Blade and Markdown pages.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex -mx-3">
-        <x-hyde-admin::card class="w-1/2 mx-3">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Blade Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (BladePage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ Hyde::makeTitle($page->view) }}
-                                </a>
-                            </td>
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-
-            </div>
-        </x-hyde-admin::card>
-
-        <x-hyde-admin::card class="w-1/2 mx-3">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (MarkdownPage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/posts.blade.php b/projects/shelf/admin/resources/views/pages/posts.blade.php
deleted file mode 100644
index 47ab953d670..00000000000
--- a/projects/shelf/admin/resources/views/pages/posts.blade.php
+++ /dev/null
@@ -1,70 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\MarkdownPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your Blog Posts</h2>
-            <p class="">Here you'll find an overview of your Markdown blog posts.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex">
-        <x-hyde-admin::card class="w-full">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Posts </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Date</th>
-                            <th class="px-3 pt-2">Category</th>
-                            <th class="px-3 pt-2">Author</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (MarkdownPost::all() as $post)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $post->getRoute() }}">
-                                    {{ $post->title }}
-                                </a>
-                            </td>
-							<td class="px-3">
-                                {{ $post->date->short }}
-                            </td>
-							<td class="px-3">
-                                {{ $post->category ?? 'Uncategorized' }}
-                            </td>
-							<td class="px-3">
-                                {{ $post->author->getName() }}
-                            </td>
-                            <td class="px-3">
-                                {{ $post->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/src/Admin.php b/projects/shelf/admin/src/Admin.php
deleted file mode 100644
index 0bfb8b22aed..00000000000
--- a/projects/shelf/admin/src/Admin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-class Admin
-{
-    // Build your next great package.
-}
diff --git a/projects/shelf/admin/src/AdminPage.php b/projects/shelf/admin/src/AdminPage.php
deleted file mode 100644
index a3d3255574b..00000000000
--- a/projects/shelf/admin/src/AdminPage.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-use Desilva\Microserve\Request;
-use Hyde\Framework\Contracts\PageContract;
-use Hyde\Framework\Models\Pages\BladePage;
-
-final class AdminPage extends BladePage implements PageContract
-{
-    /** Not yet implemented, but could be used by the framework to ignore this when compiling */
-    protected static bool $compilable = false;
-
-    public string $route;
-
-    /**
-     * @inheritDoc
-     */
-    public function __construct(string $view)
-    {
-        parent::__construct($view);
-
-        $this->route = $this->request()?->get('route', 'dashboard') ?? 'dashboard';
-    }
-
-    public function getRouteKey(): string
-    {
-        return 'admin';
-    }
-
-    public function navigationMenuTitle(): string
-    {
-        return 'Admin Panel';
-    }
-
-    public function request(): ?Request
-    {
-        return isset($_SERVER['REQUEST_METHOD'])
-            ? Request::capture()
-            : null;
-    }
-
-    public function view(): string
-    {
-        $view = 'hyde-admin::pages.'.$this->route;
-
-        return view()->exists($view) ? $view : 'hyde-admin::pages.404';
-    }
-}
diff --git a/projects/shelf/admin/src/AdminServiceProvider.php b/projects/shelf/admin/src/AdminServiceProvider.php
deleted file mode 100644
index 5e71791df80..00000000000
--- a/projects/shelf/admin/src/AdminServiceProvider.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-use Hyde\Hyde;
-use Illuminate\Support\ServiceProvider;
-
-class AdminServiceProvider extends ServiceProvider
-{
-    public function boot()
-    {
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'hyde-admin');
-
-        Hyde::routes()->addRoute(
-            (new AdminPage('hyde-admin::dashboard'))->getRoute()
-        );
-    }
-}
diff --git a/projects/shelf/single-file-dashboard/dashboard-manual.txt b/projects/shelf/single-file-dashboard/dashboard-manual.txt
deleted file mode 100644
index 3eb28cc16ed..00000000000
--- a/projects/shelf/single-file-dashboard/dashboard-manual.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-HYDERC DASHBOARD MANUAL
-
-IMPORTANT NOTE
-
-As this is alpha stage software there may be bugs,
-and usage is at your own risk. You should always keep
-backups using Git version control or similar.
-
-A version allowing for community editing by creating
-a public static HTML dashboard is planned, this would
-then link to files on GitHub for collaboration.
-Though, this idea may instead be handled in a separate
-package included as a dashboard.blade.php file,
-using the default layout.
-
-
-SECURITY
-
-This is not a traditional CMS like WordPress and similar.
-It's never supposed to be on production systems.
-Instead, it's a local developer tool.
-Think of it as an integrated development environment
-specifically tailored for use with HydePHP projects.
-
-As the dashboard modifies files on the computer running it
-and gives arbitrary access to the server by running shell
-commands, opening files, and executing programs, it is
-extremely important that the dashboard is not exposed
-to the internet. You must only ever use this dashboard
-as a local development tool.
-
-A basic check is made to block requests not made from
-localhost as an extra precaution. You should still
-never make the dashboard.php file publicly accessible.
-
-Also note that error reporting is enabled by default,
-as the dashboard assumes that all who can access it
-are authorized to use the system running it.
-
-The app is not safe against XSS/script injection either
-as not all output is sanitized or escaped; and the
-output that is escaped, is only made so to prevent
-visual glitches, like displaying source HTML tags.
-
-
-LICENSE
-
-MIT License
-
-Copyright (c) 2022 Caen De Silva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/single-file-dashboard/dashboard.php b/projects/shelf/single-file-dashboard/dashboard.php
deleted file mode 100644
index 0b608c757ac..00000000000
--- a/projects/shelf/single-file-dashboard/dashboard.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-
-if ($_SERVER['REMOTE_ADDR'] !== '::1') {
-    header('HTTP/1.1 403 Forbidden');
-    echo '<h1>HTTP/1.1 403 - Access Denied</h1>';
-    echo '<p>You must be on localhost to access this page. Refusing to serve request.</p>';
-    exit;
-}
-
-// Load the same autoloader as the project
-require_once sprintf('%s/vendor/autoload.php', BASE_PATH);
-
-use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\BladePage;
-use Hyde\Framework\Models\DocumentationPage;
-use Hyde\Framework\Models\MarkdownPage;
-use Hyde\Framework\Models\MarkdownPost;
-use Hyde\Framework\Services\DiscoveryService;
-use Hyde\Hyde;
-
-const VERSION = 'dev-master';
-
-// Run the dashboard app
-try {
-
-// Create the Laravel app, and boot it up
-    try {
-        $app = require_once sprintf('%s/app/bootstrap.php', BASE_PATH);
-    } catch (\Throwable $th) {
-        try {
-            $app = require_once sprintf('%s/bootstrap/app.php', BASE_PATH);
-        } catch (\Throwable $th) {
-            throw $th;
-        }
-    }
-    $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
-    $kernel->bootstrap();
-    Hyde::setBasePath(BASE_PATH);
-
-    // Create the Hyde interface
-    $hyde = new class() extends Hyde {};
-
-    // Create the project configuration class
-    $project = new class
-    {
-        public string $path;
-        public string $name;
-
-        public function __construct()
-        {
-            $this->path = BASE_PATH;
-            $this->name = config('site.name', ucwords(str_replace('-', ' ', basename(BASE_PATH))));
-        }
-    };
-
-    // Set the app name
-    $appname = e($project->name).' CMS';
-
-    // Get the request page
-    $page = $_GET['page'] ?? 'index';
-    if ($page === 'dashboard' || $page === '') {
-        $page = 'index';
-    }
-
-    // Key => label
-    $routes = [
-        'index' => 'Dashboard',
-        '404' => '404 Page Not Found',
-        'manual'=> 'Manual',
-        'file-viewer' => 'File Viewer',
-    ];
-
-    if (! isset($routes[$page])) {
-        header('HTTP/1.1 404 Not Found');
-        $page = '404';
-    }
-
-    // Set the page name
-    $pagename = $appname.' - '.$routes[$page];
-
-    // Helper functions
-    function icon(string $name)
-    {
-        $icons = [
-            'blade' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEX/LR//LB96KezJAAAAAnRSTlN3CW8xmq0AAAA7SURBVAjXATAAz/8Ax/8AOfcAGcMARZwAbYgAbaYAbbYAbBEAbOMAY8cAZzcAcHcAPecAzZ8A8H8A+P+i4xJQuZ3gxwAAAABJRU5ErkJggg==',
-            'markdown' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKAQMAAACHcEzfAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVCQkJBQUFtOGGCAAAAAnRSTlPBCd2uk5MAAAAiSURBVAjXY2BgYKj/x+D3jMEljcEBiJwY/NIY/P6BBBkYAHYfCAEd79fPAAAAAElFTkSuQmCC',
-            'documentation' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVXV1dUVFSxYS6RAAAAAnRSTlPnEHobuHcAAAArSURBVAjXY/j/nwGIHsgzPPBneJDO8KCc4QEzCD1+zPD4MJQBEXnADlQJABfcFU91j91PAAAAAElFTkSuQmCC',
-        ];
-
-        return $icons[$name] ?? '';
-    } ?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="description" content="" />
-<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors" />
-<!-- Created with the Bootstrap Dashboard Template https://getbootstrap.com/docs/5.1/examples/dashboard/ -->
-<title><?= $pagename ?></title>
-<!-- Bootstrap core CSS -->
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
-<!-- Dashboard CSS -->
-<meta name="theme-color" content="#7952b3" /> <style> .bd-placeholder-img { font-size: 1.125rem; text-anchor: middle; -webkit-user-select: none; -moz-user-select: none; user-select: none; } @media (min-width: 768px) { .bd-placeholder-img-lg { font-size: 3.5rem; } } </style>
-<style> body { font-size: .875rem; } .feather { width: 16px; height: 16px; vertical-align: text-bottom; } /* * Sidebar */ .sidebar { position: fixed; top: 0; bottom: 0; left: 0; z-index: 100; /* Behind the navbar */ padding: 48px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } @media (max-width: 767.98px) { .sidebar { top: 5rem; } } .sidebar-sticky { position: relative; top: 0; height: calc(100vh - 48px); padding-top: .5rem; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } .sidebar .nav-link { font-weight: 500; color: #333; } .sidebar .nav-link .feather { margin-right: 4px; color: #727272; } .sidebar .nav-link.active { color: #2470dc; } .sidebar .nav-link:hover .feather, .sidebar .nav-link.active .feather { color: inherit; } .sidebar-heading { font-size: .75rem; text-transform: uppercase; } /* * Navbar */ .navbar-brand { padding-top: .75rem; padding-bottom: .75rem; font-size: 1rem; background-color: rgba(0, 0, 0, .25); box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); } .navbar .navbar-toggler { top: .25rem; right: 1rem; } .navbar .form-control { padding: .75rem 1rem; border-width: 0; border-radius: 0; } .form-control-dark { color: #fff; background-color: rgba(255, 255, 255, .1); border-color: rgba(255, 255, 255, .1); } .form-control-dark:focus { border-color: transparent; box-shadow: 0 0 0 3px rgba(255, 255, 255, .25); } </style>
-<style>/* Custom */
-   .card { padding: 1rem; margin: 1rem; margin-bottom: 1.5rem; border-radius: .5rem; box-shadow: 0 0.5rem 0.75rem rgba(0, 0, 0, .125); }
-   body {
-      min-height: 100vh;
-      display: flex;
-      flex-direction: column;
-   }  
-   #main-content-wrapper {
-      flex: 1;
-   } 
-   footer a.nav-link {
-      color: #6c757d;
-      padding: .25rem .5rem;
-   }
-   .table-secondary {
-      background-color: #eee;
-      --bs-table-bg: #eee;
-   }
-   th {
-      color: #333;
-   }
-   .table>:not(:first-child) {
-      border-top: 1.1px solid #999;
-   }
-</style>
-</head>
-<body>
-   <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-      <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="dashboard.php">
-         <?= $appname ?>
-      </a>
-      <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="navbar-nav">
-         <div class="nav-item text-nowrap">
-            <a class="nav-link px-3" href="../">Back to site</a>
-         </div>
-      </div>
-   </header>
-   <div id="main-content-wrapper" class="container-fluid">
-      <div class="row">
-         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
-            <div class="position-sticky pt-3">
-               <ul class="nav flex-column">
-                  <li class="nav-item">
-                     <a <?= $page === 'index' ? 'class="nav-link active" aria-current="page"' : 'class="nav-link"' ?>" href="dashboard.php">
-                        <span data-feather="home"></span>
-                        Dashboard
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file"></span>
-                     Orders
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="shopping-cart"></span>
-                     Products
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="users"></span>
-                     Customers
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="bar-chart-2"></span>
-                     Reports
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="layers"></span>
-                     Integrations
-                     </a>
-                  </li>
-               </ul>
-               <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-                  <span>Saved reports</span>
-                  <a class="link-secondary" href="#" aria-label="Add a new report">
-                  <span data-feather="plus-circle"></span>
-                  </a>
-               </h6>
-               <ul class="nav flex-column mb-2">
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Current month
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Last quarter
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Social engagement
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Year-end sale
-                     </a>
-                  </li>
-               </ul>
-            </div>
-         </nav>
-         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 px-xl-5 pt-xl-3">
-            <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-               <h1 class="h2"><?= $pagename ?></h1>
-            </div>
-
-               <?php if ($page === 'index') { ?>
-                  <h2 class="h3">
-                     Project Information
-                  </h2>
-                  <div class="d-flex flex-wrap -mx-3 pt-2">
-                     <div class="col-12 col-sm-10 col-xl-8 col-xxl-6">
-                        <div class="table-responsive">
-                           <section class="card">
-                              <h3 class="h5">Installation Details</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                       <th scope="col">Project Name</th>
-                                       <th scope="col">Project Path</th>
-                                       <th scope="col">Framework Version</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                    <tr>
-                                        <td><?= e($project->name) ?></td>
-                                        <td><?= e($project->path) ?></td>
-                                        <td><?= e($hyde->version()) ?></td>
-                                    </tr>
-                                 </tbody>
-                              </table>
-                           </section>
-                           <section class="card">
-                              <h3 class="h5">Content Overview</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                       <th scope="col">Blade Pages</th>
-                                       <th scope="col">Markdown Pages</th>
-                                       <th scope="col">Documentation Pages</th>
-                                       <th scope="col">Blog Posts</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                   <tr>
-                                       <td><?= count(DiscoveryService::getBladePageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getMarkdownPageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getDocumentationPageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getMarkdownPostList()) ?> posts</td>
-                                   </tr>
-                                 </tbody>
-                              </table>
-                           </section>
-                           <section class="card">
-                              <?php
-                                    $documentation = DiscoveryService::getDocumentationPageList();
-                                    $posts = DiscoveryService::getMarkdownPostList();
-                              ?>
-                              <h3 class="h5">Your Pages</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                          <th scope="col">Type</th>
-                                          <th scope="col">Page Name</th>
-                                          <th scope="col">File Path</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                    <?php foreach (BladePage::all() as $page) { ?>
-                                       <tr>
-                                          <th scope="row">
-                                             <img width="16" height="16" src="<?= icon('blade') ?>" alt="" role="presentation">
-                                             Blade
-                                          </th>
-                                          <td>
-                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->view ?></a>
-                                          </td>
-                                          <td>
-                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=bladepage&file=<?= urlencode($page->view) ?>"><?= BladePage::$sourceDirectory.'/'.$page->view.BladePage::$fileExtension ?></a>
-                                          </td>
-                                       </tr>
-                                    <?php } ?>
-                                 </tbody>
-                                 <tbody>
-                                    <?php foreach (MarkdownPage::all() as $page) { ?>
-                                       <tr>
-                                          <th scope="row">
-                                             <img width="16" height="16" src="<?= icon('markdown') ?>" alt="" role="presentation">
-                                             Markdown
-                                          </th>
-                                          <td>
-                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->title ?></a>
-                                          </td>
-                                          <td>
-                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=markdownpage&file=<?= urlencode($page->slug) ?>"><?= MarkdownPage::$sourceDirectory.'/'.$page->slug.MarkdownPage::$fileExtension ?></a>
-                                          </td>
-                                       </tr>
-                                    <?php } ?>
-                                 </tbody>
-                              </table>
-                           </section>
-                        </div>
-                     </div>
-                  </div>
-               <?php } elseif ($page === 'manual') { ?>
-                  <article>
-                     <pre><?= e(file_get_contents(__DIR__.'/dashboard-manual.txt')) ?></pre>
-                  </article>
-               <?php } elseif ($page === 'file-viewer') { ?>
-                  <div>
-                     <?php
-                        $editor = new class($_GET['type'], $_GET['file'])
-                        {
-                            public string $filename;
-                            public string $contentpath;
-                            public string $type;
-                            protected string $filepath;
-
-                            public function __construct(string $type, string $file)
-                            {
-                                $this->type = $this->qualifyType($type);
-                                $this->filename = urldecode($file);
-                                $this->contentpath = $this->getContentpath();
-                                $this->filepath = Hyde::path($this->contentpath);
-                            }
-
-                            protected function qualifyType(string $type)
-                            {
-                                $type = strtolower($type);
-                                if ($type === 'bladepage') {
-                                    return BladePage::class;
-                                } elseif ($type === 'markdownpage') {
-                                    return MarkdownPage::class;
-                                } elseif ($type === 'documentationpage') {
-                                    return DocumentationPage::class;
-                                } elseif ($type === 'markdownpost') {
-                                    return MarkdownPost::class;
-                                } else {
-                                    throw new UnsupportedPageTypeException('Invalid file type');
-                                }
-                            }
-
-                            protected function getContentpath()
-                            {
-                                $class = $this->type;
-                                $filename = $this->filename;
-                                $filepath = $class::$sourceDirectory.'/'.$filename.$class::$fileExtension;
-                                if (! file_exists(Hyde::path($filepath))) {
-                                    throw new FileNotFoundException($filepath);
-                                }
-
-                                return $filepath;
-                            }
-
-                            public function getContents()
-                            {
-                                return file_get_contents($this->filepath);
-                            }
-                        };
-                     ?>
-
-                     <section class="col-12 col-xl-10 col-xxl-8">
-                        <h3 class="h6 my-3">Showing file <code><?= e($editor->contentpath) ?></code></h3>
-                  
-                           <header class="bg-dark rounded-top d-flex align-items-center justify-content-between">
-                              <ul class="nav nav-pills" id="pills-tab" role="tablist" type="toolbar">
-                                 <li class="nav-item" role="presentation" title="View file">
-                                    <button class="nav-link  text-light active" id="pills-view-tab" data-bs-toggle="pill" data-bs-target="#pills-view" type="button" role="tab" aria-controls="pills-view" aria-selected="true">
-                                       View Source
-                                    </button>
-                                 </li>
-                                 <li class="nav-item" role="presentation" title="Basic text editor">
-                                    <button class="nav-link  text-light" id="pills-compiled-tab" data-bs-toggle="pill" data-bs-target="#pills-compiled" type="button" role="tab" aria-controls="pills-compiled" aria-selected="false">
-                                       Live Preview
-                                    </button>
-                                 </li>
-                              </ul>
-                           </header>
-                           <div class="tab-content" id="pills-tabContent">
-                              <div class="tab-pane fade show active" id="pills-view" role="tabpanel" aria-labelledby="pills-view-tab">
-                                 <pre ><code id="filecontents" class="language-<?= $editor->type === BladePage::class ? 'html' : 'markdown' ?>"><?= e($editor->getContents()) ?></code></pre>
-                              </div>
-                              <div class="tab-pane fade" id="pills-compiled" role="tabpanel" aria-labelledby="pills-compiled-tab">
-                                 <iframe loading="lazy" width="100%" height="100%" style="min-height: 600px;" src="<?= Hyde::formatLink($editor->filename.'.html') ?>" frameborder="0">
-                                 Loading...
-                              </iframe>
-                           </div>
-                           </div>
-
-                           <div>
-                           <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">
-                           <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>
-
-                              <script>
-                                 hljs.highlightElement(filecontents);
-                              </script>
-                        </div>
-                     </section>
-                     <?php unset($editor); ?>
-                  </div>
-                  
-               <?php } elseif ($page === '404') { ?>
-                  Go <a href="dashboard.php">Back to dashboard</a>?
-               <?php } ?>
-         </main>
-      </div>
-   </div>
-
-   <div class="col-md-9 ms-md-auto col-lg-10 ">
-      <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 mt-4 border-top">
-         <div class="col-md-6 d-flex align-items-center">
-            <a href="/" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
-            <svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
-            </a>
-            <span class="text-muted">HydeCMS <?= VERSION ?></span>
-                  <small class="text-muted ms-4">
-                     This page was generated in <?= number_format((microtime(true) - HYDE_START) * 1000, 2) ?>ms.
-                  </small>
-         </div>
-         <div class="col-md-6 text-end justify-content-end px-4 d-flex align-items-center">
-           <ul class="nav">
-             <li class="nav-item"> <a href="?page=manual" class="nav-link">Manual</a></li>
-             <li class="nav-item"> <a href="" class="nav-link">GitHub</a></li>
-           </ul>
-         </div>
-      </footer>
-   </div>
-   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity="sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" crossorigin="anonymous"></script>
-<!-- Dashboard scripts -->
-<script> /* feather:false */ (function() { 'use strict'; feather.replace({ 'aria-hidden': 'true' }) })() </script>
-</body>
-</html>
-
-<?php
-} catch (\Throwable $th) {
-                         echo '<h1>Error</h1>';
-                         echo '<p>An error occurred while processing your request.</p>';
-                         echo '<pre><code>'.$th->getMessage().'</code></pre>';
-                         echo '<p>Extra information:</p>';
-                         echo '<pre><code>'.$th->getTraceAsString().print_r($th, true).'</code></pre>';
-                         exit($th->getCode());
-                     }

From b2864c82b70f33bda266ae76b2221f8bddd00946 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:51:12 +0200
Subject: [PATCH 019/768] Revert "Delete projects/shelf directory"

This reverts commit db4d79b74d419debeb474c35704e8db83e2e8567.
---
 projects/shelf/README.md                      |   3 +
 projects/shelf/admin/CONTRIBUTING.md          |  55 +++
 projects/shelf/admin/LICENSE.md               |  21 +
 projects/shelf/admin/README.md                |  52 ++
 projects/shelf/admin/composer.json            |  55 +++
 projects/shelf/admin/config/config.php        |   8 +
 .../resources/views/components/card.blade.php |   3 +
 .../views/components/header.blade.php         |   8 +
 .../views/components/sidebar-link.blade.php   |  16 +
 .../admin/resources/views/dashboard.blade.php |  48 ++
 .../resources/views/layouts/footer.blade.php  |  39 ++
 .../views/layouts/navigation.blade.php        |  17 +
 .../resources/views/layouts/sidebar.blade.php |  58 +++
 .../admin/resources/views/pages/404.blade.php |  11 +
 .../resources/views/pages/dashboard.blade.php | 219 +++++++++
 .../resources/views/pages/docs.blade.php      |  59 +++
 .../resources/views/pages/media.blade.php     | 113 +++++
 .../resources/views/pages/pages.blade.php     | 103 ++++
 .../resources/views/pages/posts.blade.php     |  70 +++
 projects/shelf/admin/src/Admin.php            |   8 +
 projects/shelf/admin/src/AdminPage.php        |  49 ++
 .../shelf/admin/src/AdminServiceProvider.php  |  18 +
 .../dashboard-manual.txt                      |  68 +++
 .../shelf/single-file-dashboard/dashboard.php | 465 ++++++++++++++++++
 24 files changed, 1566 insertions(+)
 create mode 100644 projects/shelf/README.md
 create mode 100644 projects/shelf/admin/CONTRIBUTING.md
 create mode 100644 projects/shelf/admin/LICENSE.md
 create mode 100644 projects/shelf/admin/README.md
 create mode 100644 projects/shelf/admin/composer.json
 create mode 100644 projects/shelf/admin/config/config.php
 create mode 100644 projects/shelf/admin/resources/views/components/card.blade.php
 create mode 100644 projects/shelf/admin/resources/views/components/header.blade.php
 create mode 100644 projects/shelf/admin/resources/views/components/sidebar-link.blade.php
 create mode 100644 projects/shelf/admin/resources/views/dashboard.blade.php
 create mode 100644 projects/shelf/admin/resources/views/layouts/footer.blade.php
 create mode 100644 projects/shelf/admin/resources/views/layouts/navigation.blade.php
 create mode 100644 projects/shelf/admin/resources/views/layouts/sidebar.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/404.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/dashboard.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/docs.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/media.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/pages.blade.php
 create mode 100644 projects/shelf/admin/resources/views/pages/posts.blade.php
 create mode 100644 projects/shelf/admin/src/Admin.php
 create mode 100644 projects/shelf/admin/src/AdminPage.php
 create mode 100644 projects/shelf/admin/src/AdminServiceProvider.php
 create mode 100644 projects/shelf/single-file-dashboard/dashboard-manual.txt
 create mode 100644 projects/shelf/single-file-dashboard/dashboard.php

diff --git a/projects/shelf/README.md b/projects/shelf/README.md
new file mode 100644
index 00000000000..ff9fa6ffdbc
--- /dev/null
+++ b/projects/shelf/README.md
@@ -0,0 +1,3 @@
+# The Shelf
+
+A collection of work-in-progress projects that may or may not work.
diff --git a/projects/shelf/admin/CONTRIBUTING.md b/projects/shelf/admin/CONTRIBUTING.md
new file mode 100644
index 00000000000..b4ae1c4a7cf
--- /dev/null
+++ b/projects/shelf/admin/CONTRIBUTING.md
@@ -0,0 +1,55 @@
+# Contributing
+
+Contributions are **welcome** and will be fully **credited**.
+
+Please read and understand the contribution guide before creating an issue or pull request.
+
+## Etiquette
+
+This project is open source, and as such, the maintainers give their free time to build and maintain the source code
+held within. They make the code freely available in the hope that it will be of use to other developers. It would be
+extremely unfair for them to suffer abuse or anger for their hard work.
+
+Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
+world that developers are civilized and selfless people.
+
+It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
+quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
+
+## Viability
+
+When requesting or submitting new features, first consider whether it might be useful to others. Open
+source projects are used by many developers, who may have entirely different needs to your own. Think about
+whether or not your feature is likely to be used by other users of the project.
+
+## Procedure
+
+Before filing an issue:
+
+- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident.
+- Check to make sure your feature suggestion isn't already present within the project.
+- Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
+- Check the pull requests tab to ensure that the feature isn't already in progress.
+
+Before submitting a pull request:
+
+- Check the codebase to ensure that your feature doesn't already exist.
+- Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
+
+## Requirements
+
+If the project maintainer has any additional requirements, you will find them listed here.
+
+- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer).
+
+- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
+
+- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
+
+- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
+
+- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
+
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
+
+**Happy coding**!
diff --git a/projects/shelf/admin/LICENSE.md b/projects/shelf/admin/LICENSE.md
new file mode 100644
index 00000000000..f9d246d3801
--- /dev/null
+++ b/projects/shelf/admin/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) Caen De Silva
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/admin/README.md b/projects/shelf/admin/README.md
new file mode 100644
index 00000000000..b750da0a788
--- /dev/null
+++ b/projects/shelf/admin/README.md
@@ -0,0 +1,52 @@
+# Very short description of the package
+
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
+[![Total Downloads](https://img.shields.io/packagist/dt/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
+![GitHub Actions](https://github.com/hyde/admin/actions/workflows/main.yml/badge.svg)
+
+This is where your description should go. Try and limit it to a paragraph or two, and maybe throw in a mention of what PSRs you support to avoid any confusion with users and contributors.
+
+## Installation
+
+You can install the package via composer:
+
+```bash
+composer require hyde/admin
+```
+
+## Usage
+
+```php
+// Usage description here
+```
+
+### Testing
+
+```bash
+composer test
+```
+
+### Changelog
+
+Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.
+
+## Contributing
+
+Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
+
+### Security
+
+If you discover any security related issues, please email caen@desilva.se instead of using the issue tracker.
+
+## Credits
+
+-   [Caen De Silva](https://github.com/hyde)
+-   [All Contributors](../../contributors)
+
+## License
+
+The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
+
+## Laravel Package Boilerplate
+
+This package was generated using the [Laravel Package Boilerplate](https://laravelpackageboilerplate.com).
diff --git a/projects/shelf/admin/composer.json b/projects/shelf/admin/composer.json
new file mode 100644
index 00000000000..a82bdf4a7bc
--- /dev/null
+++ b/projects/shelf/admin/composer.json
@@ -0,0 +1,55 @@
+{
+    "name": "hyde/admin",
+    "description": "Experimental admin panel for local HydePHP development",
+    "keywords": [
+        "hyde",
+        "admin"
+    ],
+    "homepage": "https://github.com/hyde/admin",
+    "license": "MIT",
+    "type": "library",
+    "authors": [
+        {
+            "name": "Caen De Silva",
+            "email": "caen@desilva.se",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": "^7.4|^8.0",
+        "illuminate/support": "^9.5",
+        "hyde/framework": "dev-master"
+    },
+    "require-dev": {
+        "orchestra/testbench": "^6.0",
+        "phpunit/phpunit": "^9.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Hyde\\Admin\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Hyde\\Admin\\Tests\\": "tests"
+        }
+    },
+    "scripts": {
+        "test": "vendor/bin/phpunit",
+        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
+
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Hyde\\Admin\\AdminServiceProvider"
+            ],
+            "aliases": {
+                "Admin": "Hyde\\Admin\\AdminFacade"
+            }
+        }
+    }
+}
diff --git a/projects/shelf/admin/config/config.php b/projects/shelf/admin/config/config.php
new file mode 100644
index 00000000000..aaec0920123
--- /dev/null
+++ b/projects/shelf/admin/config/config.php
@@ -0,0 +1,8 @@
+<?php
+
+/*
+ * You can place your custom package configuration in here.
+ */
+return [
+
+];
diff --git a/projects/shelf/admin/resources/views/components/card.blade.php b/projects/shelf/admin/resources/views/components/card.blade.php
new file mode 100644
index 00000000000..5c2009ebf83
--- /dev/null
+++ b/projects/shelf/admin/resources/views/components/card.blade.php
@@ -0,0 +1,3 @@
+<div {{ $attributes->merge(['class' => 'relative flex flex-col min-w-0 break-words bg-white w-full mb-6 px-6 py-4 shadow-lg rounded']) }}>
+    {{ $slot }}
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/header.blade.php b/projects/shelf/admin/resources/views/components/header.blade.php
new file mode 100644
index 00000000000..35fc4964955
--- /dev/null
+++ b/projects/shelf/admin/resources/views/components/header.blade.php
@@ -0,0 +1,8 @@
+<!-- Header -->
+<div class="relative bg-pink-600 md:pt-24 pb-32 pt-12">
+    <div class="px-4 md:px-10 mx-auto w-full">
+        <div>
+            {{ $slot }}
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/sidebar-link.blade.php b/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
new file mode 100644
index 00000000000..cbd9bec9e98
--- /dev/null
+++ b/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
@@ -0,0 +1,16 @@
+@props([
+    'route',
+    'label',
+    'icon' => 'file',
+    'active' => $page->route == $route
+])
+
+<a href="?route={{ $route }}" @class([
+        'text-xs uppercase py-3 font-bold block text-slate-700 hover:text-slate-500',
+        'text-pink-500 hover:text-pink-600' => $active ])>
+    <i @class([
+        "fas fa-$icon mr-2 text-sm",
+        'opacity-75' => $active,
+        'text-slate-300' => ! $active
+    ])></i>
+{{ $label }}</a>
diff --git a/projects/shelf/admin/resources/views/dashboard.blade.php b/projects/shelf/admin/resources/views/dashboard.blade.php
new file mode 100644
index 00000000000..76fa4aff324
--- /dev/null
+++ b/projects/shelf/admin/resources/views/dashboard.blade.php
@@ -0,0 +1,48 @@
+<!--
+=========================================================
+* Notus JS - v1.1.0 based on Tailwind Starter Kit by Creative Tim
+=========================================================
+
+* Product Page: https://www.creative-tim.com/product/notus-js
+* Copyright 2021 Creative Tim (https://www.creative-tim.com)
+* Licensed under MIT (https://github.com/creativetimofficial/notus-js/blob/main/LICENSE.md)
+
+* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
+
+* Coded by Creative Tim
+
+=========================================================
+
+* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+-->
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css"
+        integrity="sha512-KfkfwYDsLkIlwQp6LFnl8zNdLGxu9YAA1QvwINks4PhcElQSvqcyVLLD9aMhXd13uQjoXtEKNosOWaZqXgel0g=="
+        crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <script src="https://cdn.tailwindcss.com?plugins=typography"></script>
+    <title>Dashboard | {{ config('hyde.name') }} Admin</title>
+</head>
+
+<body class="text-slate-700 antialiased">
+    <div id="root">
+        @include('hyde-admin::layouts.sidebar')
+
+        <div class="relative md:ml-64 min-h-screen flex flex-col bg-slate-50">
+            @include('hyde-admin::layouts.navigation')
+
+            <main class="relative pb-32 flex-1">
+                @include($page->view())
+            </main>
+       
+            @include('hyde-admin::layouts.footer')
+        </div>
+    </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/footer.blade.php b/projects/shelf/admin/resources/views/layouts/footer.blade.php
new file mode 100644
index 00000000000..9bfde1b88d9
--- /dev/null
+++ b/projects/shelf/admin/resources/views/layouts/footer.blade.php
@@ -0,0 +1,39 @@
+<footer class="block py-4">
+	<div class="container mx-auto px-4">
+		<hr class="mb-4 border-b-1 border-slate-200" />
+		<div class="flex flex-wrap items-center md:justify-between justify-center">
+			<div class="w-full md:w-4/12 px-4">
+				<div class="text-sm text-slate-500 font-semibold py-1 text-center md:text-left">
+					Copyright © <span id="get-current-year"></span>
+					<a href="https://www.creative-tim.com?ref=njs-dashboard"
+						class="text-slate-500 hover:text-slate-700 text-sm font-semibold py-1"> Creative
+						Tim </a>
+				</div>
+			</div>
+			<div class="w-full md:w-8/12 px-4">
+				<ul class="flex flex-wrap list-none md:justify-end justify-center">
+					<li>
+						<a href="https://www.creative-tim.com?ref=njs-dashboard"
+							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
+							Creative Tim </a>
+					</li>
+					<li>
+						<a href="https://www.creative-tim.com/presentation?ref=njs-dashboard"
+							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
+							About Us </a>
+					</li>
+					<li>
+						<a href="https://demos.creative-tim.com/notus-js/pages/admin/dashboard.html"
+							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
+							Notus Demo </a>
+					</li>
+					<li>
+						<a href="https://www.creative-tim.com/learning-lab/tailwind/js/overview/notus"
+							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
+							Notus Docs </a>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</footer>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/navigation.blade.php b/projects/shelf/admin/resources/views/layouts/navigation.blade.php
new file mode 100644
index 00000000000..9caed5e8351
--- /dev/null
+++ b/projects/shelf/admin/resources/views/layouts/navigation.blade.php
@@ -0,0 +1,17 @@
+<nav
+	class="absolute py-8 top-0 left-0 w-full z-10 bg-transparent md:flex-row md:flex-nowrap md:justify-start flex items-center p-4">
+	<div class="w-full mx-autp items-center flex justify-between md:flex-nowrap flex-wrap md:px-10 px-4">
+		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="?route=dashboard">Dashboard</a>
+		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="{{ Route::home() }}">Back to site</a>
+		{{-- <form class="md:flex hidden flex-row flex-wrap items-center lg:ml-auto mr-3">
+			<div class="relative flex w-full flex-wrap items-stretch">
+				<span
+					class="z-10 h-full leading-snug font-normal text-center text-slate-300 absolute bg-transparent rounded text-base items-center justify-center w-8 pl-3 py-3">
+					<i class="fas fa-search"></i>
+				</span>
+				<input type="text" placeholder="Search here..."
+					class="border-0 px-3 py-3 placeholder-slate-300 text-slate-600 relative bg-white rounded text-sm shadow outline-none focus:outline-none focus:ring w-full pl-10" />
+			</div>
+		</form> --}}
+	</div>
+</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/sidebar.blade.php b/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
new file mode 100644
index 00000000000..ce79d113e84
--- /dev/null
+++ b/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
@@ -0,0 +1,58 @@
+<nav
+	class="md:left-0 md:block md:fixed md:top-0 md:bottom-0 md:overflow-y-auto md:flex-row md:flex-nowrap md:overflow-hidden shadow-xl bg-white flex flex-wrap items-center justify-between relative md:w-64 z-10 py-4 px-6">
+	<div
+		class="md:flex-col md:items-stretch md:min-h-full md:flex-nowrap px-0 flex flex-wrap items-center justify-between w-full mx-auto">
+		<button
+			class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
+			type="button" onclick="toggleNavbar('example-collapse-sidebar')">
+			<i class="fas fa-bars"></i>
+		</button>
+		<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
+			href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
+		
+		<div class="md:flex md:flex-col md:items-stretch md:opacity-100 md:relative md:shadow-none shadow absolute top-0 left-0 right-0 z-40 overflow-y-auto overflow-x-hidden h-auto items-center flex-1 rounded hidden"
+			id="example-collapse-sidebar">
+			<div class="md:min-w-full md:hidden block pb-4 mb-4 border-b border-solid border-slate-200">
+				<div class="flex flex-wrap">
+					<div class="w-6/12">
+						<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
+							href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
+					</div>
+					<div class="w-6/12 flex justify-end">
+						<button type="button"
+							class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
+							onclick="toggleNavbar('example-collapse-sidebar')">
+							<i class="fas fa-times"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+			<form class="mt-6 mb-4 md:hidden">
+				<div class="mb-3 pt-0">
+					<input type="text" placeholder="Search"
+						class="px-3 py-2 h-12 border border-solid border-slate-500 placeholder-slate-300 text-slate-600 bg-white rounded text-base leading-snug shadow-none outline-none focus:outline-none w-full font-normal" />
+				</div>
+			</form>
+			<!-- Divider -->
+			<hr class="my-4 md:min-w-full" />
+			<!-- Heading -->
+			<h6 class="md:min-w-full text-slate-500 text-xs uppercase font-bold block pt-1 pb-4 no-underline">
+				Site Content </h6>
+			<!-- Navigation -->
+			<ul class="md:flex-col md:min-w-full flex flex-col list-none">
+				<li class="items-center">
+					<x-hyde-admin::sidebar-link route="pages" label="Static Pages" />
+				</li>
+				<li class="items-center">
+					<x-hyde-admin::sidebar-link route="posts" label="Blog Posts" icon="rss" />
+				</li>
+				<li class="items-center">
+					<x-hyde-admin::sidebar-link route="docs" label="Documentation" icon="book" />
+				</li>
+				<li class="items-center">
+					<x-hyde-admin::sidebar-link route="media" label="Media Library" icon="photo-film" />
+				</li>
+			</ul>
+		</div>
+	</div>
+</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/404.blade.php b/projects/shelf/admin/resources/views/pages/404.blade.php
new file mode 100644
index 00000000000..28e9dbea345
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/404.blade.php
@@ -0,0 +1,11 @@
+<x-hyde-admin::header>
+    <x-hyde-admin::card>
+        <article class="prose">
+            <h2>404 - Not found</h2>
+            <p class="lead">Sorry, that page could not be found.</p>
+
+            <a href="?route=dashboard" class="mr-3">Back to dashboard</a>
+            <a href="{{ Route::home() }}">Back to site</a>
+        </article>
+    </x-hyde-admin::card>
+</x-hyde-admin::header>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/dashboard.blade.php b/projects/shelf/admin/resources/views/pages/dashboard.blade.php
new file mode 100644
index 00000000000..10dc9bedd28
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/dashboard.blade.php
@@ -0,0 +1,219 @@
+@php
+use Hyde\Framework\Services\DiscoveryService;
+@endphp
+
+<x-hyde-admin::header>
+	<!-- Card stats -->
+	<div class="flex flex-wrap">
+		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
+			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
+				<div class="flex-auto p-4">
+					<div class="flex flex-wrap">
+						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
+							<h5 class="text-slate-400 uppercase font-bold text-xs"> Blade Pages </h5>
+							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getBladePageFiles()) }}</b> pages </span>
+						</div>
+						<div class="relative w-auto pl-4 flex-initial">
+							<div
+									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-red-500">
+								<i class="far fa-chart-bar"></i>
+							</div>
+						</div>
+					</div>
+					{{-- <p class="text-sm text-slate-400 mt-4">
+								<span class="text-emerald-500 mr-2">
+									<i class="fas fa-arrow-up"></i> 3.48% </span>
+						<span class="whitespace-nowrap"> Since last month </span>
+					</p> --}}
+				</div>
+			</div>
+		</div>
+		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
+			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
+				<div class="flex-auto p-4">
+					<div class="flex flex-wrap">
+						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
+							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Pages </h5>
+							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPageFiles()) }}</b> pages </span>
+						</div>
+						<div class="relative w-auto pl-4 flex-initial">
+							<div
+									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-orange-500">
+								<i class="fas fa-chart-pie"></i>
+							</div>
+						</div>
+					</div>
+					{{-- <p class="text-sm text-slate-400 mt-4">
+								<span class="text-red-500 mr-2">
+									<i class="fas fa-arrow-down"></i> 3.48% </span>
+						<span class="whitespace-nowrap"> Since last week </span>
+					</p> --}}
+				</div>
+			</div>
+		</div>
+		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
+			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
+				<div class="flex-auto p-4">
+					<div class="flex flex-wrap">
+						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
+							<h5 class="text-slate-400 uppercase font-bold text-xs"> Documentation Pages </h5>
+							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getDocumentationPageFiles()) }}</b> pages </span>
+						</div>
+						<div class="relative w-auto pl-4 flex-initial">
+							<div
+									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-pink-500">
+								<i class="fas fa-users"></i>
+							</div>
+						</div>
+					</div>
+					{{-- <p class="text-sm text-slate-400 mt-4">
+								<span class="text-orange-500 mr-2">
+									<i class="fas fa-arrow-down"></i> 1.10% </span>
+						<span class="whitespace-nowrap"> Since yesterday </span>
+					</p> --}}
+				</div>
+			</div>
+		</div>
+		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
+			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
+				<div class="flex-auto p-4">
+					<div class="flex flex-wrap">
+						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
+							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Posts </h5>
+							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPostFiles()) }}</b> posts </span>
+						</div>
+						<div class="relative w-auto pl-4 flex-initial">
+							<div
+									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-indigo-500">
+								<i class="fas fa-percent"></i>
+							</div>
+						</div>
+					</div>
+					{{-- <p class="text-sm text-slate-400 mt-4">
+								<span class="text-emerald-500 mr-2">
+									<i class="fas fa-arrow-up"></i> 12% </span>
+						<span class="whitespace-nowrap"> Since last month </span>
+					</p> --}}
+				</div>
+			</div>
+		</div>
+	</div>
+</x-hyde-admin::header>
+
+<!-- Content -->
+<div class="px-4 md:px-10 mx-auto w-full -m-24">
+	<div class="flex flex-wrap">
+		<div class="w-full xl:w-8/12 mb-12 xl:mb-0 px-4">
+			<div class="relative flex flex-col min-w-0 break-words w-full mb-6 ">
+				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white">
+					<header>
+						<div class="rounded-t px-0 py-3 border-0">
+							<div class="flex flex-wrap items-center">
+								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
+									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Blade Pages</h3>
+								</div>
+							</div>
+						</div>
+					</header>
+					<table class="table-auto dashboard-table mt-0">
+						<thead class="bg-slate-100">
+						<tr>
+							<th class="px-3 pt-2">Title</th>
+							<th class="px-3 pt-2">Source File</th>
+						</tr>
+						</thead>
+						<tbody>
+						@foreach (\Hyde\Framework\Models\Pages\BladePage::all() as $page)
+							<tr>
+								<td class="px-3">
+									<a href="{{ $page->getRoute() }}">
+										{{ Hyde::makeTitle($page->view) }}
+									</a>
+								</td>
+								<td class="px-3">
+									{{ $page->getSourcePath() }}
+								</td>
+							</tr>
+						@endforeach
+						</tbody>
+					</table>
+				</section>
+
+				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white mt-8">
+					<header>
+						<div class="rounded-t px-0 py-3 border-0">
+							<div class="flex flex-wrap items-center">
+								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
+									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Markdown Pages</h3>
+								</div>
+							</div>
+						</div>
+					</header>
+					<table class="table-auto dashboard-table mt-0">
+						<thead class="bg-slate-100">
+						<tr>
+							<th class="px-3 pt-2">Title</th>
+							<th class="px-3 pt-2">Source File</th>
+						</tr>
+						</thead>
+						<tbody>
+						@foreach (\Hyde\Framework\Models\Pages\MarkdownPage::all() as $page)
+							<tr>
+								<td class="px-3">
+									<a href="{{ $page->getRoute() }}">
+										{{ Hyde::makeTitle($page->view) }}
+									</a>
+								</td>
+								<td class="px-3">
+									{{ $page->getSourcePath() }}
+								</td>
+							</tr>
+						@endforeach
+						</tbody>
+					</table>
+				</section>
+			</div>
+		</div>
+		<div class="w-full xl:w-4/12 px-4">
+			<div class="relative flex flex-col min-w-0 break-words bg-white w-full mb-6 shadow-lg rounded">
+				<div class="rounded-t mb-0 px-4 py-3 bg-white">
+					<div class="flex flex-wrap items-center">
+						<div class="relative w-full max-w-full flex-grow flex-1">
+							<h6 class="uppercase text-slate-400 mb-1 text-xs font-semibold"> Welcome to Hyde!
+							</h6>
+							<h2 class="text-slate-700 text-xl font-semibold"> Project Details							</h2>
+						</div>
+					</div>
+				</div>
+				<div class="p-4 flex-auto">
+					<!-- Chart -->
+					<div class="relative prose">
+						<table class="-mt-3">
+							<tbody>
+								<tr>
+									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Name:</th>
+									<td class="w-full">{{ config('hyde.name', Hyde::makeTitle(basename(Hyde::path()))) }}</td>
+								</tr>
+						
+								<tr>
+									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Path:</th>
+									<td class="w-full">{{ Hyde::path() }}</td>
+								</tr>
+						
+								<tr>
+									<th class="w-fit whitespace-nowrap pr-3" scope="row">Framework Version:</th>
+									<td class="w-full">{{ Hyde::version() }}</td>
+								</tr>
+						
+								<tr>
+									<th class="w-fit whitespace-nowrap pr-3" scope="row">PHP Version:</th>
+									<td class="w-full">{{ PHP_VERSION }} <small>({{ PHP_SAPI }})</small></td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/projects/shelf/admin/resources/views/pages/docs.blade.php b/projects/shelf/admin/resources/views/pages/docs.blade.php
new file mode 100644
index 00000000000..ddcb9f13802
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/docs.blade.php
@@ -0,0 +1,59 @@
+@php
+use Hyde\Framework\Models\Pages\DocumentationPage;
+@endphp
+
+<x-hyde-admin::header>
+    <x-hyde-admin::card>
+        <article class="prose">
+            <h2>Your Documentation Pages</h2>
+            <p class="">Here you'll find an overview of your Documentation pages.</p>
+        </article>
+    </x-hyde-admin::card>
+</x-hyde-admin::header>
+
+<div class="px-4 md:px-10 mx-auto w-full -m-28">
+    <div class="flex">
+        <x-hyde-admin::card class="w-full">
+            <div class="rounded-t mb-3 px-0 py-3 border-0">
+                <div class="flex flex-wrap items-center">
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
+                        <h3 class="font-semibold text-lg text-slate-700"> Documentation Pages </h3>
+                    </div>
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+                        {{-- <button
+                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+                            type="button">
+                            Create new
+                        </button> --}}
+                    </div>
+                </div>
+            </div>
+            <div class="block w-full overflow-x-auto prose max-w-full">
+                <!-- Projects table -->
+                <table class="table-auto dashboard-table">
+                    <thead class="bg-slate-100">
+                        <tr>
+                            <th class="px-3 pt-2">Title</th>
+                            <th class="px-3 pt-2">Source File</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (DocumentationPage::all() as $page)
+                        <tr>
+                            <td class="px-3">
+                                <a href="{{ $page->getRoute() }}">
+                                    {{ $page->title }}
+                                </a>
+                            </td>
+					
+                            <td class="px-3">
+                                {{ $page->getSourcePath() }}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </x-hyde-admin::card>
+    </div>
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/media.blade.php b/projects/shelf/admin/resources/views/pages/media.blade.php
new file mode 100644
index 00000000000..a275c87633e
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/media.blade.php
@@ -0,0 +1,113 @@
+@php
+use Hyde\Framework\Services\DiscoveryService;
+@endphp
+
+<x-hyde-admin::header>
+	<x-hyde-admin::card>
+		<article class="prose">
+			<h2>Your Media Library</h2>
+			<p class="">Here you'll find an overview of your site's media assets.</p>
+		</article>
+	</x-hyde-admin::card>
+</x-hyde-admin::header>
+
+<div class="px-4 md:px-10 mx-auto w-full -m-28">
+	<div class="flex -mx-3">
+		<x-hyde-admin::card class="w-2/3 mx-3">
+			<div class="rounded-t mb-3 px-0 py-3 border-0">
+				<div class="flex flex-wrap items-center">
+					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
+						<h3 class="font-semibold text-lg text-slate-700"> Media Files </h3>
+					</div>
+					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+						{{-- <button
+							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+							type="button">
+							Upload
+						</button> --}}
+					</div>
+				</div>
+			</div>
+			<div class="block w-full overflow-x-auto prose max-w-full">
+				<!-- Projects table -->
+				<table class="table-auto dashboard-table">
+					<thead class="bg-slate-100">
+						<tr>
+							<th class="px-3 pt-2">Filename</th>
+							<th class="px-3 pt-2">Type</th>
+							<th class="px-3 pt-2">Size</th>
+							<th class="px-3 pt-2">Last modified</th>
+						</tr>
+					</thead>
+					<tbody>
+						@foreach (DiscoveryService::getMediaAssetFiles() as $file)
+						<tr>
+							<td class="px-3">
+								<a href="media/{{ basename($file) }}">
+									{{ basename($file) }}
+								</a>
+							</td>
+							<td class="px-3">
+								@php
+								$ext = pathinfo($file, PATHINFO_EXTENSION);
+								if (in_array($ext, ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg'])) {
+								echo 'Image';
+								} elseif (in_array($ext, ['css', 'scss', 'sass'])) {
+								echo 'Stylesheet';
+								} elseif (in_array($ext, ['js', 'ts', 'php'])) {
+								echo 'Script';
+								} elseif (in_array($ext, ['mp3', 'wav', 'ogg'])) {
+								echo 'Audio';
+								} elseif (in_array($ext, ['mp4', 'webm', 'ogg'])) {
+								echo 'Video';
+								} else {
+								echo 'File';
+								}
+								@endphp
+							</td>
+							<td class="px-3">
+								@php
+								$size = filesize($file);
+								if ($size < 1024) { echo $size . ' bytes' ; } elseif ($size < 1048576) { echo
+									round($size / 1024, 2) . ' KB' ; } else { echo round($size / 1048576, 2) . ' MB' ; }
+									@endphp </td>
+							<td class="px-3">
+								{{ \Carbon\Carbon::parse(filemtime($file))->diffForHumans() }}
+							</td>
+						</tr>
+						@endforeach
+					</tbody>
+				</table>
+			</div>
+		</x-hyde-admin::card>
+
+		<x-hyde-admin::card class="w-1/3 mx-3">
+			<div class="rounded-t mb-3 px-0 py-3 border-0">
+				<div class="flex flex-wrap items-center">
+					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
+						<h3 class="font-semibold text-lg text-slate-700"> Image Gallery </h3>
+					</div>
+					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+						{{-- <button
+							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+							type="button">
+							Upload
+						</button> --}}
+					</div>
+				</div>
+			</div>
+			<div class="block w-full overflow-x-auto prose max-w-full">
+				<div class="flex flex-row flex-wrap">
+					@foreach (DiscoveryService::getMediaAssetFiles() as $file)
+					@if(in_array(pathinfo($file, PATHINFO_EXTENSION), ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg']))
+					<a href="media/{{ basename($file) }}">
+						<img width="64px" height="auto" class="block" src="media/{{ basename($file) }}"
+							alt="{{ basename($file) }}" title="{{ basename($file) }}">
+					</a>
+					@endif
+					@endforeach
+				</div>
+			</div>
+		</x-hyde-admin::card>
+	</div>
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/pages.blade.php b/projects/shelf/admin/resources/views/pages/pages.blade.php
new file mode 100644
index 00000000000..b8aaa1392eb
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/pages.blade.php
@@ -0,0 +1,103 @@
+@php
+use Hyde\Framework\Models\Pages\BladePage;
+use Hyde\Framework\Models\Pages\MarkdownPage;
+@endphp
+
+<x-hyde-admin::header>
+    <x-hyde-admin::card>
+        <article class="prose">
+            <h2>Your pages</h2>
+            <p class="">Here you'll find an overview of your Blade and Markdown pages.</p>
+        </article>
+    </x-hyde-admin::card>
+</x-hyde-admin::header>
+
+<div class="px-4 md:px-10 mx-auto w-full -m-28">
+    <div class="flex -mx-3">
+        <x-hyde-admin::card class="w-1/2 mx-3">
+            <div class="rounded-t mb-3 px-0 py-3 border-0">
+                <div class="flex flex-wrap items-center">
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
+                        <h3 class="font-semibold text-lg text-slate-700"> Blade Pages </h3>
+                    </div>
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+                        {{-- <button
+                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+                            type="button">
+                            Create new
+                        </button> --}}
+                    </div>
+                </div>
+            </div>
+            <div class="block w-full overflow-x-auto prose max-w-full">
+                <!-- Projects table -->
+                <table class="table-auto dashboard-table">
+                    <thead class="bg-slate-100">
+                        <tr>
+                            <th class="px-3 pt-2">Title</th>
+                            <th class="px-3 pt-2">Source File</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (BladePage::all() as $page)
+                        <tr>
+                            <td class="px-3">
+                                <a href="{{ $page->getRoute() }}">
+                                    {{ Hyde::makeTitle($page->view) }}
+                                </a>
+                            </td>
+                            <td class="px-3">
+                                {{ $page->getSourcePath() }}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+
+            </div>
+        </x-hyde-admin::card>
+
+        <x-hyde-admin::card class="w-1/2 mx-3">
+            <div class="rounded-t mb-3 px-0 py-3 border-0">
+                <div class="flex flex-wrap items-center">
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
+                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Pages </h3>
+                    </div>
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+                        {{-- <button
+                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+                            type="button">
+                            Create new
+                        </button> --}}
+                    </div>
+                </div>
+            </div>
+            <div class="block w-full overflow-x-auto prose max-w-full">
+                <!-- Projects table -->
+                <table class="table-auto dashboard-table">
+                    <thead class="bg-slate-100">
+                        <tr>
+                            <th class="px-3 pt-2">Title</th>
+                            <th class="px-3 pt-2">Source File</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (MarkdownPage::all() as $page)
+                        <tr>
+                            <td class="px-3">
+                                <a href="{{ $page->getRoute() }}">
+                                    {{ $page->title }}
+                                </a>
+                            </td>
+                            <td class="px-3">
+                                {{ $page->getSourcePath() }}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+
+            </div>
+        </x-hyde-admin::card>
+    </div>
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/posts.blade.php b/projects/shelf/admin/resources/views/pages/posts.blade.php
new file mode 100644
index 00000000000..47ab953d670
--- /dev/null
+++ b/projects/shelf/admin/resources/views/pages/posts.blade.php
@@ -0,0 +1,70 @@
+@php
+use Hyde\Framework\Models\Pages\MarkdownPage;
+@endphp
+
+<x-hyde-admin::header>
+    <x-hyde-admin::card>
+        <article class="prose">
+            <h2>Your Blog Posts</h2>
+            <p class="">Here you'll find an overview of your Markdown blog posts.</p>
+        </article>
+    </x-hyde-admin::card>
+</x-hyde-admin::header>
+
+<div class="px-4 md:px-10 mx-auto w-full -m-28">
+    <div class="flex">
+        <x-hyde-admin::card class="w-full">
+            <div class="rounded-t mb-3 px-0 py-3 border-0">
+                <div class="flex flex-wrap items-center">
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
+                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Posts </h3>
+                    </div>
+                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
+                        {{-- <button
+                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
+                            type="button">
+                            Create new
+                        </button> --}}
+                    </div>
+                </div>
+            </div>
+            <div class="block w-full overflow-x-auto prose max-w-full">
+                <!-- Projects table -->
+                <table class="table-auto dashboard-table">
+                    <thead class="bg-slate-100">
+                        <tr>
+                            <th class="px-3 pt-2">Title</th>
+                            <th class="px-3 pt-2">Date</th>
+                            <th class="px-3 pt-2">Category</th>
+                            <th class="px-3 pt-2">Author</th>
+                            <th class="px-3 pt-2">Source File</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach (MarkdownPost::all() as $post)
+                        <tr>
+                            <td class="px-3">
+                                <a href="{{ $post->getRoute() }}">
+                                    {{ $post->title }}
+                                </a>
+                            </td>
+							<td class="px-3">
+                                {{ $post->date->short }}
+                            </td>
+							<td class="px-3">
+                                {{ $post->category ?? 'Uncategorized' }}
+                            </td>
+							<td class="px-3">
+                                {{ $post->author->getName() }}
+                            </td>
+                            <td class="px-3">
+                                {{ $post->getSourcePath() }}
+                            </td>
+                        </tr>
+                        @endforeach
+                    </tbody>
+                </table>
+            </div>
+        </x-hyde-admin::card>
+    </div>
+</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/src/Admin.php b/projects/shelf/admin/src/Admin.php
new file mode 100644
index 00000000000..0bfb8b22aed
--- /dev/null
+++ b/projects/shelf/admin/src/Admin.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Hyde\Admin;
+
+class Admin
+{
+    // Build your next great package.
+}
diff --git a/projects/shelf/admin/src/AdminPage.php b/projects/shelf/admin/src/AdminPage.php
new file mode 100644
index 00000000000..a3d3255574b
--- /dev/null
+++ b/projects/shelf/admin/src/AdminPage.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Hyde\Admin;
+
+use Desilva\Microserve\Request;
+use Hyde\Framework\Contracts\PageContract;
+use Hyde\Framework\Models\Pages\BladePage;
+
+final class AdminPage extends BladePage implements PageContract
+{
+    /** Not yet implemented, but could be used by the framework to ignore this when compiling */
+    protected static bool $compilable = false;
+
+    public string $route;
+
+    /**
+     * @inheritDoc
+     */
+    public function __construct(string $view)
+    {
+        parent::__construct($view);
+
+        $this->route = $this->request()?->get('route', 'dashboard') ?? 'dashboard';
+    }
+
+    public function getRouteKey(): string
+    {
+        return 'admin';
+    }
+
+    public function navigationMenuTitle(): string
+    {
+        return 'Admin Panel';
+    }
+
+    public function request(): ?Request
+    {
+        return isset($_SERVER['REQUEST_METHOD'])
+            ? Request::capture()
+            : null;
+    }
+
+    public function view(): string
+    {
+        $view = 'hyde-admin::pages.'.$this->route;
+
+        return view()->exists($view) ? $view : 'hyde-admin::pages.404';
+    }
+}
diff --git a/projects/shelf/admin/src/AdminServiceProvider.php b/projects/shelf/admin/src/AdminServiceProvider.php
new file mode 100644
index 00000000000..5e71791df80
--- /dev/null
+++ b/projects/shelf/admin/src/AdminServiceProvider.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Hyde\Admin;
+
+use Hyde\Hyde;
+use Illuminate\Support\ServiceProvider;
+
+class AdminServiceProvider extends ServiceProvider
+{
+    public function boot()
+    {
+        $this->loadViewsFrom(__DIR__.'/../resources/views', 'hyde-admin');
+
+        Hyde::routes()->addRoute(
+            (new AdminPage('hyde-admin::dashboard'))->getRoute()
+        );
+    }
+}
diff --git a/projects/shelf/single-file-dashboard/dashboard-manual.txt b/projects/shelf/single-file-dashboard/dashboard-manual.txt
new file mode 100644
index 00000000000..3eb28cc16ed
--- /dev/null
+++ b/projects/shelf/single-file-dashboard/dashboard-manual.txt
@@ -0,0 +1,68 @@
+HYDERC DASHBOARD MANUAL
+
+IMPORTANT NOTE
+
+As this is alpha stage software there may be bugs,
+and usage is at your own risk. You should always keep
+backups using Git version control or similar.
+
+A version allowing for community editing by creating
+a public static HTML dashboard is planned, this would
+then link to files on GitHub for collaboration.
+Though, this idea may instead be handled in a separate
+package included as a dashboard.blade.php file,
+using the default layout.
+
+
+SECURITY
+
+This is not a traditional CMS like WordPress and similar.
+It's never supposed to be on production systems.
+Instead, it's a local developer tool.
+Think of it as an integrated development environment
+specifically tailored for use with HydePHP projects.
+
+As the dashboard modifies files on the computer running it
+and gives arbitrary access to the server by running shell
+commands, opening files, and executing programs, it is
+extremely important that the dashboard is not exposed
+to the internet. You must only ever use this dashboard
+as a local development tool.
+
+A basic check is made to block requests not made from
+localhost as an extra precaution. You should still
+never make the dashboard.php file publicly accessible.
+
+Also note that error reporting is enabled by default,
+as the dashboard assumes that all who can access it
+are authorized to use the system running it.
+
+The app is not safe against XSS/script injection either
+as not all output is sanitized or escaped; and the
+output that is escaped, is only made so to prevent
+visual glitches, like displaying source HTML tags.
+
+
+LICENSE
+
+MIT License
+
+Copyright (c) 2022 Caen De Silva
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/single-file-dashboard/dashboard.php b/projects/shelf/single-file-dashboard/dashboard.php
new file mode 100644
index 00000000000..0b608c757ac
--- /dev/null
+++ b/projects/shelf/single-file-dashboard/dashboard.php
@@ -0,0 +1,465 @@
+<?php
+
+if ($_SERVER['REMOTE_ADDR'] !== '::1') {
+    header('HTTP/1.1 403 Forbidden');
+    echo '<h1>HTTP/1.1 403 - Access Denied</h1>';
+    echo '<p>You must be on localhost to access this page. Refusing to serve request.</p>';
+    exit;
+}
+
+// Load the same autoloader as the project
+require_once sprintf('%s/vendor/autoload.php', BASE_PATH);
+
+use Hyde\Framework\Exceptions\FileNotFoundException;
+use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
+use Hyde\Framework\Models\BladePage;
+use Hyde\Framework\Models\DocumentationPage;
+use Hyde\Framework\Models\MarkdownPage;
+use Hyde\Framework\Models\MarkdownPost;
+use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Hyde;
+
+const VERSION = 'dev-master';
+
+// Run the dashboard app
+try {
+
+// Create the Laravel app, and boot it up
+    try {
+        $app = require_once sprintf('%s/app/bootstrap.php', BASE_PATH);
+    } catch (\Throwable $th) {
+        try {
+            $app = require_once sprintf('%s/bootstrap/app.php', BASE_PATH);
+        } catch (\Throwable $th) {
+            throw $th;
+        }
+    }
+    $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
+    $kernel->bootstrap();
+    Hyde::setBasePath(BASE_PATH);
+
+    // Create the Hyde interface
+    $hyde = new class() extends Hyde {};
+
+    // Create the project configuration class
+    $project = new class
+    {
+        public string $path;
+        public string $name;
+
+        public function __construct()
+        {
+            $this->path = BASE_PATH;
+            $this->name = config('site.name', ucwords(str_replace('-', ' ', basename(BASE_PATH))));
+        }
+    };
+
+    // Set the app name
+    $appname = e($project->name).' CMS';
+
+    // Get the request page
+    $page = $_GET['page'] ?? 'index';
+    if ($page === 'dashboard' || $page === '') {
+        $page = 'index';
+    }
+
+    // Key => label
+    $routes = [
+        'index' => 'Dashboard',
+        '404' => '404 Page Not Found',
+        'manual'=> 'Manual',
+        'file-viewer' => 'File Viewer',
+    ];
+
+    if (! isset($routes[$page])) {
+        header('HTTP/1.1 404 Not Found');
+        $page = '404';
+    }
+
+    // Set the page name
+    $pagename = $appname.' - '.$routes[$page];
+
+    // Helper functions
+    function icon(string $name)
+    {
+        $icons = [
+            'blade' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEX/LR//LB96KezJAAAAAnRSTlN3CW8xmq0AAAA7SURBVAjXATAAz/8Ax/8AOfcAGcMARZwAbYgAbaYAbbYAbBEAbOMAY8cAZzcAcHcAPecAzZ8A8H8A+P+i4xJQuZ3gxwAAAABJRU5ErkJggg==',
+            'markdown' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKAQMAAACHcEzfAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVCQkJBQUFtOGGCAAAAAnRSTlPBCd2uk5MAAAAiSURBVAjXY2BgYKj/x+D3jMEljcEBiJwY/NIY/P6BBBkYAHYfCAEd79fPAAAAAElFTkSuQmCC',
+            'documentation' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVXV1dUVFSxYS6RAAAAAnRSTlPnEHobuHcAAAArSURBVAjXY/j/nwGIHsgzPPBneJDO8KCc4QEzCD1+zPD4MJQBEXnADlQJABfcFU91j91PAAAAAElFTkSuQmCC',
+        ];
+
+        return $icons[$name] ?? '';
+    } ?>
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="description" content="" />
+<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors" />
+<!-- Created with the Bootstrap Dashboard Template https://getbootstrap.com/docs/5.1/examples/dashboard/ -->
+<title><?= $pagename ?></title>
+<!-- Bootstrap core CSS -->
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
+<!-- Dashboard CSS -->
+<meta name="theme-color" content="#7952b3" /> <style> .bd-placeholder-img { font-size: 1.125rem; text-anchor: middle; -webkit-user-select: none; -moz-user-select: none; user-select: none; } @media (min-width: 768px) { .bd-placeholder-img-lg { font-size: 3.5rem; } } </style>
+<style> body { font-size: .875rem; } .feather { width: 16px; height: 16px; vertical-align: text-bottom; } /* * Sidebar */ .sidebar { position: fixed; top: 0; bottom: 0; left: 0; z-index: 100; /* Behind the navbar */ padding: 48px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } @media (max-width: 767.98px) { .sidebar { top: 5rem; } } .sidebar-sticky { position: relative; top: 0; height: calc(100vh - 48px); padding-top: .5rem; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } .sidebar .nav-link { font-weight: 500; color: #333; } .sidebar .nav-link .feather { margin-right: 4px; color: #727272; } .sidebar .nav-link.active { color: #2470dc; } .sidebar .nav-link:hover .feather, .sidebar .nav-link.active .feather { color: inherit; } .sidebar-heading { font-size: .75rem; text-transform: uppercase; } /* * Navbar */ .navbar-brand { padding-top: .75rem; padding-bottom: .75rem; font-size: 1rem; background-color: rgba(0, 0, 0, .25); box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); } .navbar .navbar-toggler { top: .25rem; right: 1rem; } .navbar .form-control { padding: .75rem 1rem; border-width: 0; border-radius: 0; } .form-control-dark { color: #fff; background-color: rgba(255, 255, 255, .1); border-color: rgba(255, 255, 255, .1); } .form-control-dark:focus { border-color: transparent; box-shadow: 0 0 0 3px rgba(255, 255, 255, .25); } </style>
+<style>/* Custom */
+   .card { padding: 1rem; margin: 1rem; margin-bottom: 1.5rem; border-radius: .5rem; box-shadow: 0 0.5rem 0.75rem rgba(0, 0, 0, .125); }
+   body {
+      min-height: 100vh;
+      display: flex;
+      flex-direction: column;
+   }  
+   #main-content-wrapper {
+      flex: 1;
+   } 
+   footer a.nav-link {
+      color: #6c757d;
+      padding: .25rem .5rem;
+   }
+   .table-secondary {
+      background-color: #eee;
+      --bs-table-bg: #eee;
+   }
+   th {
+      color: #333;
+   }
+   .table>:not(:first-child) {
+      border-top: 1.1px solid #999;
+   }
+</style>
+</head>
+<body>
+   <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
+      <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="dashboard.php">
+         <?= $appname ?>
+      </a>
+      <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="navbar-nav">
+         <div class="nav-item text-nowrap">
+            <a class="nav-link px-3" href="../">Back to site</a>
+         </div>
+      </div>
+   </header>
+   <div id="main-content-wrapper" class="container-fluid">
+      <div class="row">
+         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
+            <div class="position-sticky pt-3">
+               <ul class="nav flex-column">
+                  <li class="nav-item">
+                     <a <?= $page === 'index' ? 'class="nav-link active" aria-current="page"' : 'class="nav-link"' ?>" href="dashboard.php">
+                        <span data-feather="home"></span>
+                        Dashboard
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="file"></span>
+                     Orders
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="shopping-cart"></span>
+                     Products
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="users"></span>
+                     Customers
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="bar-chart-2"></span>
+                     Reports
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="layers"></span>
+                     Integrations
+                     </a>
+                  </li>
+               </ul>
+               <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
+                  <span>Saved reports</span>
+                  <a class="link-secondary" href="#" aria-label="Add a new report">
+                  <span data-feather="plus-circle"></span>
+                  </a>
+               </h6>
+               <ul class="nav flex-column mb-2">
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="file-text"></span>
+                     Current month
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="file-text"></span>
+                     Last quarter
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="file-text"></span>
+                     Social engagement
+                     </a>
+                  </li>
+                  <li class="nav-item">
+                     <a class="nav-link" href="#">
+                     <span data-feather="file-text"></span>
+                     Year-end sale
+                     </a>
+                  </li>
+               </ul>
+            </div>
+         </nav>
+         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 px-xl-5 pt-xl-3">
+            <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+               <h1 class="h2"><?= $pagename ?></h1>
+            </div>
+
+               <?php if ($page === 'index') { ?>
+                  <h2 class="h3">
+                     Project Information
+                  </h2>
+                  <div class="d-flex flex-wrap -mx-3 pt-2">
+                     <div class="col-12 col-sm-10 col-xl-8 col-xxl-6">
+                        <div class="table-responsive">
+                           <section class="card">
+                              <h3 class="h5">Installation Details</h3>
+                              <table class="table">
+                                 <thead class="table-secondary">
+                                    <tr>
+                                       <th scope="col">Project Name</th>
+                                       <th scope="col">Project Path</th>
+                                       <th scope="col">Framework Version</th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <tr>
+                                        <td><?= e($project->name) ?></td>
+                                        <td><?= e($project->path) ?></td>
+                                        <td><?= e($hyde->version()) ?></td>
+                                    </tr>
+                                 </tbody>
+                              </table>
+                           </section>
+                           <section class="card">
+                              <h3 class="h5">Content Overview</h3>
+                              <table class="table">
+                                 <thead class="table-secondary">
+                                    <tr>
+                                       <th scope="col">Blade Pages</th>
+                                       <th scope="col">Markdown Pages</th>
+                                       <th scope="col">Documentation Pages</th>
+                                       <th scope="col">Blog Posts</th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                   <tr>
+                                       <td><?= count(DiscoveryService::getBladePageList()) ?> pages</td>
+                                       <td><?= count(DiscoveryService::getMarkdownPageList()) ?> pages</td>
+                                       <td><?= count(DiscoveryService::getDocumentationPageList()) ?> pages</td>
+                                       <td><?= count(DiscoveryService::getMarkdownPostList()) ?> posts</td>
+                                   </tr>
+                                 </tbody>
+                              </table>
+                           </section>
+                           <section class="card">
+                              <?php
+                                    $documentation = DiscoveryService::getDocumentationPageList();
+                                    $posts = DiscoveryService::getMarkdownPostList();
+                              ?>
+                              <h3 class="h5">Your Pages</h3>
+                              <table class="table">
+                                 <thead class="table-secondary">
+                                    <tr>
+                                          <th scope="col">Type</th>
+                                          <th scope="col">Page Name</th>
+                                          <th scope="col">File Path</th>
+                                    </tr>
+                                 </thead>
+                                 <tbody>
+                                    <?php foreach (BladePage::all() as $page) { ?>
+                                       <tr>
+                                          <th scope="row">
+                                             <img width="16" height="16" src="<?= icon('blade') ?>" alt="" role="presentation">
+                                             Blade
+                                          </th>
+                                          <td>
+                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->view ?></a>
+                                          </td>
+                                          <td>
+                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=bladepage&file=<?= urlencode($page->view) ?>"><?= BladePage::$sourceDirectory.'/'.$page->view.BladePage::$fileExtension ?></a>
+                                          </td>
+                                       </tr>
+                                    <?php } ?>
+                                 </tbody>
+                                 <tbody>
+                                    <?php foreach (MarkdownPage::all() as $page) { ?>
+                                       <tr>
+                                          <th scope="row">
+                                             <img width="16" height="16" src="<?= icon('markdown') ?>" alt="" role="presentation">
+                                             Markdown
+                                          </th>
+                                          <td>
+                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->title ?></a>
+                                          </td>
+                                          <td>
+                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=markdownpage&file=<?= urlencode($page->slug) ?>"><?= MarkdownPage::$sourceDirectory.'/'.$page->slug.MarkdownPage::$fileExtension ?></a>
+                                          </td>
+                                       </tr>
+                                    <?php } ?>
+                                 </tbody>
+                              </table>
+                           </section>
+                        </div>
+                     </div>
+                  </div>
+               <?php } elseif ($page === 'manual') { ?>
+                  <article>
+                     <pre><?= e(file_get_contents(__DIR__.'/dashboard-manual.txt')) ?></pre>
+                  </article>
+               <?php } elseif ($page === 'file-viewer') { ?>
+                  <div>
+                     <?php
+                        $editor = new class($_GET['type'], $_GET['file'])
+                        {
+                            public string $filename;
+                            public string $contentpath;
+                            public string $type;
+                            protected string $filepath;
+
+                            public function __construct(string $type, string $file)
+                            {
+                                $this->type = $this->qualifyType($type);
+                                $this->filename = urldecode($file);
+                                $this->contentpath = $this->getContentpath();
+                                $this->filepath = Hyde::path($this->contentpath);
+                            }
+
+                            protected function qualifyType(string $type)
+                            {
+                                $type = strtolower($type);
+                                if ($type === 'bladepage') {
+                                    return BladePage::class;
+                                } elseif ($type === 'markdownpage') {
+                                    return MarkdownPage::class;
+                                } elseif ($type === 'documentationpage') {
+                                    return DocumentationPage::class;
+                                } elseif ($type === 'markdownpost') {
+                                    return MarkdownPost::class;
+                                } else {
+                                    throw new UnsupportedPageTypeException('Invalid file type');
+                                }
+                            }
+
+                            protected function getContentpath()
+                            {
+                                $class = $this->type;
+                                $filename = $this->filename;
+                                $filepath = $class::$sourceDirectory.'/'.$filename.$class::$fileExtension;
+                                if (! file_exists(Hyde::path($filepath))) {
+                                    throw new FileNotFoundException($filepath);
+                                }
+
+                                return $filepath;
+                            }
+
+                            public function getContents()
+                            {
+                                return file_get_contents($this->filepath);
+                            }
+                        };
+                     ?>
+
+                     <section class="col-12 col-xl-10 col-xxl-8">
+                        <h3 class="h6 my-3">Showing file <code><?= e($editor->contentpath) ?></code></h3>
+                  
+                           <header class="bg-dark rounded-top d-flex align-items-center justify-content-between">
+                              <ul class="nav nav-pills" id="pills-tab" role="tablist" type="toolbar">
+                                 <li class="nav-item" role="presentation" title="View file">
+                                    <button class="nav-link  text-light active" id="pills-view-tab" data-bs-toggle="pill" data-bs-target="#pills-view" type="button" role="tab" aria-controls="pills-view" aria-selected="true">
+                                       View Source
+                                    </button>
+                                 </li>
+                                 <li class="nav-item" role="presentation" title="Basic text editor">
+                                    <button class="nav-link  text-light" id="pills-compiled-tab" data-bs-toggle="pill" data-bs-target="#pills-compiled" type="button" role="tab" aria-controls="pills-compiled" aria-selected="false">
+                                       Live Preview
+                                    </button>
+                                 </li>
+                              </ul>
+                           </header>
+                           <div class="tab-content" id="pills-tabContent">
+                              <div class="tab-pane fade show active" id="pills-view" role="tabpanel" aria-labelledby="pills-view-tab">
+                                 <pre ><code id="filecontents" class="language-<?= $editor->type === BladePage::class ? 'html' : 'markdown' ?>"><?= e($editor->getContents()) ?></code></pre>
+                              </div>
+                              <div class="tab-pane fade" id="pills-compiled" role="tabpanel" aria-labelledby="pills-compiled-tab">
+                                 <iframe loading="lazy" width="100%" height="100%" style="min-height: 600px;" src="<?= Hyde::formatLink($editor->filename.'.html') ?>" frameborder="0">
+                                 Loading...
+                              </iframe>
+                           </div>
+                           </div>
+
+                           <div>
+                           <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">
+                           <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>
+
+                              <script>
+                                 hljs.highlightElement(filecontents);
+                              </script>
+                        </div>
+                     </section>
+                     <?php unset($editor); ?>
+                  </div>
+                  
+               <?php } elseif ($page === '404') { ?>
+                  Go <a href="dashboard.php">Back to dashboard</a>?
+               <?php } ?>
+         </main>
+      </div>
+   </div>
+
+   <div class="col-md-9 ms-md-auto col-lg-10 ">
+      <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 mt-4 border-top">
+         <div class="col-md-6 d-flex align-items-center">
+            <a href="/" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
+            <svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
+            </a>
+            <span class="text-muted">HydeCMS <?= VERSION ?></span>
+                  <small class="text-muted ms-4">
+                     This page was generated in <?= number_format((microtime(true) - HYDE_START) * 1000, 2) ?>ms.
+                  </small>
+         </div>
+         <div class="col-md-6 text-end justify-content-end px-4 d-flex align-items-center">
+           <ul class="nav">
+             <li class="nav-item"> <a href="?page=manual" class="nav-link">Manual</a></li>
+             <li class="nav-item"> <a href="" class="nav-link">GitHub</a></li>
+           </ul>
+         </div>
+      </footer>
+   </div>
+   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity="sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" crossorigin="anonymous"></script>
+<!-- Dashboard scripts -->
+<script> /* feather:false */ (function() { 'use strict'; feather.replace({ 'aria-hidden': 'true' }) })() </script>
+</body>
+</html>
+
+<?php
+} catch (\Throwable $th) {
+                         echo '<h1>Error</h1>';
+                         echo '<p>An error occurred while processing your request.</p>';
+                         echo '<pre><code>'.$th->getMessage().'</code></pre>';
+                         echo '<p>Extra information:</p>';
+                         echo '<pre><code>'.$th->getTraceAsString().print_r($th, true).'</code></pre>';
+                         exit($th->getCode());
+                     }

From b4e2cc9c5bc7b8c846a557c5ecdc9278ebbbcff7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:53:19 +0200
Subject: [PATCH 020/768] Merge release manager readme into release script

---
 projects/release-manager/release.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/projects/release-manager/release.php b/projects/release-manager/release.php
index f53e433e774..b2cdff77430 100644
--- a/projects/release-manager/release.php
+++ b/projects/release-manager/release.php
@@ -1,5 +1,13 @@
 <?php
 
+// # Hyde Releases
+//
+// While in the v0.x range, we consider both major and minor release versions to be the same. This means that when a new feature is added, it should be added as a minor version even if it is breaking. Patch versions should always be compatible. Once we reach v1.0 we will follow semantic versioning strictly.
+//
+// The versioning between the Framework and Hyde packages are linked together Meaning that if Hyde get's a minor release, so must Framework, and vice versa. To make this easier, we also publish minor releases in the monorepo. Patch releases are not published in the monorepo, and are instead handled by the individual packages.
+//
+// To make this all easier, this directory contains tools to automate part of the process. The release manager only works for minor releases as patch releases are handled by the individual packages, and we are still in the v0.x range.
+
 // Internal script I bodged together, don't use in production, verify before committing, etc.
 
 // Run with `php .\projects\release-manager\release.php`

From 6028c3089954bd1b67ecbc63fe7f45580bc02b96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:53:34 +0200
Subject: [PATCH 021/768] Delete README.md

---
 projects/release-manager/README.md | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 projects/release-manager/README.md

diff --git a/projects/release-manager/README.md b/projects/release-manager/README.md
deleted file mode 100644
index daebf0a05fe..00000000000
--- a/projects/release-manager/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Hyde Releases
-
-While in the v0.x range, we consider both major and minor release versions to be the same. This means that when a new feature is added, it should be added as a minor version even if it is breaking. Patch versions should always be compatible. Once we reach v1.0 we will follow semantic versioning strictly.
-
-The versioning between the Framework and Hyde packages are linked together Meaning that if Hyde get's a minor release, so must Framework, and vice versa. To make this easier, we also publish minor releases in the monorepo. Patch releases are not published in the monorepo, and are instead handled by the individual packages.
-
-To make this all easier, this directory contains tools to automate part of the process. The release manager only works for minor releases as patch releases are handled by the individual packages, and we are still in the v0.x range.

From e629dfc5c480ba8b53bce3d7a7a58a8d3721dbe6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:55:25 +0200
Subject: [PATCH 022/768] Move release manager script to new bin directory

---
 {projects/release-manager => bin}/release.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 rename {projects/release-manager => bin}/release.php (91%)

diff --git a/projects/release-manager/release.php b/bin/release.php
similarity index 91%
rename from projects/release-manager/release.php
rename to bin/release.php
index b2cdff77430..2b67fa18025 100644
--- a/projects/release-manager/release.php
+++ b/bin/release.php
@@ -28,13 +28,13 @@
 $shortVersion = substr($shortVersion, 0, strpos($shortVersion, '.'));
 
 echo "Short version: $shortVersion\n";
-$composerJson = json_decode(file_get_contents(__DIR__.'./../../packages/hyde/composer.json'), true);
+$composerJson = json_decode(file_get_contents(__DIR__ . './../../packages/hyde/composer.json'), true);
 $composerJson['require']['hyde/framework'] = "^0.$shortVersion";
-file_put_contents(__DIR__.'./../../packages/hyde/composer.json', json_encode($composerJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+file_put_contents(__DIR__ . './../../packages/hyde/composer.json', json_encode($composerJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 
 echo "Transforming upcoming release notes... \n";
 
-$notes = file_get_contents(__DIR__.'/../../RELEASE_NOTES.md');
+$notes = file_get_contents(__DIR__ . '/../../RELEASE_NOTES.md');
 
 $notes = str_replace("\r", '', $notes);
 
@@ -68,7 +68,7 @@
 echo "Done. \n";
 
 echo 'Resetting upcoming release notes stub';
-file_put_contents(__DIR__.'/../../RELEASE_NOTES.md', '## [Unreleased] - YYYY-MM-DD
+file_put_contents(__DIR__ . '/../../RELEASE_NOTES.md', '## [Unreleased] - YYYY-MM-DD
 
 ### About
 
@@ -100,12 +100,12 @@
 
 echo 'Updating changelog with the upcoming release notes... ';
 
-$changelog = file_get_contents(__DIR__.'/../../CHANGELOG.md');
+$changelog = file_get_contents(__DIR__ . '/../../CHANGELOG.md');
 
 $needle = '<!-- CHANGELOG_START -->';
 
 $changelog = substr_replace($changelog, $needle."\n\n".$notes, strpos($changelog, $needle), strlen($needle));
-file_put_contents(__DIR__.'/../../CHANGELOG.md', $changelog);
+file_put_contents(__DIR__ . '/../../CHANGELOG.md', $changelog);
 
 echo "Done. \n";
 

From 81910125ab0783386e0e793051db549bc01bda54 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 26 Oct 2022 17:55:45 +0000
Subject: [PATCH 023/768] Apply fixes from StyleCI

---
 bin/release.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/release.php b/bin/release.php
index 2b67fa18025..b2cdff77430 100644
--- a/bin/release.php
+++ b/bin/release.php
@@ -28,13 +28,13 @@
 $shortVersion = substr($shortVersion, 0, strpos($shortVersion, '.'));
 
 echo "Short version: $shortVersion\n";
-$composerJson = json_decode(file_get_contents(__DIR__ . './../../packages/hyde/composer.json'), true);
+$composerJson = json_decode(file_get_contents(__DIR__.'./../../packages/hyde/composer.json'), true);
 $composerJson['require']['hyde/framework'] = "^0.$shortVersion";
-file_put_contents(__DIR__ . './../../packages/hyde/composer.json', json_encode($composerJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+file_put_contents(__DIR__.'./../../packages/hyde/composer.json', json_encode($composerJson, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
 
 echo "Transforming upcoming release notes... \n";
 
-$notes = file_get_contents(__DIR__ . '/../../RELEASE_NOTES.md');
+$notes = file_get_contents(__DIR__.'/../../RELEASE_NOTES.md');
 
 $notes = str_replace("\r", '', $notes);
 
@@ -68,7 +68,7 @@
 echo "Done. \n";
 
 echo 'Resetting upcoming release notes stub';
-file_put_contents(__DIR__ . '/../../RELEASE_NOTES.md', '## [Unreleased] - YYYY-MM-DD
+file_put_contents(__DIR__.'/../../RELEASE_NOTES.md', '## [Unreleased] - YYYY-MM-DD
 
 ### About
 
@@ -100,12 +100,12 @@
 
 echo 'Updating changelog with the upcoming release notes... ';
 
-$changelog = file_get_contents(__DIR__ . '/../../CHANGELOG.md');
+$changelog = file_get_contents(__DIR__.'/../../CHANGELOG.md');
 
 $needle = '<!-- CHANGELOG_START -->';
 
 $changelog = substr_replace($changelog, $needle."\n\n".$notes, strpos($changelog, $needle), strlen($needle));
-file_put_contents(__DIR__ . '/../../CHANGELOG.md', $changelog);
+file_put_contents(__DIR__.'/../../CHANGELOG.md', $changelog);
 
 echo "Done. \n";
 

From 15daa54499f04fc92c5e432f9c7166de8e7ae5f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:59:15 +0200
Subject: [PATCH 024/768] Delete projects/shelf directory

---
 projects/shelf/README.md                      |   3 -
 projects/shelf/admin/CONTRIBUTING.md          |  55 ---
 projects/shelf/admin/LICENSE.md               |  21 -
 projects/shelf/admin/README.md                |  52 --
 projects/shelf/admin/composer.json            |  55 ---
 projects/shelf/admin/config/config.php        |   8 -
 .../resources/views/components/card.blade.php |   3 -
 .../views/components/header.blade.php         |   8 -
 .../views/components/sidebar-link.blade.php   |  16 -
 .../admin/resources/views/dashboard.blade.php |  48 --
 .../resources/views/layouts/footer.blade.php  |  39 --
 .../views/layouts/navigation.blade.php        |  17 -
 .../resources/views/layouts/sidebar.blade.php |  58 ---
 .../admin/resources/views/pages/404.blade.php |  11 -
 .../resources/views/pages/dashboard.blade.php | 219 ---------
 .../resources/views/pages/docs.blade.php      |  59 ---
 .../resources/views/pages/media.blade.php     | 113 -----
 .../resources/views/pages/pages.blade.php     | 103 ----
 .../resources/views/pages/posts.blade.php     |  70 ---
 projects/shelf/admin/src/Admin.php            |   8 -
 projects/shelf/admin/src/AdminPage.php        |  49 --
 .../shelf/admin/src/AdminServiceProvider.php  |  18 -
 .../dashboard-manual.txt                      |  68 ---
 .../shelf/single-file-dashboard/dashboard.php | 465 ------------------
 24 files changed, 1566 deletions(-)
 delete mode 100644 projects/shelf/README.md
 delete mode 100644 projects/shelf/admin/CONTRIBUTING.md
 delete mode 100644 projects/shelf/admin/LICENSE.md
 delete mode 100644 projects/shelf/admin/README.md
 delete mode 100644 projects/shelf/admin/composer.json
 delete mode 100644 projects/shelf/admin/config/config.php
 delete mode 100644 projects/shelf/admin/resources/views/components/card.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/components/header.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/components/sidebar-link.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/dashboard.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/footer.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/navigation.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/layouts/sidebar.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/404.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/dashboard.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/docs.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/media.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/pages.blade.php
 delete mode 100644 projects/shelf/admin/resources/views/pages/posts.blade.php
 delete mode 100644 projects/shelf/admin/src/Admin.php
 delete mode 100644 projects/shelf/admin/src/AdminPage.php
 delete mode 100644 projects/shelf/admin/src/AdminServiceProvider.php
 delete mode 100644 projects/shelf/single-file-dashboard/dashboard-manual.txt
 delete mode 100644 projects/shelf/single-file-dashboard/dashboard.php

diff --git a/projects/shelf/README.md b/projects/shelf/README.md
deleted file mode 100644
index ff9fa6ffdbc..00000000000
--- a/projects/shelf/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# The Shelf
-
-A collection of work-in-progress projects that may or may not work.
diff --git a/projects/shelf/admin/CONTRIBUTING.md b/projects/shelf/admin/CONTRIBUTING.md
deleted file mode 100644
index b4ae1c4a7cf..00000000000
--- a/projects/shelf/admin/CONTRIBUTING.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Contributing
-
-Contributions are **welcome** and will be fully **credited**.
-
-Please read and understand the contribution guide before creating an issue or pull request.
-
-## Etiquette
-
-This project is open source, and as such, the maintainers give their free time to build and maintain the source code
-held within. They make the code freely available in the hope that it will be of use to other developers. It would be
-extremely unfair for them to suffer abuse or anger for their hard work.
-
-Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
-world that developers are civilized and selfless people.
-
-It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
-quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
-
-## Viability
-
-When requesting or submitting new features, first consider whether it might be useful to others. Open
-source projects are used by many developers, who may have entirely different needs to your own. Think about
-whether or not your feature is likely to be used by other users of the project.
-
-## Procedure
-
-Before filing an issue:
-
-- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident.
-- Check to make sure your feature suggestion isn't already present within the project.
-- Check the pull requests tab to ensure that the bug doesn't have a fix in progress.
-- Check the pull requests tab to ensure that the feature isn't already in progress.
-
-Before submitting a pull request:
-
-- Check the codebase to ensure that your feature doesn't already exist.
-- Check the pull requests to ensure that another person hasn't already submitted the feature or fix.
-
-## Requirements
-
-If the project maintainer has any additional requirements, you will find them listed here.
-
-- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer).
-
-- **Add tests!** - Your patch won't be accepted if it doesn't have tests.
-
-- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
-
-- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
-
-- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
-
-- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
-
-**Happy coding**!
diff --git a/projects/shelf/admin/LICENSE.md b/projects/shelf/admin/LICENSE.md
deleted file mode 100644
index f9d246d3801..00000000000
--- a/projects/shelf/admin/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Caen De Silva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/admin/README.md b/projects/shelf/admin/README.md
deleted file mode 100644
index b750da0a788..00000000000
--- a/projects/shelf/admin/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# Very short description of the package
-
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
-[![Total Downloads](https://img.shields.io/packagist/dt/hyde/admin.svg?style=flat-square)](https://packagist.org/packages/hyde/admin)
-![GitHub Actions](https://github.com/hyde/admin/actions/workflows/main.yml/badge.svg)
-
-This is where your description should go. Try and limit it to a paragraph or two, and maybe throw in a mention of what PSRs you support to avoid any confusion with users and contributors.
-
-## Installation
-
-You can install the package via composer:
-
-```bash
-composer require hyde/admin
-```
-
-## Usage
-
-```php
-// Usage description here
-```
-
-### Testing
-
-```bash
-composer test
-```
-
-### Changelog
-
-Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently.
-
-## Contributing
-
-Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
-
-### Security
-
-If you discover any security related issues, please email caen@desilva.se instead of using the issue tracker.
-
-## Credits
-
--   [Caen De Silva](https://github.com/hyde)
--   [All Contributors](../../contributors)
-
-## License
-
-The MIT License (MIT). Please see [License File](LICENSE.md) for more information.
-
-## Laravel Package Boilerplate
-
-This package was generated using the [Laravel Package Boilerplate](https://laravelpackageboilerplate.com).
diff --git a/projects/shelf/admin/composer.json b/projects/shelf/admin/composer.json
deleted file mode 100644
index a82bdf4a7bc..00000000000
--- a/projects/shelf/admin/composer.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-    "name": "hyde/admin",
-    "description": "Experimental admin panel for local HydePHP development",
-    "keywords": [
-        "hyde",
-        "admin"
-    ],
-    "homepage": "https://github.com/hyde/admin",
-    "license": "MIT",
-    "type": "library",
-    "authors": [
-        {
-            "name": "Caen De Silva",
-            "email": "caen@desilva.se",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^9.5",
-        "hyde/framework": "dev-master"
-    },
-    "require-dev": {
-        "orchestra/testbench": "^6.0",
-        "phpunit/phpunit": "^9.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Hyde\\Admin\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Hyde\\Admin\\Tests\\": "tests"
-        }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit",
-        "test-coverage": "vendor/bin/phpunit --coverage-html coverage"
-
-    },
-    "config": {
-        "sort-packages": true
-    },
-    "extra": {
-        "laravel": {
-            "providers": [
-                "Hyde\\Admin\\AdminServiceProvider"
-            ],
-            "aliases": {
-                "Admin": "Hyde\\Admin\\AdminFacade"
-            }
-        }
-    }
-}
diff --git a/projects/shelf/admin/config/config.php b/projects/shelf/admin/config/config.php
deleted file mode 100644
index aaec0920123..00000000000
--- a/projects/shelf/admin/config/config.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/*
- * You can place your custom package configuration in here.
- */
-return [
-
-];
diff --git a/projects/shelf/admin/resources/views/components/card.blade.php b/projects/shelf/admin/resources/views/components/card.blade.php
deleted file mode 100644
index 5c2009ebf83..00000000000
--- a/projects/shelf/admin/resources/views/components/card.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div {{ $attributes->merge(['class' => 'relative flex flex-col min-w-0 break-words bg-white w-full mb-6 px-6 py-4 shadow-lg rounded']) }}>
-    {{ $slot }}
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/header.blade.php b/projects/shelf/admin/resources/views/components/header.blade.php
deleted file mode 100644
index 35fc4964955..00000000000
--- a/projects/shelf/admin/resources/views/components/header.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Header -->
-<div class="relative bg-pink-600 md:pt-24 pb-32 pt-12">
-    <div class="px-4 md:px-10 mx-auto w-full">
-        <div>
-            {{ $slot }}
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/components/sidebar-link.blade.php b/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
deleted file mode 100644
index cbd9bec9e98..00000000000
--- a/projects/shelf/admin/resources/views/components/sidebar-link.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-@props([
-    'route',
-    'label',
-    'icon' => 'file',
-    'active' => $page->route == $route
-])
-
-<a href="?route={{ $route }}" @class([
-        'text-xs uppercase py-3 font-bold block text-slate-700 hover:text-slate-500',
-        'text-pink-500 hover:text-pink-600' => $active ])>
-    <i @class([
-        "fas fa-$icon mr-2 text-sm",
-        'opacity-75' => $active,
-        'text-slate-300' => ! $active
-    ])></i>
-{{ $label }}</a>
diff --git a/projects/shelf/admin/resources/views/dashboard.blade.php b/projects/shelf/admin/resources/views/dashboard.blade.php
deleted file mode 100644
index 76fa4aff324..00000000000
--- a/projects/shelf/admin/resources/views/dashboard.blade.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-=========================================================
-* Notus JS - v1.1.0 based on Tailwind Starter Kit by Creative Tim
-=========================================================
-
-* Product Page: https://www.creative-tim.com/product/notus-js
-* Copyright 2021 Creative Tim (https://www.creative-tim.com)
-* Licensed under MIT (https://github.com/creativetimofficial/notus-js/blob/main/LICENSE.md)
-
-* Tailwind Starter Kit Page: https://www.creative-tim.com/learning-lab/tailwind-starter-kit/presentation
-
-* Coded by Creative Tim
-
-=========================================================
-
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
--->
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css"
-        integrity="sha512-KfkfwYDsLkIlwQp6LFnl8zNdLGxu9YAA1QvwINks4PhcElQSvqcyVLLD9aMhXd13uQjoXtEKNosOWaZqXgel0g=="
-        crossorigin="anonymous" referrerpolicy="no-referrer" />
-    <script src="https://cdn.tailwindcss.com?plugins=typography"></script>
-    <title>Dashboard | {{ config('hyde.name') }} Admin</title>
-</head>
-
-<body class="text-slate-700 antialiased">
-    <div id="root">
-        @include('hyde-admin::layouts.sidebar')
-
-        <div class="relative md:ml-64 min-h-screen flex flex-col bg-slate-50">
-            @include('hyde-admin::layouts.navigation')
-
-            <main class="relative pb-32 flex-1">
-                @include($page->view())
-            </main>
-       
-            @include('hyde-admin::layouts.footer')
-        </div>
-    </div>
-</body>
-</html>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/footer.blade.php b/projects/shelf/admin/resources/views/layouts/footer.blade.php
deleted file mode 100644
index 9bfde1b88d9..00000000000
--- a/projects/shelf/admin/resources/views/layouts/footer.blade.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<footer class="block py-4">
-	<div class="container mx-auto px-4">
-		<hr class="mb-4 border-b-1 border-slate-200" />
-		<div class="flex flex-wrap items-center md:justify-between justify-center">
-			<div class="w-full md:w-4/12 px-4">
-				<div class="text-sm text-slate-500 font-semibold py-1 text-center md:text-left">
-					Copyright © <span id="get-current-year"></span>
-					<a href="https://www.creative-tim.com?ref=njs-dashboard"
-						class="text-slate-500 hover:text-slate-700 text-sm font-semibold py-1"> Creative
-						Tim </a>
-				</div>
-			</div>
-			<div class="w-full md:w-8/12 px-4">
-				<ul class="flex flex-wrap list-none md:justify-end justify-center">
-					<li>
-						<a href="https://www.creative-tim.com?ref=njs-dashboard"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Creative Tim </a>
-					</li>
-					<li>
-						<a href="https://www.creative-tim.com/presentation?ref=njs-dashboard"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							About Us </a>
-					</li>
-					<li>
-						<a href="https://demos.creative-tim.com/notus-js/pages/admin/dashboard.html"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Notus Demo </a>
-					</li>
-					<li>
-						<a href="https://www.creative-tim.com/learning-lab/tailwind/js/overview/notus"
-							class="text-slate-600 hover:text-slate-800 text-sm font-semibold block py-1 px-3">
-							Notus Docs </a>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</footer>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/navigation.blade.php b/projects/shelf/admin/resources/views/layouts/navigation.blade.php
deleted file mode 100644
index 9caed5e8351..00000000000
--- a/projects/shelf/admin/resources/views/layouts/navigation.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<nav
-	class="absolute py-8 top-0 left-0 w-full z-10 bg-transparent md:flex-row md:flex-nowrap md:justify-start flex items-center p-4">
-	<div class="w-full mx-autp items-center flex justify-between md:flex-nowrap flex-wrap md:px-10 px-4">
-		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="?route=dashboard">Dashboard</a>
-		<a class="text-white text-sm uppercase hidden lg:inline-block font-semibold" href="{{ Route::home() }}">Back to site</a>
-		{{-- <form class="md:flex hidden flex-row flex-wrap items-center lg:ml-auto mr-3">
-			<div class="relative flex w-full flex-wrap items-stretch">
-				<span
-					class="z-10 h-full leading-snug font-normal text-center text-slate-300 absolute bg-transparent rounded text-base items-center justify-center w-8 pl-3 py-3">
-					<i class="fas fa-search"></i>
-				</span>
-				<input type="text" placeholder="Search here..."
-					class="border-0 px-3 py-3 placeholder-slate-300 text-slate-600 relative bg-white rounded text-sm shadow outline-none focus:outline-none focus:ring w-full pl-10" />
-			</div>
-		</form> --}}
-	</div>
-</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/layouts/sidebar.blade.php b/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
deleted file mode 100644
index ce79d113e84..00000000000
--- a/projects/shelf/admin/resources/views/layouts/sidebar.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<nav
-	class="md:left-0 md:block md:fixed md:top-0 md:bottom-0 md:overflow-y-auto md:flex-row md:flex-nowrap md:overflow-hidden shadow-xl bg-white flex flex-wrap items-center justify-between relative md:w-64 z-10 py-4 px-6">
-	<div
-		class="md:flex-col md:items-stretch md:min-h-full md:flex-nowrap px-0 flex flex-wrap items-center justify-between w-full mx-auto">
-		<button
-			class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
-			type="button" onclick="toggleNavbar('example-collapse-sidebar')">
-			<i class="fas fa-bars"></i>
-		</button>
-		<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
-			href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
-		
-		<div class="md:flex md:flex-col md:items-stretch md:opacity-100 md:relative md:shadow-none shadow absolute top-0 left-0 right-0 z-40 overflow-y-auto overflow-x-hidden h-auto items-center flex-1 rounded hidden"
-			id="example-collapse-sidebar">
-			<div class="md:min-w-full md:hidden block pb-4 mb-4 border-b border-solid border-slate-200">
-				<div class="flex flex-wrap">
-					<div class="w-6/12">
-						<a class="md:block text-left md:pb-2 text-slate-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
-							href="?route=dashboard"> {{ config('hyde.name') }} Admin </a>
-					</div>
-					<div class="w-6/12 flex justify-end">
-						<button type="button"
-							class="cursor-pointer text-black opacity-50 md:hidden px-3 py-1 text-xl leading-none bg-transparent rounded border border-solid border-transparent"
-							onclick="toggleNavbar('example-collapse-sidebar')">
-							<i class="fas fa-times"></i>
-						</button>
-					</div>
-				</div>
-			</div>
-			<form class="mt-6 mb-4 md:hidden">
-				<div class="mb-3 pt-0">
-					<input type="text" placeholder="Search"
-						class="px-3 py-2 h-12 border border-solid border-slate-500 placeholder-slate-300 text-slate-600 bg-white rounded text-base leading-snug shadow-none outline-none focus:outline-none w-full font-normal" />
-				</div>
-			</form>
-			<!-- Divider -->
-			<hr class="my-4 md:min-w-full" />
-			<!-- Heading -->
-			<h6 class="md:min-w-full text-slate-500 text-xs uppercase font-bold block pt-1 pb-4 no-underline">
-				Site Content </h6>
-			<!-- Navigation -->
-			<ul class="md:flex-col md:min-w-full flex flex-col list-none">
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="pages" label="Static Pages" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="posts" label="Blog Posts" icon="rss" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="docs" label="Documentation" icon="book" />
-				</li>
-				<li class="items-center">
-					<x-hyde-admin::sidebar-link route="media" label="Media Library" icon="photo-film" />
-				</li>
-			</ul>
-		</div>
-	</div>
-</nav>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/404.blade.php b/projects/shelf/admin/resources/views/pages/404.blade.php
deleted file mode 100644
index 28e9dbea345..00000000000
--- a/projects/shelf/admin/resources/views/pages/404.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>404 - Not found</h2>
-            <p class="lead">Sorry, that page could not be found.</p>
-
-            <a href="?route=dashboard" class="mr-3">Back to dashboard</a>
-            <a href="{{ Route::home() }}">Back to site</a>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/dashboard.blade.php b/projects/shelf/admin/resources/views/pages/dashboard.blade.php
deleted file mode 100644
index 10dc9bedd28..00000000000
--- a/projects/shelf/admin/resources/views/pages/dashboard.blade.php
+++ /dev/null
@@ -1,219 +0,0 @@
-@php
-use Hyde\Framework\Services\DiscoveryService;
-@endphp
-
-<x-hyde-admin::header>
-	<!-- Card stats -->
-	<div class="flex flex-wrap">
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Blade Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getBladePageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-red-500">
-								<i class="far fa-chart-bar"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-emerald-500 mr-2">
-									<i class="fas fa-arrow-up"></i> 3.48% </span>
-						<span class="whitespace-nowrap"> Since last month </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-orange-500">
-								<i class="fas fa-chart-pie"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-red-500 mr-2">
-									<i class="fas fa-arrow-down"></i> 3.48% </span>
-						<span class="whitespace-nowrap"> Since last week </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Documentation Pages </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getDocumentationPageFiles()) }}</b> pages </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-pink-500">
-								<i class="fas fa-users"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-orange-500 mr-2">
-									<i class="fas fa-arrow-down"></i> 1.10% </span>
-						<span class="whitespace-nowrap"> Since yesterday </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-		<div class="w-full lg:w-6/12 xl:w-3/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white rounded mb-6 xl:mb-0 shadow-lg">
-				<div class="flex-auto p-4">
-					<div class="flex flex-wrap">
-						<div class="relative w-full pr-4 max-w-full flex-grow flex-1">
-							<h5 class="text-slate-400 uppercase font-bold text-xs"> Markdown Posts </h5>
-							<span class="font-semibold text-xl text-slate-700"> <b>{{ count(DiscoveryService::getMarkdownPostFiles()) }}</b> posts </span>
-						</div>
-						<div class="relative w-auto pl-4 flex-initial">
-							<div
-									class="text-white p-3 text-center inline-flex items-center justify-center w-12 h-12 shadow-lg rounded-full bg-indigo-500">
-								<i class="fas fa-percent"></i>
-							</div>
-						</div>
-					</div>
-					{{-- <p class="text-sm text-slate-400 mt-4">
-								<span class="text-emerald-500 mr-2">
-									<i class="fas fa-arrow-up"></i> 12% </span>
-						<span class="whitespace-nowrap"> Since last month </span>
-					</p> --}}
-				</div>
-			</div>
-		</div>
-	</div>
-</x-hyde-admin::header>
-
-<!-- Content -->
-<div class="px-4 md:px-10 mx-auto w-full -m-24">
-	<div class="flex flex-wrap">
-		<div class="w-full xl:w-8/12 mb-12 xl:mb-0 px-4">
-			<div class="relative flex flex-col min-w-0 break-words w-full mb-6 ">
-				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white">
-					<header>
-						<div class="rounded-t px-0 py-3 border-0">
-							<div class="flex flex-wrap items-center">
-								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Blade Pages</h3>
-								</div>
-							</div>
-						</div>
-					</header>
-					<table class="table-auto dashboard-table mt-0">
-						<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Title</th>
-							<th class="px-3 pt-2">Source File</th>
-						</tr>
-						</thead>
-						<tbody>
-						@foreach (\Hyde\Framework\Models\Pages\BladePage::all() as $page)
-							<tr>
-								<td class="px-3">
-									<a href="{{ $page->getRoute() }}">
-										{{ Hyde::makeTitle($page->view) }}
-									</a>
-								</td>
-								<td class="px-3">
-									{{ $page->getSourcePath() }}
-								</td>
-							</tr>
-						@endforeach
-						</tbody>
-					</table>
-				</section>
-
-				<section class="block w-full overflow-x-auto prose max-w-full shadow-lg  rounded bg-white mt-8">
-					<header>
-						<div class="rounded-t px-0 py-3 border-0">
-							<div class="flex flex-wrap items-center">
-								<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-									<h3 class="font-semibold text-lg text-slate-700 my-1 px-4">Markdown Pages</h3>
-								</div>
-							</div>
-						</div>
-					</header>
-					<table class="table-auto dashboard-table mt-0">
-						<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Title</th>
-							<th class="px-3 pt-2">Source File</th>
-						</tr>
-						</thead>
-						<tbody>
-						@foreach (\Hyde\Framework\Models\Pages\MarkdownPage::all() as $page)
-							<tr>
-								<td class="px-3">
-									<a href="{{ $page->getRoute() }}">
-										{{ Hyde::makeTitle($page->view) }}
-									</a>
-								</td>
-								<td class="px-3">
-									{{ $page->getSourcePath() }}
-								</td>
-							</tr>
-						@endforeach
-						</tbody>
-					</table>
-				</section>
-			</div>
-		</div>
-		<div class="w-full xl:w-4/12 px-4">
-			<div class="relative flex flex-col min-w-0 break-words bg-white w-full mb-6 shadow-lg rounded">
-				<div class="rounded-t mb-0 px-4 py-3 bg-white">
-					<div class="flex flex-wrap items-center">
-						<div class="relative w-full max-w-full flex-grow flex-1">
-							<h6 class="uppercase text-slate-400 mb-1 text-xs font-semibold"> Welcome to Hyde!
-							</h6>
-							<h2 class="text-slate-700 text-xl font-semibold"> Project Details							</h2>
-						</div>
-					</div>
-				</div>
-				<div class="p-4 flex-auto">
-					<!-- Chart -->
-					<div class="relative prose">
-						<table class="-mt-3">
-							<tbody>
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Name:</th>
-									<td class="w-full">{{ config('hyde.name', Hyde::makeTitle(basename(Hyde::path()))) }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Project Path:</th>
-									<td class="w-full">{{ Hyde::path() }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">Framework Version:</th>
-									<td class="w-full">{{ Hyde::version() }}</td>
-								</tr>
-						
-								<tr>
-									<th class="w-fit whitespace-nowrap pr-3" scope="row">PHP Version:</th>
-									<td class="w-full">{{ PHP_VERSION }} <small>({{ PHP_SAPI }})</small></td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/projects/shelf/admin/resources/views/pages/docs.blade.php b/projects/shelf/admin/resources/views/pages/docs.blade.php
deleted file mode 100644
index ddcb9f13802..00000000000
--- a/projects/shelf/admin/resources/views/pages/docs.blade.php
+++ /dev/null
@@ -1,59 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\DocumentationPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your Documentation Pages</h2>
-            <p class="">Here you'll find an overview of your Documentation pages.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex">
-        <x-hyde-admin::card class="w-full">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Documentation Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (DocumentationPage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-					
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/media.blade.php b/projects/shelf/admin/resources/views/pages/media.blade.php
deleted file mode 100644
index a275c87633e..00000000000
--- a/projects/shelf/admin/resources/views/pages/media.blade.php
+++ /dev/null
@@ -1,113 +0,0 @@
-@php
-use Hyde\Framework\Services\DiscoveryService;
-@endphp
-
-<x-hyde-admin::header>
-	<x-hyde-admin::card>
-		<article class="prose">
-			<h2>Your Media Library</h2>
-			<p class="">Here you'll find an overview of your site's media assets.</p>
-		</article>
-	</x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-	<div class="flex -mx-3">
-		<x-hyde-admin::card class="w-2/3 mx-3">
-			<div class="rounded-t mb-3 px-0 py-3 border-0">
-				<div class="flex flex-wrap items-center">
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-						<h3 class="font-semibold text-lg text-slate-700"> Media Files </h3>
-					</div>
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-						{{-- <button
-							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-							type="button">
-							Upload
-						</button> --}}
-					</div>
-				</div>
-			</div>
-			<div class="block w-full overflow-x-auto prose max-w-full">
-				<!-- Projects table -->
-				<table class="table-auto dashboard-table">
-					<thead class="bg-slate-100">
-						<tr>
-							<th class="px-3 pt-2">Filename</th>
-							<th class="px-3 pt-2">Type</th>
-							<th class="px-3 pt-2">Size</th>
-							<th class="px-3 pt-2">Last modified</th>
-						</tr>
-					</thead>
-					<tbody>
-						@foreach (DiscoveryService::getMediaAssetFiles() as $file)
-						<tr>
-							<td class="px-3">
-								<a href="media/{{ basename($file) }}">
-									{{ basename($file) }}
-								</a>
-							</td>
-							<td class="px-3">
-								@php
-								$ext = pathinfo($file, PATHINFO_EXTENSION);
-								if (in_array($ext, ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg'])) {
-								echo 'Image';
-								} elseif (in_array($ext, ['css', 'scss', 'sass'])) {
-								echo 'Stylesheet';
-								} elseif (in_array($ext, ['js', 'ts', 'php'])) {
-								echo 'Script';
-								} elseif (in_array($ext, ['mp3', 'wav', 'ogg'])) {
-								echo 'Audio';
-								} elseif (in_array($ext, ['mp4', 'webm', 'ogg'])) {
-								echo 'Video';
-								} else {
-								echo 'File';
-								}
-								@endphp
-							</td>
-							<td class="px-3">
-								@php
-								$size = filesize($file);
-								if ($size < 1024) { echo $size . ' bytes' ; } elseif ($size < 1048576) { echo
-									round($size / 1024, 2) . ' KB' ; } else { echo round($size / 1048576, 2) . ' MB' ; }
-									@endphp </td>
-							<td class="px-3">
-								{{ \Carbon\Carbon::parse(filemtime($file))->diffForHumans() }}
-							</td>
-						</tr>
-						@endforeach
-					</tbody>
-				</table>
-			</div>
-		</x-hyde-admin::card>
-
-		<x-hyde-admin::card class="w-1/3 mx-3">
-			<div class="rounded-t mb-3 px-0 py-3 border-0">
-				<div class="flex flex-wrap items-center">
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1">
-						<h3 class="font-semibold text-lg text-slate-700"> Image Gallery </h3>
-					</div>
-					<div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-						{{-- <button
-							class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-							type="button">
-							Upload
-						</button> --}}
-					</div>
-				</div>
-			</div>
-			<div class="block w-full overflow-x-auto prose max-w-full">
-				<div class="flex flex-row flex-wrap">
-					@foreach (DiscoveryService::getMediaAssetFiles() as $file)
-					@if(in_array(pathinfo($file, PATHINFO_EXTENSION), ['jpg', 'jpeg', 'png', 'gif', 'ico', 'svg']))
-					<a href="media/{{ basename($file) }}">
-						<img width="64px" height="auto" class="block" src="media/{{ basename($file) }}"
-							alt="{{ basename($file) }}" title="{{ basename($file) }}">
-					</a>
-					@endif
-					@endforeach
-				</div>
-			</div>
-		</x-hyde-admin::card>
-	</div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/pages.blade.php b/projects/shelf/admin/resources/views/pages/pages.blade.php
deleted file mode 100644
index b8aaa1392eb..00000000000
--- a/projects/shelf/admin/resources/views/pages/pages.blade.php
+++ /dev/null
@@ -1,103 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your pages</h2>
-            <p class="">Here you'll find an overview of your Blade and Markdown pages.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex -mx-3">
-        <x-hyde-admin::card class="w-1/2 mx-3">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Blade Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (BladePage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ Hyde::makeTitle($page->view) }}
-                                </a>
-                            </td>
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-
-            </div>
-        </x-hyde-admin::card>
-
-        <x-hyde-admin::card class="w-1/2 mx-3">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Pages </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (MarkdownPage::all() as $page)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $page->getRoute() }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-                            <td class="px-3">
-                                {{ $page->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/resources/views/pages/posts.blade.php b/projects/shelf/admin/resources/views/pages/posts.blade.php
deleted file mode 100644
index 47ab953d670..00000000000
--- a/projects/shelf/admin/resources/views/pages/posts.blade.php
+++ /dev/null
@@ -1,70 +0,0 @@
-@php
-use Hyde\Framework\Models\Pages\MarkdownPage;
-@endphp
-
-<x-hyde-admin::header>
-    <x-hyde-admin::card>
-        <article class="prose">
-            <h2>Your Blog Posts</h2>
-            <p class="">Here you'll find an overview of your Markdown blog posts.</p>
-        </article>
-    </x-hyde-admin::card>
-</x-hyde-admin::header>
-
-<div class="px-4 md:px-10 mx-auto w-full -m-28">
-    <div class="flex">
-        <x-hyde-admin::card class="w-full">
-            <div class="rounded-t mb-3 px-0 py-3 border-0">
-                <div class="flex flex-wrap items-center">
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1">
-                        <h3 class="font-semibold text-lg text-slate-700"> Markdown Posts </h3>
-                    </div>
-                    <div class="relative w-full px-0 max-w-full flex-grow flex-1 text-right">
-                        {{-- <button
-                            class="bg-indigo-500 text-white active:bg-indigo-600 text-xs font-bold uppercase px-3 py-1 rounded outline-none focus:outline-none mr-1 mb-1 ease-linear transition-all duration-150"
-                            type="button">
-                            Create new
-                        </button> --}}
-                    </div>
-                </div>
-            </div>
-            <div class="block w-full overflow-x-auto prose max-w-full">
-                <!-- Projects table -->
-                <table class="table-auto dashboard-table">
-                    <thead class="bg-slate-100">
-                        <tr>
-                            <th class="px-3 pt-2">Title</th>
-                            <th class="px-3 pt-2">Date</th>
-                            <th class="px-3 pt-2">Category</th>
-                            <th class="px-3 pt-2">Author</th>
-                            <th class="px-3 pt-2">Source File</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach (MarkdownPost::all() as $post)
-                        <tr>
-                            <td class="px-3">
-                                <a href="{{ $post->getRoute() }}">
-                                    {{ $post->title }}
-                                </a>
-                            </td>
-							<td class="px-3">
-                                {{ $post->date->short }}
-                            </td>
-							<td class="px-3">
-                                {{ $post->category ?? 'Uncategorized' }}
-                            </td>
-							<td class="px-3">
-                                {{ $post->author->getName() }}
-                            </td>
-                            <td class="px-3">
-                                {{ $post->getSourcePath() }}
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </x-hyde-admin::card>
-    </div>
-</div>
\ No newline at end of file
diff --git a/projects/shelf/admin/src/Admin.php b/projects/shelf/admin/src/Admin.php
deleted file mode 100644
index 0bfb8b22aed..00000000000
--- a/projects/shelf/admin/src/Admin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-class Admin
-{
-    // Build your next great package.
-}
diff --git a/projects/shelf/admin/src/AdminPage.php b/projects/shelf/admin/src/AdminPage.php
deleted file mode 100644
index a3d3255574b..00000000000
--- a/projects/shelf/admin/src/AdminPage.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-use Desilva\Microserve\Request;
-use Hyde\Framework\Contracts\PageContract;
-use Hyde\Framework\Models\Pages\BladePage;
-
-final class AdminPage extends BladePage implements PageContract
-{
-    /** Not yet implemented, but could be used by the framework to ignore this when compiling */
-    protected static bool $compilable = false;
-
-    public string $route;
-
-    /**
-     * @inheritDoc
-     */
-    public function __construct(string $view)
-    {
-        parent::__construct($view);
-
-        $this->route = $this->request()?->get('route', 'dashboard') ?? 'dashboard';
-    }
-
-    public function getRouteKey(): string
-    {
-        return 'admin';
-    }
-
-    public function navigationMenuTitle(): string
-    {
-        return 'Admin Panel';
-    }
-
-    public function request(): ?Request
-    {
-        return isset($_SERVER['REQUEST_METHOD'])
-            ? Request::capture()
-            : null;
-    }
-
-    public function view(): string
-    {
-        $view = 'hyde-admin::pages.'.$this->route;
-
-        return view()->exists($view) ? $view : 'hyde-admin::pages.404';
-    }
-}
diff --git a/projects/shelf/admin/src/AdminServiceProvider.php b/projects/shelf/admin/src/AdminServiceProvider.php
deleted file mode 100644
index 5e71791df80..00000000000
--- a/projects/shelf/admin/src/AdminServiceProvider.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Hyde\Admin;
-
-use Hyde\Hyde;
-use Illuminate\Support\ServiceProvider;
-
-class AdminServiceProvider extends ServiceProvider
-{
-    public function boot()
-    {
-        $this->loadViewsFrom(__DIR__.'/../resources/views', 'hyde-admin');
-
-        Hyde::routes()->addRoute(
-            (new AdminPage('hyde-admin::dashboard'))->getRoute()
-        );
-    }
-}
diff --git a/projects/shelf/single-file-dashboard/dashboard-manual.txt b/projects/shelf/single-file-dashboard/dashboard-manual.txt
deleted file mode 100644
index 3eb28cc16ed..00000000000
--- a/projects/shelf/single-file-dashboard/dashboard-manual.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-HYDERC DASHBOARD MANUAL
-
-IMPORTANT NOTE
-
-As this is alpha stage software there may be bugs,
-and usage is at your own risk. You should always keep
-backups using Git version control or similar.
-
-A version allowing for community editing by creating
-a public static HTML dashboard is planned, this would
-then link to files on GitHub for collaboration.
-Though, this idea may instead be handled in a separate
-package included as a dashboard.blade.php file,
-using the default layout.
-
-
-SECURITY
-
-This is not a traditional CMS like WordPress and similar.
-It's never supposed to be on production systems.
-Instead, it's a local developer tool.
-Think of it as an integrated development environment
-specifically tailored for use with HydePHP projects.
-
-As the dashboard modifies files on the computer running it
-and gives arbitrary access to the server by running shell
-commands, opening files, and executing programs, it is
-extremely important that the dashboard is not exposed
-to the internet. You must only ever use this dashboard
-as a local development tool.
-
-A basic check is made to block requests not made from
-localhost as an extra precaution. You should still
-never make the dashboard.php file publicly accessible.
-
-Also note that error reporting is enabled by default,
-as the dashboard assumes that all who can access it
-are authorized to use the system running it.
-
-The app is not safe against XSS/script injection either
-as not all output is sanitized or escaped; and the
-output that is escaped, is only made so to prevent
-visual glitches, like displaying source HTML tags.
-
-
-LICENSE
-
-MIT License
-
-Copyright (c) 2022 Caen De Silva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/projects/shelf/single-file-dashboard/dashboard.php b/projects/shelf/single-file-dashboard/dashboard.php
deleted file mode 100644
index 0b608c757ac..00000000000
--- a/projects/shelf/single-file-dashboard/dashboard.php
+++ /dev/null
@@ -1,465 +0,0 @@
-<?php
-
-if ($_SERVER['REMOTE_ADDR'] !== '::1') {
-    header('HTTP/1.1 403 Forbidden');
-    echo '<h1>HTTP/1.1 403 - Access Denied</h1>';
-    echo '<p>You must be on localhost to access this page. Refusing to serve request.</p>';
-    exit;
-}
-
-// Load the same autoloader as the project
-require_once sprintf('%s/vendor/autoload.php', BASE_PATH);
-
-use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\BladePage;
-use Hyde\Framework\Models\DocumentationPage;
-use Hyde\Framework\Models\MarkdownPage;
-use Hyde\Framework\Models\MarkdownPost;
-use Hyde\Framework\Services\DiscoveryService;
-use Hyde\Hyde;
-
-const VERSION = 'dev-master';
-
-// Run the dashboard app
-try {
-
-// Create the Laravel app, and boot it up
-    try {
-        $app = require_once sprintf('%s/app/bootstrap.php', BASE_PATH);
-    } catch (\Throwable $th) {
-        try {
-            $app = require_once sprintf('%s/bootstrap/app.php', BASE_PATH);
-        } catch (\Throwable $th) {
-            throw $th;
-        }
-    }
-    $kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
-    $kernel->bootstrap();
-    Hyde::setBasePath(BASE_PATH);
-
-    // Create the Hyde interface
-    $hyde = new class() extends Hyde {};
-
-    // Create the project configuration class
-    $project = new class
-    {
-        public string $path;
-        public string $name;
-
-        public function __construct()
-        {
-            $this->path = BASE_PATH;
-            $this->name = config('site.name', ucwords(str_replace('-', ' ', basename(BASE_PATH))));
-        }
-    };
-
-    // Set the app name
-    $appname = e($project->name).' CMS';
-
-    // Get the request page
-    $page = $_GET['page'] ?? 'index';
-    if ($page === 'dashboard' || $page === '') {
-        $page = 'index';
-    }
-
-    // Key => label
-    $routes = [
-        'index' => 'Dashboard',
-        '404' => '404 Page Not Found',
-        'manual'=> 'Manual',
-        'file-viewer' => 'File Viewer',
-    ];
-
-    if (! isset($routes[$page])) {
-        header('HTTP/1.1 404 Not Found');
-        $page = '404';
-    }
-
-    // Set the page name
-    $pagename = $appname.' - '.$routes[$page];
-
-    // Helper functions
-    function icon(string $name)
-    {
-        $icons = [
-            'blade' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEX/LR//LB96KezJAAAAAnRSTlN3CW8xmq0AAAA7SURBVAjXATAAz/8Ax/8AOfcAGcMARZwAbYgAbaYAbbYAbBEAbOMAY8cAZzcAcHcAPecAzZ8A8H8A+P+i4xJQuZ3gxwAAAABJRU5ErkJggg==',
-            'markdown' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKAQMAAACHcEzfAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVCQkJBQUFtOGGCAAAAAnRSTlPBCd2uk5MAAAAiSURBVAjXY2BgYKj/x+D3jMEljcEBiJwY/NIY/P6BBBkYAHYfCAEd79fPAAAAAElFTkSuQmCC',
-            'documentation' => 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAACXBIWXMAAAPoAAAD6AG1e1JrAAAABlBMVEVXV1dUVFSxYS6RAAAAAnRSTlPnEHobuHcAAAArSURBVAjXY/j/nwGIHsgzPPBneJDO8KCc4QEzCD1+zPD4MJQBEXnADlQJABfcFU91j91PAAAAAElFTkSuQmCC',
-        ];
-
-        return $icons[$name] ?? '';
-    } ?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<meta name="description" content="" />
-<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors" />
-<!-- Created with the Bootstrap Dashboard Template https://getbootstrap.com/docs/5.1/examples/dashboard/ -->
-<title><?= $pagename ?></title>
-<!-- Bootstrap core CSS -->
-<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous" />
-<!-- Dashboard CSS -->
-<meta name="theme-color" content="#7952b3" /> <style> .bd-placeholder-img { font-size: 1.125rem; text-anchor: middle; -webkit-user-select: none; -moz-user-select: none; user-select: none; } @media (min-width: 768px) { .bd-placeholder-img-lg { font-size: 3.5rem; } } </style>
-<style> body { font-size: .875rem; } .feather { width: 16px; height: 16px; vertical-align: text-bottom; } /* * Sidebar */ .sidebar { position: fixed; top: 0; bottom: 0; left: 0; z-index: 100; /* Behind the navbar */ padding: 48px 0 0; /* Height of navbar */ box-shadow: inset -1px 0 0 rgba(0, 0, 0, .1); } @media (max-width: 767.98px) { .sidebar { top: 5rem; } } .sidebar-sticky { position: relative; top: 0; height: calc(100vh - 48px); padding-top: .5rem; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ } .sidebar .nav-link { font-weight: 500; color: #333; } .sidebar .nav-link .feather { margin-right: 4px; color: #727272; } .sidebar .nav-link.active { color: #2470dc; } .sidebar .nav-link:hover .feather, .sidebar .nav-link.active .feather { color: inherit; } .sidebar-heading { font-size: .75rem; text-transform: uppercase; } /* * Navbar */ .navbar-brand { padding-top: .75rem; padding-bottom: .75rem; font-size: 1rem; background-color: rgba(0, 0, 0, .25); box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25); } .navbar .navbar-toggler { top: .25rem; right: 1rem; } .navbar .form-control { padding: .75rem 1rem; border-width: 0; border-radius: 0; } .form-control-dark { color: #fff; background-color: rgba(255, 255, 255, .1); border-color: rgba(255, 255, 255, .1); } .form-control-dark:focus { border-color: transparent; box-shadow: 0 0 0 3px rgba(255, 255, 255, .25); } </style>
-<style>/* Custom */
-   .card { padding: 1rem; margin: 1rem; margin-bottom: 1.5rem; border-radius: .5rem; box-shadow: 0 0.5rem 0.75rem rgba(0, 0, 0, .125); }
-   body {
-      min-height: 100vh;
-      display: flex;
-      flex-direction: column;
-   }  
-   #main-content-wrapper {
-      flex: 1;
-   } 
-   footer a.nav-link {
-      color: #6c757d;
-      padding: .25rem .5rem;
-   }
-   .table-secondary {
-      background-color: #eee;
-      --bs-table-bg: #eee;
-   }
-   th {
-      color: #333;
-   }
-   .table>:not(:first-child) {
-      border-top: 1.1px solid #999;
-   }
-</style>
-</head>
-<body>
-   <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
-      <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3" href="dashboard.php">
-         <?= $appname ?>
-      </a>
-      <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-      </button>
-      <div class="navbar-nav">
-         <div class="nav-item text-nowrap">
-            <a class="nav-link px-3" href="../">Back to site</a>
-         </div>
-      </div>
-   </header>
-   <div id="main-content-wrapper" class="container-fluid">
-      <div class="row">
-         <nav id="sidebarMenu" class="col-md-3 col-lg-2 d-md-block bg-light sidebar collapse">
-            <div class="position-sticky pt-3">
-               <ul class="nav flex-column">
-                  <li class="nav-item">
-                     <a <?= $page === 'index' ? 'class="nav-link active" aria-current="page"' : 'class="nav-link"' ?>" href="dashboard.php">
-                        <span data-feather="home"></span>
-                        Dashboard
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file"></span>
-                     Orders
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="shopping-cart"></span>
-                     Products
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="users"></span>
-                     Customers
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="bar-chart-2"></span>
-                     Reports
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="layers"></span>
-                     Integrations
-                     </a>
-                  </li>
-               </ul>
-               <h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
-                  <span>Saved reports</span>
-                  <a class="link-secondary" href="#" aria-label="Add a new report">
-                  <span data-feather="plus-circle"></span>
-                  </a>
-               </h6>
-               <ul class="nav flex-column mb-2">
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Current month
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Last quarter
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Social engagement
-                     </a>
-                  </li>
-                  <li class="nav-item">
-                     <a class="nav-link" href="#">
-                     <span data-feather="file-text"></span>
-                     Year-end sale
-                     </a>
-                  </li>
-               </ul>
-            </div>
-         </nav>
-         <main class="col-md-9 ms-sm-auto col-lg-10 px-md-4 px-xl-5 pt-xl-3">
-            <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-               <h1 class="h2"><?= $pagename ?></h1>
-            </div>
-
-               <?php if ($page === 'index') { ?>
-                  <h2 class="h3">
-                     Project Information
-                  </h2>
-                  <div class="d-flex flex-wrap -mx-3 pt-2">
-                     <div class="col-12 col-sm-10 col-xl-8 col-xxl-6">
-                        <div class="table-responsive">
-                           <section class="card">
-                              <h3 class="h5">Installation Details</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                       <th scope="col">Project Name</th>
-                                       <th scope="col">Project Path</th>
-                                       <th scope="col">Framework Version</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                    <tr>
-                                        <td><?= e($project->name) ?></td>
-                                        <td><?= e($project->path) ?></td>
-                                        <td><?= e($hyde->version()) ?></td>
-                                    </tr>
-                                 </tbody>
-                              </table>
-                           </section>
-                           <section class="card">
-                              <h3 class="h5">Content Overview</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                       <th scope="col">Blade Pages</th>
-                                       <th scope="col">Markdown Pages</th>
-                                       <th scope="col">Documentation Pages</th>
-                                       <th scope="col">Blog Posts</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                   <tr>
-                                       <td><?= count(DiscoveryService::getBladePageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getMarkdownPageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getDocumentationPageList()) ?> pages</td>
-                                       <td><?= count(DiscoveryService::getMarkdownPostList()) ?> posts</td>
-                                   </tr>
-                                 </tbody>
-                              </table>
-                           </section>
-                           <section class="card">
-                              <?php
-                                    $documentation = DiscoveryService::getDocumentationPageList();
-                                    $posts = DiscoveryService::getMarkdownPostList();
-                              ?>
-                              <h3 class="h5">Your Pages</h3>
-                              <table class="table">
-                                 <thead class="table-secondary">
-                                    <tr>
-                                          <th scope="col">Type</th>
-                                          <th scope="col">Page Name</th>
-                                          <th scope="col">File Path</th>
-                                    </tr>
-                                 </thead>
-                                 <tbody>
-                                    <?php foreach (BladePage::all() as $page) { ?>
-                                       <tr>
-                                          <th scope="row">
-                                             <img width="16" height="16" src="<?= icon('blade') ?>" alt="" role="presentation">
-                                             Blade
-                                          </th>
-                                          <td>
-                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->view ?></a>
-                                          </td>
-                                          <td>
-                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=bladepage&file=<?= urlencode($page->view) ?>"><?= BladePage::$sourceDirectory.'/'.$page->view.BladePage::$fileExtension ?></a>
-                                          </td>
-                                       </tr>
-                                    <?php } ?>
-                                 </tbody>
-                                 <tbody>
-                                    <?php foreach (MarkdownPage::all() as $page) { ?>
-                                       <tr>
-                                          <th scope="row">
-                                             <img width="16" height="16" src="<?= icon('markdown') ?>" alt="" role="presentation">
-                                             Markdown
-                                          </th>
-                                          <td>
-                                             <a title="View with realtime compiler" href="<?= Hyde::formatLink($page->slug.'.html') ?>"><?= $page->title ?></a>
-                                          </td>
-                                          <td>
-                                             <a title="Open in CMS file manager" href="?page=file-viewer&type=markdownpage&file=<?= urlencode($page->slug) ?>"><?= MarkdownPage::$sourceDirectory.'/'.$page->slug.MarkdownPage::$fileExtension ?></a>
-                                          </td>
-                                       </tr>
-                                    <?php } ?>
-                                 </tbody>
-                              </table>
-                           </section>
-                        </div>
-                     </div>
-                  </div>
-               <?php } elseif ($page === 'manual') { ?>
-                  <article>
-                     <pre><?= e(file_get_contents(__DIR__.'/dashboard-manual.txt')) ?></pre>
-                  </article>
-               <?php } elseif ($page === 'file-viewer') { ?>
-                  <div>
-                     <?php
-                        $editor = new class($_GET['type'], $_GET['file'])
-                        {
-                            public string $filename;
-                            public string $contentpath;
-                            public string $type;
-                            protected string $filepath;
-
-                            public function __construct(string $type, string $file)
-                            {
-                                $this->type = $this->qualifyType($type);
-                                $this->filename = urldecode($file);
-                                $this->contentpath = $this->getContentpath();
-                                $this->filepath = Hyde::path($this->contentpath);
-                            }
-
-                            protected function qualifyType(string $type)
-                            {
-                                $type = strtolower($type);
-                                if ($type === 'bladepage') {
-                                    return BladePage::class;
-                                } elseif ($type === 'markdownpage') {
-                                    return MarkdownPage::class;
-                                } elseif ($type === 'documentationpage') {
-                                    return DocumentationPage::class;
-                                } elseif ($type === 'markdownpost') {
-                                    return MarkdownPost::class;
-                                } else {
-                                    throw new UnsupportedPageTypeException('Invalid file type');
-                                }
-                            }
-
-                            protected function getContentpath()
-                            {
-                                $class = $this->type;
-                                $filename = $this->filename;
-                                $filepath = $class::$sourceDirectory.'/'.$filename.$class::$fileExtension;
-                                if (! file_exists(Hyde::path($filepath))) {
-                                    throw new FileNotFoundException($filepath);
-                                }
-
-                                return $filepath;
-                            }
-
-                            public function getContents()
-                            {
-                                return file_get_contents($this->filepath);
-                            }
-                        };
-                     ?>
-
-                     <section class="col-12 col-xl-10 col-xxl-8">
-                        <h3 class="h6 my-3">Showing file <code><?= e($editor->contentpath) ?></code></h3>
-                  
-                           <header class="bg-dark rounded-top d-flex align-items-center justify-content-between">
-                              <ul class="nav nav-pills" id="pills-tab" role="tablist" type="toolbar">
-                                 <li class="nav-item" role="presentation" title="View file">
-                                    <button class="nav-link  text-light active" id="pills-view-tab" data-bs-toggle="pill" data-bs-target="#pills-view" type="button" role="tab" aria-controls="pills-view" aria-selected="true">
-                                       View Source
-                                    </button>
-                                 </li>
-                                 <li class="nav-item" role="presentation" title="Basic text editor">
-                                    <button class="nav-link  text-light" id="pills-compiled-tab" data-bs-toggle="pill" data-bs-target="#pills-compiled" type="button" role="tab" aria-controls="pills-compiled" aria-selected="false">
-                                       Live Preview
-                                    </button>
-                                 </li>
-                              </ul>
-                           </header>
-                           <div class="tab-content" id="pills-tabContent">
-                              <div class="tab-pane fade show active" id="pills-view" role="tabpanel" aria-labelledby="pills-view-tab">
-                                 <pre ><code id="filecontents" class="language-<?= $editor->type === BladePage::class ? 'html' : 'markdown' ?>"><?= e($editor->getContents()) ?></code></pre>
-                              </div>
-                              <div class="tab-pane fade" id="pills-compiled" role="tabpanel" aria-labelledby="pills-compiled-tab">
-                                 <iframe loading="lazy" width="100%" height="100%" style="min-height: 600px;" src="<?= Hyde::formatLink($editor->filename.'.html') ?>" frameborder="0">
-                                 Loading...
-                              </iframe>
-                           </div>
-                           </div>
-
-                           <div>
-                           <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/styles/default.min.css">
-                           <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.0/build/highlight.min.js"></script>
-
-                              <script>
-                                 hljs.highlightElement(filecontents);
-                              </script>
-                        </div>
-                     </section>
-                     <?php unset($editor); ?>
-                  </div>
-                  
-               <?php } elseif ($page === '404') { ?>
-                  Go <a href="dashboard.php">Back to dashboard</a>?
-               <?php } ?>
-         </main>
-      </div>
-   </div>
-
-   <div class="col-md-9 ms-md-auto col-lg-10 ">
-      <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 mt-4 border-top">
-         <div class="col-md-6 d-flex align-items-center">
-            <a href="/" class="mb-3 me-2 mb-md-0 text-muted text-decoration-none lh-1">
-            <svg class="bi" width="30" height="24"><use xlink:href="#bootstrap"></use></svg>
-            </a>
-            <span class="text-muted">HydeCMS <?= VERSION ?></span>
-                  <small class="text-muted ms-4">
-                     This page was generated in <?= number_format((microtime(true) - HYDE_START) * 1000, 2) ?>ms.
-                  </small>
-         </div>
-         <div class="col-md-6 text-end justify-content-end px-4 d-flex align-items-center">
-           <ul class="nav">
-             <li class="nav-item"> <a href="?page=manual" class="nav-link">Manual</a></li>
-             <li class="nav-item"> <a href="" class="nav-link">GitHub</a></li>
-           </ul>
-         </div>
-      </footer>
-   </div>
-   <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>
-<script src="https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js" integrity="sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE" crossorigin="anonymous"></script>
-<!-- Dashboard scripts -->
-<script> /* feather:false */ (function() { 'use strict'; feather.replace({ 'aria-hidden': 'true' }) })() </script>
-</body>
-</html>
-
-<?php
-} catch (\Throwable $th) {
-                         echo '<h1>Error</h1>';
-                         echo '<p>An error occurred while processing your request.</p>';
-                         echo '<pre><code>'.$th->getMessage().'</code></pre>';
-                         echo '<p>Extra information:</p>';
-                         echo '<pre><code>'.$th->getTraceAsString().print_r($th, true).'</code></pre>';
-                         exit($th->getCode());
-                     }

From 3376ab9e824b5fee7831ff34edb5a0d76dc02ce5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 19:59:55 +0200
Subject: [PATCH 025/768] Delete projects/templates directory

---
 projects/templates/README.md           |   7 -
 projects/templates/dashboard.blade.php | 348 -------------------------
 2 files changed, 355 deletions(-)
 delete mode 100644 projects/templates/README.md
 delete mode 100644 projects/templates/dashboard.blade.php

diff --git a/projects/templates/README.md b/projects/templates/README.md
deleted file mode 100644
index c8f0389463a..00000000000
--- a/projects/templates/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# HydePHP Page Templates
-
-A collection of page templates for use with HydePHP.
-
-Templates that are whole projects should be in their own repository but may be linked here.
-
-Contributions are very welcome!
\ No newline at end of file
diff --git a/projects/templates/dashboard.blade.php b/projects/templates/dashboard.blade.php
deleted file mode 100644
index 51b62944a8f..00000000000
--- a/projects/templates/dashboard.blade.php
+++ /dev/null
@@ -1,348 +0,0 @@
-@php
-    use Hyde\Framework\Models\Pages\BladePage;
-    use Hyde\Framework\Models\Pages\MarkdownPage;
-    use Hyde\Framework\Models\Pages\DocumentationPage;
-    use Hyde\Framework\Models\Pages\MarkdownPost;
-    use Hyde\Framework\Services\DiscoveryService;
-
-	$github = new class {
-		public bool $enabled;
-
-		public function __construct() {
-			$this->enabled = (config('hyde.github_dashboard.enabled', false) === true)
-				&& (config('hyde.github_dashboard.username') !== null)
-				&& (config('hyde.github_dashboard.repository') !== null)
-				&& (config('hyde.github_dashboard.branch') !== null);
-		}
-
-		public function getLink(string $path): string {
-            $action = config('hyde.github_dashboard.action', 'view') === 'edit' ? 'edit' : 'blob';
-            return sprintf("https://github.com/%s/%s/%s/%s/%s",
-                config('hyde.github_dashboard.username'),
-                config('hyde.github_dashboard.repository'),
-                $action,
-                config('hyde.github_dashboard.branch'),
-                $path
-            );
-        }
-
-        public function link(string $path): string {
-            return $this->enabled
-                ? '<a href="'.$this->getLink(e($path)).'">'.e($path).'</a>'
-                : e($path);
-        }
-	};
-@endphp
-
-@extends('hyde::layouts.app')
-@section('content')
-    @php($title = "Dashboard")
-
-    <style>
-        .dashboard-table td, .dashboard-table th {
-            width: 50%;
-        }
-
-        .table-justified td, .table-justified th {
-            text-align: center;
-        }
-
-        .table-justified td:first-child, .table-justified th:first-child {
-            text-align: left;
-        }
-
-        .table-justified td:last-child, .table-justified th:last-child {
-            text-align: right;
-        }
-    </style>
-
-    <main class="mx-auto max-w-7xl py-16 px-8">
-        <header class="text-center prose dark:prose-invert mx-auto">
-            <h1 class="text-3xl font-bold">Project Dashboard</h1>
-            <p>
-                <strong>
-                    Here you can get a quick overview of your project.
-                </strong>
-            </p>
-            <p>
-                While this is useful when developing locally,
-                you may not want to use it when compiling
-                for production.
-            </p>
-        </header>
-
-        <section class="prose dark:prose-invert mx-auto mt-8">
-            <header>
-                <h2>Project Details</h2>
-            </header>
-
-            <section class="mt-8">
-                <h3>Installation Details</h3>
-                <table class="table-justified">
-                    <thead>
-                    <tr>
-                        <th>Project Name</th>
-                        <th>Project Path</th>
-                        <th>Framework Version</th>
-                        <th>PHP Version</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>{{ config('site.name', Hyde::makeTitle(basename(Hyde::path()))) }}</td>
-                        <td>{{ Hyde::path() }}</td>
-                        <td>{{ Hyde::version() }}</td>
-                        <td>{{ PHP_VERSION }} <small>({{ PHP_SAPI }})</small></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <h3>GitHub Integration</h3>
-                <table class="table-justified">
-                    <thead>
-                    <tr>
-                        <th>Username</th>
-                        <th>Repository</th>
-                        <th>Branch</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        @if (config('hyde.github_dashboard.enabled', false))
-                            <td>
-                                <a href="https://github.com/{{ config('hyde.github_dashboard.username', '<not-set>') }}">
-                                    {{ config('hyde.github_dashboard.username', '<not-set>') }}
-                                </a>
-                            </td>
-                            <td>
-                                <a href="https://github.com/{{ config('hyde.github_dashboard.username', '<not-set>') }}/{{ config('hyde.github_dashboard.repository', '<not-set>') }}">
-                                    {{ config('hyde.github_dashboard.repository', '<not-set>') }}
-                                </a>
-                            </td>
-                            <td>
-                                <a href="https://github.com/{{ config('hyde.github_dashboard.username', '<not-set>') }}/{{ config('hyde.github_dashboard.repository', '<not-set>') }}/tree/{{ config('hyde.github_dashboard.branch', '<not-set>') }}">
-                                    {{ config('hyde.github_dashboard.branch', '<not-set>') }}
-                                </a>
-                            </td>
-                        @else
-                            <td colspan="4">
-                                <p class="text-center mb-0">
-                                    <strong>
-                                        GitHub Dashboard Integrations is not enabled.
-                                    </strong>
-                                </p>
-                                <details class="text-center">
-                                    <summary class="cursor-pointer">
-                                        Show configuration guide.
-                                    </summary>
-                                    <p>
-                                        The GitHub integration allows you to easily
-                                        open dashboard files in your GitHub repository.
-                                        <br>
-                                        To enable it, you need to let Hyde know where
-                                        your GitHub repository is located.<br>
-                                        The repository is assumed to be a top level installation of Hyde/Hyde.
-                                        <br>
-                                        Add the following to your <code>config/hyde.php</code> file:
-                                    </p>
-                                    <pre class="text-left w-fit py-0 px-4 mx-auto"><code class="my-0"><div
-                                                    style="color: rgb(191, 199, 213); font-family: 'Fira Code Regular', Consolas, 'Courier New', monospace; font-size: 14px; line-height: 18px;"><div
-                                                        style="line-height: 18px;"><div><span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">github_dashboard</span><span
-                                                                style="color: #d9f5dd;">'</span> <span
-                                                                style="color: #89ddff;">=&gt;</span> [</div><div>&nbsp; &nbsp; <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">enabled</span><span
-                                                                style="color: #d9f5dd;">'</span> <span
-                                                                style="color: #89ddff;">=&gt;</span> <span
-                                                                style="color: #82aaff;">true</span>,</div><div>&nbsp; &nbsp; <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">username</span><span
-                                                                style="color: #d9f5dd;">'</span> <span
-                                                                style="color: #89ddff;">=&gt;</span> <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">octocat</span><span
-                                                                style="color: #d9f5dd;">'</span>,</div><div>&nbsp; &nbsp; <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">repository</span><span
-                                                                style="color: #d9f5dd;">'</span> <span
-                                                                style="color: #89ddff;">=&gt;</span> <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">homepage</span><span
-                                                                style="color: #d9f5dd;">'</span>,</div><div>&nbsp; &nbsp; <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">branch</span><span
-                                                                style="color: #d9f5dd;">'</span> <span
-                                                                style="color: #89ddff;">=&gt;</span> <span
-                                                                style="color: #d9f5dd;">'</span><span
-                                                                style="color: #c3e88d;">main</span><span
-                                                                style="color: #d9f5dd;">'</span>,</div><div>]</div></div></div></code></pre>
-                                </details>
-                            </td>
-                        @endif
-                    </tr>
-                    </tbody>
-                </table>
-            </section>
-        </section>
-
-        <section class="prose dark:prose-invert mx-auto mt-8">
-            <header>
-                <h2>Your Content</h2>
-            </header>
-
-            <h3>Content Overview</h3>
-            <table class="table-justified">
-                <thead>
-                <tr>
-                    <th>Blade Pages</th>
-                    <th>Markdown Pages</th>
-                    <th>Documentation Pages</th>
-                    <th>Blog Posts</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td>
-                        <a href="#blade-pages">
-                            <b>{{ count(DiscoveryService::getBladePageFiles()) }}</b> pages
-                        </a>
-                    </td>
-                    <td>
-                        <a href="#markdown-pages">
-                            <b>{{ count(DiscoveryService::getMarkdownPageFiles()) }}</b> pages
-                        </a>
-                    </td>
-                    <td>
-                        <a href="#documentation-pages">
-                            <b>{{ count(DiscoveryService::getDocumentationPageFiles()) }}</b> pages
-                        </a>
-                    </td>
-                    <td>
-                        <a href="#blog-posts">
-                            <b>{{ count(DiscoveryService::getMarkdownPostFiles()) }}</b> posts
-                        </a>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-
-            <section class="mt-8">
-                <h3 id="blade-pages">
-                    Blade Pages
-                    <a href="#blade-pages" title="Heading link">#</a>
-                </h3>
-                <table class="dashboard-table">
-                    <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th>Source File</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (BladePage::all() as $page)
-                        <tr>
-                            <td>
-                                <a href="{{ Hyde::formatLink($page->slug . '.html') }}">
-                                    {{ Hyde::makeTitle($page->view) }}
-                                </a>
-                            </td>
-                            <td>
-                                {!! $github->link(BladePage::$sourceDirectory .'/'. $page->slug . BladePage::$fileExtension) !!}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </section>
-
-            <section class="mt-8">
-                <h3 id="markdown-pages">
-                    Markdown Pages
-                    <a href="#markdown-pages" title="Heading link">#</a>
-                </h3>
-                <table class="dashboard-table">
-                    <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th>Source File</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (MarkdownPage::all() as $page)
-                        <tr>
-                            <td>
-                                <a href="{{ Hyde::formatLink($page->slug . '.html') }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-                            <td>
-                                {!! $github->link(MarkdownPage::$sourceDirectory .'/'. $page->slug . MarkdownPage::$fileExtension) !!}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </section>
-
-            <section class="mt-8">
-                <h3 id="documentation-pages">
-                    Documentation Pages
-                    <a href="#documentation-pages" title="Heading link">#</a>
-                </h3>
-                <table class="dashboard-table">
-                    <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th>Source File</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (DocumentationPage::all() as $page)
-                        <tr>
-                            <td>
-                                <a href="{{ DocumentationPage::$outputDirectory .'/'. Hyde::formatLink($page->slug . '.html') }}">
-                                    {{ $page->title }}
-                                </a>
-                            </td>
-                            <td>
-                                {!! $github->link(DocumentationPage::$sourceDirectory .'/'. $page->slug . DocumentationPage::$fileExtension) !!}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </section>
-
-            <section class="mt-8">
-                <h3 id="blog-posts">
-                    Blog Posts
-                    <a href="#blog-posts" title="Heading link">#</a>
-                </h3>
-                <table class="dashboard-table">
-                    <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th>Source File</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    @foreach (MarkdownPost::all() as $post)
-                        <tr>
-                            <td>
-                                <a href="posts/{{ Hyde::formatLink($post->slug . '.html') }}">
-                                    {{ $post->title }}
-                                </a>
-                            </td>
-                            <td>
-                                {!! $github->link(MarkdownPost::$sourceDirectory .'/'. $post->slug . MarkdownPost::$fileExtension) !!}
-                            </td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </section>
-        </section>
-    </main>
-@endsection

From 11de4f5db70ed47d47a9f75f4ea1b44715669c95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:12:23 +0200
Subject: [PATCH 026/768] Move Commands namespace into Hyde\Console namespace

---
 config/commands.php                           |  2 +-
 .../Commands/HydeBuildRssFeedCommand.php      |  2 +-
 .../Commands/HydeBuildSearchCommand.php       |  2 +-
 .../Commands/HydeBuildSiteCommand.php         |  2 +-
 .../Commands/HydeBuildSitemapCommand.php      |  2 +-
 .../Commands/HydeDebugCommand.php             |  2 +-
 .../Commands/HydeMakePageCommand.php          |  2 +-
 .../Commands/HydeMakePostCommand.php          |  2 +-
 .../Commands/HydePackageDiscoverCommand.php   |  2 +-
 .../Commands/HydePublishHomepageCommand.php   |  2 +-
 .../Commands/HydePublishViewsCommand.php      |  2 +-
 .../Commands/HydeRebuildStaticSiteCommand.php |  2 +-
 .../Commands/HydeRouteListCommand.php         |  2 +-
 .../Commands/HydeServeCommand.php             |  2 +-
 .../Commands/HydeUpdateConfigsCommand.php     |  2 +-
 .../Commands/HydeValidateCommand.php          |  2 +-
 .../Actions/CreatesNewMarkdownPostFile.php    |  2 +-
 .../src/Framework/HydeServiceProvider.php     | 30 +++++++++----------
 .../src/Framework/Services/BuildService.php   |  2 +-
 .../Commands/HydeBuildRssFeedCommandTest.php  |  2 +-
 .../Commands/HydeBuildSearchCommandTest.php   |  2 +-
 .../Commands/HydeBuildSitemapCommandTest.php  |  2 +-
 .../Commands/HydeMakePageCommandTest.php      |  2 +-
 .../HydePackageDiscoverCommandTest.php        |  2 +-
 .../HydePublishHomepageCommandTest.php        |  2 +-
 .../Commands/HydePublishViewsCommandTest.php  |  2 +-
 .../HydeRebuildStaticSiteCommandTest.php      |  2 +-
 .../Commands/HydeRouteListCommandTest.php     |  2 +-
 .../Feature/Commands/HydeServeCommandTest.php |  2 +-
 .../Commands/HydeUpdateConfigsCommandTest.php |  2 +-
 .../Commands/HydeValidateCommandTest.php      |  2 +-
 .../Feature/Services/BuildTaskServiceTest.php |  2 +-
 .../tests/Feature/StaticSiteServiceTest.php   |  2 +-
 33 files changed, 47 insertions(+), 47 deletions(-)
 rename packages/framework/src/{Framework => Console}/Commands/HydeBuildRssFeedCommand.php (93%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeBuildSearchCommand.php (94%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeBuildSiteCommand.php (99%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeBuildSitemapCommand.php (94%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeDebugCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeMakePageCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeMakePostCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydePackageDiscoverCommand.php (94%)
 rename packages/framework/src/{Framework => Console}/Commands/HydePublishHomepageCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydePublishViewsCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeRebuildStaticSiteCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeRouteListCommand.php (98%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeServeCommand.php (96%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeUpdateConfigsCommand.php (95%)
 rename packages/framework/src/{Framework => Console}/Commands/HydeValidateCommand.php (97%)

diff --git a/config/commands.php b/config/commands.php
index 2b45dcc1be5..9ae1367d4f2 100644
--- a/config/commands.php
+++ b/config/commands.php
@@ -58,7 +58,7 @@
         NunoMaduro\LaravelConsoleSummary\SummaryCommand::class,
         Symfony\Component\Console\Command\DumpCompletionCommand::class,
         Symfony\Component\Console\Command\HelpCommand::class,
-        Hyde\Framework\Commands\HydeDebugCommand::class,
+        \Hyde\Console\Commands\HydeDebugCommand::class,
     ],
 
     /*
diff --git a/packages/framework/src/Framework/Commands/HydeBuildRssFeedCommand.php b/packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php
similarity index 93%
rename from packages/framework/src/Framework/Commands/HydeBuildRssFeedCommand.php
rename to packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php
index 6e5648dbcf0..cea7fd9aba4 100644
--- a/packages/framework/src/Framework/Commands/HydeBuildRssFeedCommand.php
+++ b/packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Framework/Commands/HydeBuildSearchCommand.php b/packages/framework/src/Console/Commands/HydeBuildSearchCommand.php
similarity index 94%
rename from packages/framework/src/Framework/Commands/HydeBuildSearchCommand.php
rename to packages/framework/src/Console/Commands/HydeBuildSearchCommand.php
index 81ae04129ec..fd529d6590e 100644
--- a/packages/framework/src/Framework/Commands/HydeBuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/HydeBuildSearchCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php b/packages/framework/src/Console/Commands/HydeBuildSiteCommand.php
similarity index 99%
rename from packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
rename to packages/framework/src/Console/Commands/HydeBuildSiteCommand.php
index 3d40639c7e1..13dec77d62f 100644
--- a/packages/framework/src/Framework/Commands/HydeBuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/HydeBuildSiteCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Exception;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
diff --git a/packages/framework/src/Framework/Commands/HydeBuildSitemapCommand.php b/packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php
similarity index 94%
rename from packages/framework/src/Framework/Commands/HydeBuildSitemapCommand.php
rename to packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php
index d73142eeef3..920a885637b 100644
--- a/packages/framework/src/Framework/Commands/HydeBuildSitemapCommand.php
+++ b/packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Framework/Commands/HydeDebugCommand.php b/packages/framework/src/Console/Commands/HydeDebugCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydeDebugCommand.php
rename to packages/framework/src/Console/Commands/HydeDebugCommand.php
index 0b2868cf356..9cb25c8a40b 100644
--- a/packages/framework/src/Framework/Commands/HydeDebugCommand.php
+++ b/packages/framework/src/Console/Commands/HydeDebugCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Composer\InstalledVersions;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Commands/HydeMakePageCommand.php b/packages/framework/src/Console/Commands/HydeMakePageCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydeMakePageCommand.php
rename to packages/framework/src/Console/Commands/HydeMakePageCommand.php
index 63a86e7f963..41d5693571e 100644
--- a/packages/framework/src/Framework/Commands/HydeMakePageCommand.php
+++ b/packages/framework/src/Console/Commands/HydeMakePageCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\CreatesNewPageSourceFile;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
diff --git a/packages/framework/src/Framework/Commands/HydeMakePostCommand.php b/packages/framework/src/Console/Commands/HydeMakePostCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydeMakePostCommand.php
rename to packages/framework/src/Console/Commands/HydeMakePostCommand.php
index 40899962d17..30be35c9b1c 100644
--- a/packages/framework/src/Framework/Commands/HydeMakePostCommand.php
+++ b/packages/framework/src/Console/Commands/HydeMakePostCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Exception;
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
diff --git a/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php b/packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php
similarity index 94%
rename from packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
rename to packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php
index fd15ceb064d..5097a5cb6d9 100644
--- a/packages/framework/src/Framework/Commands/HydePackageDiscoverCommand.php
+++ b/packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Hyde;
 use Illuminate\Foundation\Console\PackageDiscoverCommand as BaseCommand;
diff --git a/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php b/packages/framework/src/Console/Commands/HydePublishHomepageCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
rename to packages/framework/src/Console/Commands/HydePublishHomepageCommand.php
index de05387d985..bdfc71aaad3 100644
--- a/packages/framework/src/Framework/Commands/HydePublishHomepageCommand.php
+++ b/packages/framework/src/Console/Commands/HydePublishHomepageCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\PublishesHomepageView;
 use Hyde\Framework\Services\ChecksumService;
diff --git a/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php b/packages/framework/src/Console/Commands/HydePublishViewsCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
rename to packages/framework/src/Console/Commands/HydePublishViewsCommand.php
index 6cb8d1faff8..f417cef94a8 100644
--- a/packages/framework/src/Framework/Commands/HydePublishViewsCommand.php
+++ b/packages/framework/src/Console/Commands/HydePublishViewsCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Actions\PublishesHydeViews;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php b/packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
rename to packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php
index 808295b7270..8238b2500c0 100644
--- a/packages/framework/src/Framework/Commands/HydeRebuildStaticSiteCommand.php
+++ b/packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Exception;
 use Hyde\Framework\Services\BuildService;
diff --git a/packages/framework/src/Framework/Commands/HydeRouteListCommand.php b/packages/framework/src/Console/Commands/HydeRouteListCommand.php
similarity index 98%
rename from packages/framework/src/Framework/Commands/HydeRouteListCommand.php
rename to packages/framework/src/Console/Commands/HydeRouteListCommand.php
index e1bb9cc2101..e79f03ee7dd 100644
--- a/packages/framework/src/Framework/Commands/HydeRouteListCommand.php
+++ b/packages/framework/src/Console/Commands/HydeRouteListCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Commands/HydeServeCommand.php b/packages/framework/src/Console/Commands/HydeServeCommand.php
similarity index 96%
rename from packages/framework/src/Framework/Commands/HydeServeCommand.php
rename to packages/framework/src/Console/Commands/HydeServeCommand.php
index b1247ca8469..48bc604f6bb 100644
--- a/packages/framework/src/Framework/Commands/HydeServeCommand.php
+++ b/packages/framework/src/Console/Commands/HydeServeCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php b/packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php
similarity index 95%
rename from packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
rename to packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php
index 7e395691841..35ba3f7d25a 100644
--- a/packages/framework/src/Framework/Commands/HydeUpdateConfigsCommand.php
+++ b/packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Hyde;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/src/Framework/Commands/HydeValidateCommand.php b/packages/framework/src/Console/Commands/HydeValidateCommand.php
similarity index 97%
rename from packages/framework/src/Framework/Commands/HydeValidateCommand.php
rename to packages/framework/src/Console/Commands/HydeValidateCommand.php
index b8f29d92a4a..34421d1b9f1 100644
--- a/packages/framework/src/Framework/Commands/HydeValidateCommand.php
+++ b/packages/framework/src/Console/Commands/HydeValidateCommand.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Commands;
+namespace Hyde\Console\Commands;
 
 use Hyde\Framework\Services\ValidationService;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
index 724e5832d1b..20a33ae58ab 100644
--- a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
+++ b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
@@ -15,7 +15,7 @@
  * using the Hyde command, and converts and formats the
  * data input by the user, and then saves the file.
  *
- * @see \Hyde\Framework\Commands\HydeMakePostCommand
+ * @see \Hyde\Console\Commands\HydeMakePostCommand
  */
 class CreatesNewMarkdownPostFile
 {
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 9a9e1204ceb..379da278ad8 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -109,23 +109,23 @@ protected function initializeConfiguration()
     protected function registerHydeConsoleCommands(): void
     {
         $this->commands([
-            Commands\HydePublishHomepageCommand::class,
-            Commands\HydeUpdateConfigsCommand::class,
-            Commands\HydePublishViewsCommand::class,
-            Commands\HydeRebuildStaticSiteCommand::class,
-            Commands\HydeBuildSiteCommand::class,
-            Commands\HydeBuildSitemapCommand::class,
-            Commands\HydeBuildRssFeedCommand::class,
-            Commands\HydeBuildSearchCommand::class,
-            Commands\HydeRouteListCommand::class,
-            Commands\HydeMakePostCommand::class,
-            Commands\HydeMakePageCommand::class,
-            Commands\HydeValidateCommand::class,
+            \Hyde\Console\Commands\HydePublishHomepageCommand::class,
+            \Hyde\Console\Commands\HydeUpdateConfigsCommand::class,
+            \Hyde\Console\Commands\HydePublishViewsCommand::class,
+            \Hyde\Console\Commands\HydeRebuildStaticSiteCommand::class,
+            \Hyde\Console\Commands\HydeBuildSiteCommand::class,
+            \Hyde\Console\Commands\HydeBuildSitemapCommand::class,
+            \Hyde\Console\Commands\HydeBuildRssFeedCommand::class,
+            \Hyde\Console\Commands\HydeBuildSearchCommand::class,
+            \Hyde\Console\Commands\HydeRouteListCommand::class,
+            \Hyde\Console\Commands\HydeMakePostCommand::class,
+            \Hyde\Console\Commands\HydeMakePageCommand::class,
+            \Hyde\Console\Commands\HydeValidateCommand::class,
             // Commands\HydeInstallCommand::class,
-            Commands\HydeDebugCommand::class,
-            Commands\HydeServeCommand::class,
+            \Hyde\Console\Commands\HydeDebugCommand::class,
+            \Hyde\Console\Commands\HydeServeCommand::class,
 
-            Commands\HydePackageDiscoverCommand::class,
+            \Hyde\Console\Commands\HydePackageDiscoverCommand::class,
         ]);
     }
 
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 776bfe5b8a2..a065fe431d7 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -20,7 +20,7 @@
  *
  * Handles the build loop which generates the static site.
  *
- * @see \Hyde\Framework\Commands\HydeBuildSiteCommand
+ * @see \Hyde\Console\Commands\HydeBuildSiteCommand
  * @see \Hyde\Framework\Testing\Feature\StaticSiteServiceTest
  */
 class BuildService
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
index 24826a9ffaa..92257f1000f 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeBuildRssFeedCommand
+ * @covers \Hyde\Console\Commands\HydeBuildRssFeedCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
  */
 class HydeBuildRssFeedCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
index 867b68d923b..4bcc29239f0 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
@@ -11,7 +11,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeBuildSearchCommand
+ * @covers \Hyde\Console\Commands\HydeBuildSearchCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  */
 class HydeBuildSearchCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
index 3e8007b5d48..0337a1c967e 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeBuildSitemapCommand
+ * @covers \Hyde\Console\Commands\HydeBuildSitemapCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  */
 class HydeBuildSitemapCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
index b20970261dc..83988067c02 100644
--- a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
@@ -10,7 +10,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeMakePageCommand
+ * @covers \Hyde\Console\Commands\HydeMakePageCommand
  */
 class HydeMakePageCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
index f6cdde9fff3..d5b83c6b3b3 100644
--- a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
@@ -9,7 +9,7 @@
 use Illuminate\Foundation\PackageManifest;
 
 /**
- * @covers \Hyde\Framework\Commands\HydePackageDiscoverCommand
+ * @covers \Hyde\Console\Commands\HydePackageDiscoverCommand
  */
 class HydePackageDiscoverCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
index 99a153984e5..1caf6050c64 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydePublishHomepageCommand
+ * @covers \Hyde\Console\Commands\HydePublishHomepageCommand
  */
 class HydePublishHomepageCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
index 1b6b2f5e11a..e2fbc9cb806 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydePublishViewsCommand
+ * @covers \Hyde\Console\Commands\HydePublishViewsCommand
  */
 class HydePublishViewsCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
index 457ee191f46..fbbd712ba30 100644
--- a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeRebuildStaticSiteCommand
+ * @covers \Hyde\Console\Commands\HydeRebuildStaticSiteCommand
  */
 class HydeRebuildStaticSiteCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php b/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
index fcaeccee998..64337722787 100644
--- a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeRouteListCommand
+ * @covers \Hyde\Console\Commands\HydeRouteListCommand
  */
 class HydeRouteListCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php b/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
index e5c3a559e56..4d75feb3619 100644
--- a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeServeCommand
+ * @covers \Hyde\Console\Commands\HydeServeCommand
  */
 class HydeServeCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
index 70ed94fa9fd..ac83daa2c86 100644
--- a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeUpdateConfigsCommand
+ * @covers \Hyde\Console\Commands\HydeUpdateConfigsCommand
  */
 class HydeUpdateConfigsCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php b/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
index b2e68f5d83f..0b4e708f08d 100644
--- a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeValidateCommand
+ * @covers \Hyde\Console\Commands\HydeValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
  * @covers \Hyde\Framework\Models\Support\ValidationResult
  *
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index ef039917c1c..d1178920823 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -22,7 +22,7 @@
 class BuildTaskServiceTest extends TestCase
 {
     /**
-     * @covers \Hyde\Framework\Commands\HydeBuildSiteCommand::runPostBuildActions
+     * @covers \Hyde\Console\Commands\HydeBuildSiteCommand::runPostBuildActions
      */
     public function test_build_command_can_run_post_build_tasks()
     {
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 60f3460129c..2a5e281f84c 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -10,7 +10,7 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Commands\HydeBuildSiteCommand
+ * @covers \Hyde\Console\Commands\HydeBuildSiteCommand
  * @covers \Hyde\Framework\Services\BuildService
  */
 class StaticSiteServiceTest extends TestCase

From d1675aa282ec372bbfb931b59342fd8a2220d333 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:20:29 +0200
Subject: [PATCH 027/768] Remove "Hyde" prefix from the console command class
 names

---
 config/commands.php                           |  2 +-
 ...eedCommand.php => BuildRssFeedCommand.php} |  2 +-
 ...archCommand.php => BuildSearchCommand.php} |  2 +-
 ...ldSiteCommand.php => BuildSiteCommand.php} |  2 +-
 ...mapCommand.php => BuildSitemapCommand.php} |  2 +-
 ...{HydeDebugCommand.php => DebugCommand.php} |  2 +-
 ...akePageCommand.php => MakePageCommand.php} |  2 +-
 ...akePostCommand.php => MakePostCommand.php} |  2 +-
 ...Command.php => PackageDiscoverCommand.php} |  2 +-
 ...Command.php => PublishHomepageCommand.php} |  2 +-
 ...ewsCommand.php => PublishViewsCommand.php} |  2 +-
 ...mmand.php => RebuildStaticSiteCommand.php} |  2 +-
 ...teListCommand.php => RouteListCommand.php} |  2 +-
 ...{HydeServeCommand.php => ServeCommand.php} |  2 +-
 ...gsCommand.php => UpdateConfigsCommand.php} |  2 +-
 ...alidateCommand.php => ValidateCommand.php} |  2 +-
 .../Actions/CreatesNewMarkdownPostFile.php    |  2 +-
 .../src/Framework/HydeServiceProvider.php     | 30 +++++++++----------
 .../src/Framework/Services/BuildService.php   |  2 +-
 .../Commands/HydeBuildRssFeedCommandTest.php  |  2 +-
 .../Commands/HydeBuildSearchCommandTest.php   |  2 +-
 .../Commands/HydeBuildSitemapCommandTest.php  |  2 +-
 .../Commands/HydeMakePageCommandTest.php      |  2 +-
 .../HydePackageDiscoverCommandTest.php        |  2 +-
 .../HydePublishHomepageCommandTest.php        |  2 +-
 .../Commands/HydePublishViewsCommandTest.php  |  2 +-
 .../HydeRebuildStaticSiteCommandTest.php      |  2 +-
 .../Commands/HydeRouteListCommandTest.php     |  2 +-
 .../Feature/Commands/HydeServeCommandTest.php |  2 +-
 .../Commands/HydeUpdateConfigsCommandTest.php |  2 +-
 .../Commands/HydeValidateCommandTest.php      |  2 +-
 .../Feature/Services/BuildTaskServiceTest.php |  2 +-
 .../tests/Feature/StaticSiteServiceTest.php   |  2 +-
 33 files changed, 47 insertions(+), 47 deletions(-)
 rename packages/framework/src/Console/Commands/{HydeBuildRssFeedCommand.php => BuildRssFeedCommand.php} (92%)
 rename packages/framework/src/Console/Commands/{HydeBuildSearchCommand.php => BuildSearchCommand.php} (92%)
 rename packages/framework/src/Console/Commands/{HydeBuildSiteCommand.php => BuildSiteCommand.php} (99%)
 rename packages/framework/src/Console/Commands/{HydeBuildSitemapCommand.php => BuildSitemapCommand.php} (92%)
 rename packages/framework/src/Console/Commands/{HydeDebugCommand.php => DebugCommand.php} (97%)
 rename packages/framework/src/Console/Commands/{HydeMakePageCommand.php => MakePageCommand.php} (98%)
 rename packages/framework/src/Console/Commands/{HydeMakePostCommand.php => MakePostCommand.php} (98%)
 rename packages/framework/src/Console/Commands/{HydePackageDiscoverCommand.php => PackageDiscoverCommand.php} (90%)
 rename packages/framework/src/Console/Commands/{HydePublishHomepageCommand.php => PublishHomepageCommand.php} (98%)
 rename packages/framework/src/Console/Commands/{HydePublishViewsCommand.php => PublishViewsCommand.php} (98%)
 rename packages/framework/src/Console/Commands/{HydeRebuildStaticSiteCommand.php => RebuildStaticSiteCommand.php} (98%)
 rename packages/framework/src/Console/Commands/{HydeRouteListCommand.php => RouteListCommand.php} (97%)
 rename packages/framework/src/Console/Commands/{HydeServeCommand.php => ServeCommand.php} (96%)
 rename packages/framework/src/Console/Commands/{HydeUpdateConfigsCommand.php => UpdateConfigsCommand.php} (93%)
 rename packages/framework/src/Console/Commands/{HydeValidateCommand.php => ValidateCommand.php} (97%)

diff --git a/config/commands.php b/config/commands.php
index 9ae1367d4f2..d15ac8b7ac1 100644
--- a/config/commands.php
+++ b/config/commands.php
@@ -58,7 +58,7 @@
         NunoMaduro\LaravelConsoleSummary\SummaryCommand::class,
         Symfony\Component\Console\Command\DumpCompletionCommand::class,
         Symfony\Component\Console\Command\HelpCommand::class,
-        \Hyde\Console\Commands\HydeDebugCommand::class,
+        \Hyde\Console\Commands\DebugCommand::class,
     ],
 
     /*
diff --git a/packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
similarity index 92%
rename from packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php
rename to packages/framework/src/Console/Commands/BuildRssFeedCommand.php
index cea7fd9aba4..27ec83910ae 100644
--- a/packages/framework/src/Console/Commands/HydeBuildRssFeedCommand.php
+++ b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
@@ -12,7 +12,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildRssFeedCommandTest
  */
-class HydeBuildRssFeedCommand extends Command
+class BuildRssFeedCommand extends Command
 {
     protected $signature = 'build:rss';
     protected $description = 'Generate the RSS feed';
diff --git a/packages/framework/src/Console/Commands/HydeBuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
similarity index 92%
rename from packages/framework/src/Console/Commands/HydeBuildSearchCommand.php
rename to packages/framework/src/Console/Commands/BuildSearchCommand.php
index fd529d6590e..dda84826691 100644
--- a/packages/framework/src/Console/Commands/HydeBuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -12,7 +12,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildSearchCommandTest
  */
-class HydeBuildSearchCommand extends Command
+class BuildSearchCommand extends Command
 {
     protected $signature = 'build:search';
     protected $description = 'Generate the docs/search.json';
diff --git a/packages/framework/src/Console/Commands/HydeBuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
similarity index 99%
rename from packages/framework/src/Console/Commands/HydeBuildSiteCommand.php
rename to packages/framework/src/Console/Commands/BuildSiteCommand.php
index 13dec77d62f..46bddc3c593 100644
--- a/packages/framework/src/Console/Commands/HydeBuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -21,7 +21,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\StaticSiteServiceTest
  */
-class HydeBuildSiteCommand extends Command
+class BuildSiteCommand extends Command
 {
     /**
      * The signature of the command.
diff --git a/packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
similarity index 92%
rename from packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php
rename to packages/framework/src/Console/Commands/BuildSitemapCommand.php
index 920a885637b..e710dd7a2da 100644
--- a/packages/framework/src/Console/Commands/HydeBuildSitemapCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
@@ -12,7 +12,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildSitemapCommandTest
  */
-class HydeBuildSitemapCommand extends Command
+class BuildSitemapCommand extends Command
 {
     protected $signature = 'build:sitemap';
     protected $description = 'Generate the sitemap.xml';
diff --git a/packages/framework/src/Console/Commands/HydeDebugCommand.php b/packages/framework/src/Console/Commands/DebugCommand.php
similarity index 97%
rename from packages/framework/src/Console/Commands/HydeDebugCommand.php
rename to packages/framework/src/Console/Commands/DebugCommand.php
index 9cb25c8a40b..957db4bb736 100644
--- a/packages/framework/src/Console/Commands/HydeDebugCommand.php
+++ b/packages/framework/src/Console/Commands/DebugCommand.php
@@ -11,7 +11,7 @@
 /**
  * Hyde Command to print debug information.
  */
-class HydeDebugCommand extends Command
+class DebugCommand extends Command
 {
     /**
      * The signature of the command.
diff --git a/packages/framework/src/Console/Commands/HydeMakePageCommand.php b/packages/framework/src/Console/Commands/MakePageCommand.php
similarity index 98%
rename from packages/framework/src/Console/Commands/HydeMakePageCommand.php
rename to packages/framework/src/Console/Commands/MakePageCommand.php
index 41d5693571e..97f8e6638bc 100644
--- a/packages/framework/src/Console/Commands/HydeMakePageCommand.php
+++ b/packages/framework/src/Console/Commands/MakePageCommand.php
@@ -16,7 +16,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeMakePageCommandTest
  */
-class HydeMakePageCommand extends Command
+class MakePageCommand extends Command
 {
     /**
      * The name and signature of the console command.
diff --git a/packages/framework/src/Console/Commands/HydeMakePostCommand.php b/packages/framework/src/Console/Commands/MakePostCommand.php
similarity index 98%
rename from packages/framework/src/Console/Commands/HydeMakePostCommand.php
rename to packages/framework/src/Console/Commands/MakePostCommand.php
index 30be35c9b1c..195805af19b 100644
--- a/packages/framework/src/Console/Commands/HydeMakePostCommand.php
+++ b/packages/framework/src/Console/Commands/MakePostCommand.php
@@ -11,7 +11,7 @@
 /**
  * Hyde Command to scaffold a new Markdown Post.
  */
-class HydeMakePostCommand extends Command
+class MakePostCommand extends Command
 {
     /**
      * The signature of the command.
diff --git a/packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
similarity index 90%
rename from packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php
rename to packages/framework/src/Console/Commands/PackageDiscoverCommand.php
index 5097a5cb6d9..aaec2182792 100644
--- a/packages/framework/src/Console/Commands/HydePackageDiscoverCommand.php
+++ b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
@@ -11,7 +11,7 @@
 /**
  * @see \Hyde\Framework\Testing\Feature\Commands\HydePackageDiscoverCommandTest
  */
-class HydePackageDiscoverCommand extends BaseCommand
+class PackageDiscoverCommand extends BaseCommand
 {
     /** @var true */
     protected $hidden = true;
diff --git a/packages/framework/src/Console/Commands/HydePublishHomepageCommand.php b/packages/framework/src/Console/Commands/PublishHomepageCommand.php
similarity index 98%
rename from packages/framework/src/Console/Commands/HydePublishHomepageCommand.php
rename to packages/framework/src/Console/Commands/PublishHomepageCommand.php
index bdfc71aaad3..20ba9f725c6 100644
--- a/packages/framework/src/Console/Commands/HydePublishHomepageCommand.php
+++ b/packages/framework/src/Console/Commands/PublishHomepageCommand.php
@@ -15,7 +15,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydePublishHomepageCommandTest
  */
-class HydePublishHomepageCommand extends Command
+class PublishHomepageCommand extends Command
 {
     /** @var string */
     protected $signature = 'publish:homepage {homepage? : The name of the page to publish}
diff --git a/packages/framework/src/Console/Commands/HydePublishViewsCommand.php b/packages/framework/src/Console/Commands/PublishViewsCommand.php
similarity index 98%
rename from packages/framework/src/Console/Commands/HydePublishViewsCommand.php
rename to packages/framework/src/Console/Commands/PublishViewsCommand.php
index f417cef94a8..accaf0123a7 100644
--- a/packages/framework/src/Console/Commands/HydePublishViewsCommand.php
+++ b/packages/framework/src/Console/Commands/PublishViewsCommand.php
@@ -11,7 +11,7 @@
 /**
  * Publish the Hyde Blade views.
  */
-class HydePublishViewsCommand extends Command
+class PublishViewsCommand extends Command
 {
     /** @var string */
     protected $signature = 'publish:views {category? : The category to publish}';
diff --git a/packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
similarity index 98%
rename from packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php
rename to packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
index 8238b2500c0..25dc5b5f77e 100644
--- a/packages/framework/src/Console/Commands/HydeRebuildStaticSiteCommand.php
+++ b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
@@ -16,7 +16,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeRebuildStaticSiteCommandTest
  */
-class HydeRebuildStaticSiteCommand extends Command
+class RebuildStaticSiteCommand extends Command
 {
     /**
      * The signature of the command.
diff --git a/packages/framework/src/Console/Commands/HydeRouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
similarity index 97%
rename from packages/framework/src/Console/Commands/HydeRouteListCommand.php
rename to packages/framework/src/Console/Commands/RouteListCommand.php
index e79f03ee7dd..3e244fb9144 100644
--- a/packages/framework/src/Console/Commands/HydeRouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -13,7 +13,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeRouteListCommandTest
  */
-class HydeRouteListCommand extends Command
+class RouteListCommand extends Command
 {
     protected $signature = 'route:list';
     protected $description = 'Display all registered routes.';
diff --git a/packages/framework/src/Console/Commands/HydeServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
similarity index 96%
rename from packages/framework/src/Console/Commands/HydeServeCommand.php
rename to packages/framework/src/Console/Commands/ServeCommand.php
index 48bc604f6bb..9541bc2793a 100644
--- a/packages/framework/src/Console/Commands/HydeServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -10,7 +10,7 @@
 /**
  * Start the realtime compiler server.
  */
-class HydeServeCommand extends Command
+class ServeCommand extends Command
 {
     /**
      * The signature of the command.
diff --git a/packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php b/packages/framework/src/Console/Commands/UpdateConfigsCommand.php
similarity index 93%
rename from packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php
rename to packages/framework/src/Console/Commands/UpdateConfigsCommand.php
index 35ba3f7d25a..e1957125f35 100644
--- a/packages/framework/src/Console/Commands/HydeUpdateConfigsCommand.php
+++ b/packages/framework/src/Console/Commands/UpdateConfigsCommand.php
@@ -13,7 +13,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeUpdateConfigsCommandTest
  */
-class HydeUpdateConfigsCommand extends Command
+class UpdateConfigsCommand extends Command
 {
     /** @var string */
     protected $signature = 'update:configs';
diff --git a/packages/framework/src/Console/Commands/HydeValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
similarity index 97%
rename from packages/framework/src/Console/Commands/HydeValidateCommand.php
rename to packages/framework/src/Console/Commands/ValidateCommand.php
index 34421d1b9f1..4ba9168242c 100644
--- a/packages/framework/src/Console/Commands/HydeValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -10,7 +10,7 @@
 /**
  * @see \Hyde\Framework\Testing\Feature\Commands\HydeValidateCommandTest
  */
-class HydeValidateCommand extends Command
+class ValidateCommand extends Command
 {
     /** @var string */
     protected $signature = 'validate';
diff --git a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
index 20a33ae58ab..0ba057e89da 100644
--- a/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
+++ b/packages/framework/src/Framework/Actions/CreatesNewMarkdownPostFile.php
@@ -15,7 +15,7 @@
  * using the Hyde command, and converts and formats the
  * data input by the user, and then saves the file.
  *
- * @see \Hyde\Console\Commands\HydeMakePostCommand
+ * @see \Hyde\Console\Commands\MakePostCommand
  */
 class CreatesNewMarkdownPostFile
 {
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 379da278ad8..902d378e814 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -109,23 +109,23 @@ protected function initializeConfiguration()
     protected function registerHydeConsoleCommands(): void
     {
         $this->commands([
-            \Hyde\Console\Commands\HydePublishHomepageCommand::class,
-            \Hyde\Console\Commands\HydeUpdateConfigsCommand::class,
-            \Hyde\Console\Commands\HydePublishViewsCommand::class,
-            \Hyde\Console\Commands\HydeRebuildStaticSiteCommand::class,
-            \Hyde\Console\Commands\HydeBuildSiteCommand::class,
-            \Hyde\Console\Commands\HydeBuildSitemapCommand::class,
-            \Hyde\Console\Commands\HydeBuildRssFeedCommand::class,
-            \Hyde\Console\Commands\HydeBuildSearchCommand::class,
-            \Hyde\Console\Commands\HydeRouteListCommand::class,
-            \Hyde\Console\Commands\HydeMakePostCommand::class,
-            \Hyde\Console\Commands\HydeMakePageCommand::class,
-            \Hyde\Console\Commands\HydeValidateCommand::class,
+            \Hyde\Console\Commands\PublishHomepageCommand::class,
+            \Hyde\Console\Commands\UpdateConfigsCommand::class,
+            \Hyde\Console\Commands\PublishViewsCommand::class,
+            \Hyde\Console\Commands\RebuildStaticSiteCommand::class,
+            \Hyde\Console\Commands\BuildSiteCommand::class,
+            \Hyde\Console\Commands\BuildSitemapCommand::class,
+            \Hyde\Console\Commands\BuildRssFeedCommand::class,
+            \Hyde\Console\Commands\BuildSearchCommand::class,
+            \Hyde\Console\Commands\RouteListCommand::class,
+            \Hyde\Console\Commands\MakePostCommand::class,
+            \Hyde\Console\Commands\MakePageCommand::class,
+            \Hyde\Console\Commands\ValidateCommand::class,
             // Commands\HydeInstallCommand::class,
-            \Hyde\Console\Commands\HydeDebugCommand::class,
-            \Hyde\Console\Commands\HydeServeCommand::class,
+            \Hyde\Console\Commands\DebugCommand::class,
+            \Hyde\Console\Commands\ServeCommand::class,
 
-            \Hyde\Console\Commands\HydePackageDiscoverCommand::class,
+            \Hyde\Console\Commands\PackageDiscoverCommand::class,
         ]);
     }
 
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index a065fe431d7..c9405d6f2ac 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -20,7 +20,7 @@
  *
  * Handles the build loop which generates the static site.
  *
- * @see \Hyde\Console\Commands\HydeBuildSiteCommand
+ * @see \Hyde\Console\Commands\BuildSiteCommand
  * @see \Hyde\Framework\Testing\Feature\StaticSiteServiceTest
  */
 class BuildService
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
index 92257f1000f..f4056500797 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeBuildRssFeedCommand
+ * @covers \Hyde\Console\Commands\BuildRssFeedCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
  */
 class HydeBuildRssFeedCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
index 4bcc29239f0..c5f698f243b 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
@@ -11,7 +11,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeBuildSearchCommand
+ * @covers \Hyde\Console\Commands\BuildSearchCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  */
 class HydeBuildSearchCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
index 0337a1c967e..0c0e3979693 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeBuildSitemapCommand
+ * @covers \Hyde\Console\Commands\BuildSitemapCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  */
 class HydeBuildSitemapCommandTest extends TestCase
diff --git a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
index 83988067c02..8257939b0d8 100644
--- a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
@@ -10,7 +10,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeMakePageCommand
+ * @covers \Hyde\Console\Commands\MakePageCommand
  */
 class HydeMakePageCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
index d5b83c6b3b3..9a62c45cad3 100644
--- a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
@@ -9,7 +9,7 @@
 use Illuminate\Foundation\PackageManifest;
 
 /**
- * @covers \Hyde\Console\Commands\HydePackageDiscoverCommand
+ * @covers \Hyde\Console\Commands\PackageDiscoverCommand
  */
 class HydePackageDiscoverCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
index 1caf6050c64..ea722fd6623 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydePublishHomepageCommand
+ * @covers \Hyde\Console\Commands\PublishHomepageCommand
  */
 class HydePublishHomepageCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
index e2fbc9cb806..a18a5b13782 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydePublishViewsCommand
+ * @covers \Hyde\Console\Commands\PublishViewsCommand
  */
 class HydePublishViewsCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
index fbbd712ba30..47348c4acf0 100644
--- a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
@@ -8,7 +8,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeRebuildStaticSiteCommand
+ * @covers \Hyde\Console\Commands\RebuildStaticSiteCommand
  */
 class HydeRebuildStaticSiteCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php b/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
index 64337722787..2b6626c20f8 100644
--- a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeRouteListCommand
+ * @covers \Hyde\Console\Commands\RouteListCommand
  */
 class HydeRouteListCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php b/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
index 4d75feb3619..8df7207c635 100644
--- a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeServeCommand
+ * @covers \Hyde\Console\Commands\ServeCommand
  */
 class HydeServeCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
index ac83daa2c86..3b5880a5d75 100644
--- a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Console\Commands\HydeUpdateConfigsCommand
+ * @covers \Hyde\Console\Commands\UpdateConfigsCommand
  */
 class HydeUpdateConfigsCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php b/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
index 0b4e708f08d..2dddca3398f 100644
--- a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Console\Commands\HydeValidateCommand
+ * @covers \Hyde\Console\Commands\ValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
  * @covers \Hyde\Framework\Models\Support\ValidationResult
  *
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index d1178920823..cc17d1c8089 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -22,7 +22,7 @@
 class BuildTaskServiceTest extends TestCase
 {
     /**
-     * @covers \Hyde\Console\Commands\HydeBuildSiteCommand::runPostBuildActions
+     * @covers \Hyde\Console\Commands\BuildSiteCommand::runPostBuildActions
      */
     public function test_build_command_can_run_post_build_tasks()
     {
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 2a5e281f84c..adecf6872d9 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -10,7 +10,7 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Console\Commands\HydeBuildSiteCommand
+ * @covers \Hyde\Console\Commands\BuildSiteCommand
  * @covers \Hyde\Framework\Services\BuildService
  */
 class StaticSiteServiceTest extends TestCase

From f3cedbfebb11673ab34a5d29d8bc8a53967aa2d6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:27:36 +0200
Subject: [PATCH 028/768] Remove "Hyde" prefix for tests which subjects were
 renamed

---
 ...eBuildRssFeedCommandTest.php => BuildRssFeedCommandTest.php} | 2 +-
 ...ydeBuildSearchCommandTest.php => BuildSearchCommandTest.php} | 2 +-
 ...eBuildSitemapCommandTest.php => BuildSitemapCommandTest.php} | 2 +-
 .../{HydeMakePageCommandTest.php => MakePageCommandTest.php}    | 2 +-
 ...geDiscoverCommandTest.php => PackageDiscoverCommandTest.php} | 2 +-
 ...shHomepageCommandTest.php => PublishHomepageCommandTest.php} | 2 +-
 ...ePublishViewsCommandTest.php => PublishViewsCommandTest.php} | 2 +-
 ...aticSiteCommandTest.php => RebuildStaticSiteCommandTest.php} | 2 +-
 .../{HydeRouteListCommandTest.php => RouteListCommandTest.php}  | 2 +-
 .../Commands/{HydeServeCommandTest.php => ServeCommandTest.php} | 2 +-
 ...pdateConfigsCommandTest.php => UpdateConfigsCommandTest.php} | 2 +-
 .../{HydeValidateCommandTest.php => ValidateCommandTest.php}    | 2 +-
 .../framework/tests/Feature/Services/ValidationServiceTest.php  | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
 rename packages/framework/tests/Feature/Commands/{HydeBuildRssFeedCommandTest.php => BuildRssFeedCommandTest.php} (96%)
 rename packages/framework/tests/Feature/Commands/{HydeBuildSearchCommandTest.php => BuildSearchCommandTest.php} (98%)
 rename packages/framework/tests/Feature/Commands/{HydeBuildSitemapCommandTest.php => BuildSitemapCommandTest.php} (93%)
 rename packages/framework/tests/Feature/Commands/{HydeMakePageCommandTest.php => MakePageCommandTest.php} (99%)
 rename packages/framework/tests/Feature/Commands/{HydePackageDiscoverCommandTest.php => PackageDiscoverCommandTest.php} (93%)
 rename packages/framework/tests/Feature/Commands/{HydePublishHomepageCommandTest.php => PublishHomepageCommandTest.php} (98%)
 rename packages/framework/tests/Feature/Commands/{HydePublishViewsCommandTest.php => PublishViewsCommandTest.php} (96%)
 rename packages/framework/tests/Feature/Commands/{HydeRebuildStaticSiteCommandTest.php => RebuildStaticSiteCommandTest.php} (97%)
 rename packages/framework/tests/Feature/Commands/{HydeRouteListCommandTest.php => RouteListCommandTest.php} (95%)
 rename packages/framework/tests/Feature/Commands/{HydeServeCommandTest.php => ServeCommandTest.php} (89%)
 rename packages/framework/tests/Feature/Commands/{HydeUpdateConfigsCommandTest.php => UpdateConfigsCommandTest.php} (96%)
 rename packages/framework/tests/Feature/Commands/{HydeValidateCommandTest.php => ValidateCommandTest.php} (95%)

diff --git a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
similarity index 96%
rename from packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
rename to packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
index f4056500797..19567251b09 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
@@ -11,7 +11,7 @@
  * @covers \Hyde\Console\Commands\BuildRssFeedCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
  */
-class HydeBuildRssFeedCommandTest extends TestCase
+class BuildRssFeedCommandTest extends TestCase
 {
     public function test_rss_feed_is_generated_when_conditions_are_met()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
similarity index 98%
rename from packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
rename to packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index c5f698f243b..1abaa7d33bb 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -14,7 +14,7 @@
  * @covers \Hyde\Console\Commands\BuildSearchCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  */
-class HydeBuildSearchCommandTest extends TestCase
+class BuildSearchCommandTest extends TestCase
 {
     protected function setUp(): void
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
similarity index 93%
rename from packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
rename to packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index 0c0e3979693..c2a85a0625c 100644
--- a/packages/framework/tests/Feature/Commands/HydeBuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -11,7 +11,7 @@
  * @covers \Hyde\Console\Commands\BuildSitemapCommand
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  */
-class HydeBuildSitemapCommandTest extends TestCase
+class BuildSitemapCommandTest extends TestCase
 {
     public function test_sitemap_is_generated_when_conditions_are_met()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php b/packages/framework/tests/Feature/Commands/MakePageCommandTest.php
similarity index 99%
rename from packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
rename to packages/framework/tests/Feature/Commands/MakePageCommandTest.php
index 8257939b0d8..e3cf802eb66 100644
--- a/packages/framework/tests/Feature/Commands/HydeMakePageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/MakePageCommandTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers \Hyde\Console\Commands\MakePageCommand
  */
-class HydeMakePageCommandTest extends TestCase
+class MakePageCommandTest extends TestCase
 {
     protected string $markdownPath;
     protected string $bladePath;
diff --git a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php b/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
similarity index 93%
rename from packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
rename to packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
index 9a62c45cad3..033b43c65d1 100644
--- a/packages/framework/tests/Feature/Commands/HydePackageDiscoverCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/PackageDiscoverCommandTest.php
@@ -11,7 +11,7 @@
 /**
  * @covers \Hyde\Console\Commands\PackageDiscoverCommand
  */
-class HydePackageDiscoverCommandTest extends TestCase
+class PackageDiscoverCommandTest extends TestCase
 {
     public function test_package_discover_command_can_run()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php b/packages/framework/tests/Feature/Commands/PublishHomepageCommandTest.php
similarity index 98%
rename from packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
rename to packages/framework/tests/Feature/Commands/PublishHomepageCommandTest.php
index ea722fd6623..bec3d4763ef 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishHomepageCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/PublishHomepageCommandTest.php
@@ -10,7 +10,7 @@
 /**
  * @covers \Hyde\Console\Commands\PublishHomepageCommand
  */
-class HydePublishHomepageCommandTest extends TestCase
+class PublishHomepageCommandTest extends TestCase
 {
     protected string $file;
 
diff --git a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php b/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php
similarity index 96%
rename from packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
rename to packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php
index a18a5b13782..96d63528b3e 100644
--- a/packages/framework/tests/Feature/Commands/HydePublishViewsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/PublishViewsCommandTest.php
@@ -10,7 +10,7 @@
 /**
  * @covers \Hyde\Console\Commands\PublishViewsCommand
  */
-class HydePublishViewsCommandTest extends TestCase
+class PublishViewsCommandTest extends TestCase
 {
     protected function setUp(): void
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php b/packages/framework/tests/Feature/Commands/RebuildStaticSiteCommandTest.php
similarity index 97%
rename from packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
rename to packages/framework/tests/Feature/Commands/RebuildStaticSiteCommandTest.php
index 47348c4acf0..52fd10467cb 100644
--- a/packages/framework/tests/Feature/Commands/HydeRebuildStaticSiteCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/RebuildStaticSiteCommandTest.php
@@ -10,7 +10,7 @@
 /**
  * @covers \Hyde\Console\Commands\RebuildStaticSiteCommand
  */
-class HydeRebuildStaticSiteCommandTest extends TestCase
+class RebuildStaticSiteCommandTest extends TestCase
 {
     public function test_handle_is_successful_with_valid_path()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php b/packages/framework/tests/Feature/Commands/RouteListCommandTest.php
similarity index 95%
rename from packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
rename to packages/framework/tests/Feature/Commands/RouteListCommandTest.php
index 2b6626c20f8..0fdf675c70e 100644
--- a/packages/framework/tests/Feature/Commands/HydeRouteListCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/RouteListCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\RouteListCommand
  */
-class HydeRouteListCommandTest extends TestCase
+class RouteListCommandTest extends TestCase
 {
     public function testRouteListCommand()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
similarity index 89%
rename from packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
rename to packages/framework/tests/Feature/Commands/ServeCommandTest.php
index 8df7207c635..ca6a10204dd 100644
--- a/packages/framework/tests/Feature/Commands/HydeServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\ServeCommand
  */
-class HydeServeCommandTest extends TestCase
+class ServeCommandTest extends TestCase
 {
     public function test_hyde_serve_command()
     {
diff --git a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php b/packages/framework/tests/Feature/Commands/UpdateConfigsCommandTest.php
similarity index 96%
rename from packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
rename to packages/framework/tests/Feature/Commands/UpdateConfigsCommandTest.php
index 3b5880a5d75..e79e7034f1e 100644
--- a/packages/framework/tests/Feature/Commands/HydeUpdateConfigsCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/UpdateConfigsCommandTest.php
@@ -11,7 +11,7 @@
 /**
  * @covers \Hyde\Console\Commands\UpdateConfigsCommand
  */
-class HydeUpdateConfigsCommandTest extends TestCase
+class UpdateConfigsCommandTest extends TestCase
 {
     /** Setup */
     public function setUp(): void
diff --git a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
similarity index 95%
rename from packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
rename to packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 2dddca3398f..c550c0b56b7 100644
--- a/packages/framework/tests/Feature/Commands/HydeValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -13,7 +13,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
-class HydeValidateCommandTest extends TestCase
+class ValidateCommandTest extends TestCase
 {
     public function test_validate_command_can_run()
     {
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 6fd2a11bb7d..19ea66e166b 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -15,7 +15,7 @@
  * @covers \Hyde\Framework\Services\ValidationService
  * @covers \Hyde\Framework\Models\Support\ValidationResult
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeValidateCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationServiceTest extends TestCase
 {

From c2efd840704f1d3fffb13926c2045de871ff26eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:25:04 +0200
Subject: [PATCH 029/768] Add missing coverage tag

---
 packages/framework/tests/Feature/Commands/DebugCommandTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/DebugCommandTest.php b/packages/framework/tests/Feature/Commands/DebugCommandTest.php
index 5b362ed8915..b6b3be045a2 100644
--- a/packages/framework/tests/Feature/Commands/DebugCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/DebugCommandTest.php
@@ -6,6 +6,9 @@
 
 use Hyde\Testing\TestCase;
 
+/**
+ * @covers \Hyde\Console\Commands\DebugCommand
+ */
 class DebugCommandTest extends TestCase
 {
     public function test_debug_command_can_run()

From 6915a41fd80b3e2444fc73b82f4d2890ee96775d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:28:00 +0200
Subject: [PATCH 030/768] Put test in the proper namespace

---
 .../Feature/{Commands => }/StaticSiteBuilderPostModuleTest.php  | 2 +-
 packages/framework/tests/Unit/MarkdownPostParserTest.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/framework/tests/Feature/{Commands => }/StaticSiteBuilderPostModuleTest.php (98%)

diff --git a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
similarity index 98%
rename from packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php
rename to packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index be5c8086a61..54266a9930e 100644
--- a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Feature\Commands;
+namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Models\Pages\MarkdownPost;
diff --git a/packages/framework/tests/Unit/MarkdownPostParserTest.php b/packages/framework/tests/Unit/MarkdownPostParserTest.php
index 0d5f81c6fc1..3864c1988f8 100644
--- a/packages/framework/tests/Unit/MarkdownPostParserTest.php
+++ b/packages/framework/tests/Unit/MarkdownPostParserTest.php
@@ -11,7 +11,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @see \Hyde\Framework\Testing\Feature\Commands\StaticSiteBuilderPostModuleTest for the compiler test.
+ * @see \Hyde\Framework\Testing\Feature\StaticSiteBuilderPostModuleTest for the compiler test.
  */
 class MarkdownPostParserTest extends TestCase
 {

From e43e631d0cb8fc538d96dfffeb2ea0e190468881 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:29:57 +0200
Subject: [PATCH 031/768] Update test link annotations

---
 packages/framework/src/Console/Commands/BuildRssFeedCommand.php | 2 +-
 packages/framework/src/Console/Commands/BuildSearchCommand.php  | 2 +-
 packages/framework/src/Console/Commands/BuildSitemapCommand.php | 2 +-
 packages/framework/src/Console/Commands/MakePageCommand.php     | 2 +-
 .../framework/src/Console/Commands/PackageDiscoverCommand.php   | 2 +-
 .../framework/src/Console/Commands/PublishHomepageCommand.php   | 2 +-
 .../framework/src/Console/Commands/RebuildStaticSiteCommand.php | 2 +-
 packages/framework/src/Console/Commands/RouteListCommand.php    | 2 +-
 .../framework/src/Console/Commands/UpdateConfigsCommand.php     | 2 +-
 packages/framework/src/Console/Commands/ValidateCommand.php     | 2 +-
 .../framework/src/Framework/Models/Support/ValidationResult.php | 2 +-
 packages/framework/src/Framework/Services/ValidationService.php | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
index 27ec83910ae..f17cd16dbf4 100644
--- a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
+++ b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
@@ -10,7 +10,7 @@
 /**
  * Hyde command to run the build process for the RSS feed.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildRssFeedCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildRssFeedCommandTest
  */
 class BuildRssFeedCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index dda84826691..b15595d4bd3 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -10,7 +10,7 @@
 /**
  * Hyde command to run the build process for the documentation search index.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildSearchCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildSearchCommandTest
  */
 class BuildSearchCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/BuildSitemapCommand.php b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
index e710dd7a2da..9724b11386f 100644
--- a/packages/framework/src/Console/Commands/BuildSitemapCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
@@ -10,7 +10,7 @@
 /**
  * Hyde command to run the build process for the sitemap.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeBuildSitemapCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildSitemapCommandTest
  */
 class BuildSitemapCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/MakePageCommand.php b/packages/framework/src/Console/Commands/MakePageCommand.php
index 97f8e6638bc..df036b5d957 100644
--- a/packages/framework/src/Console/Commands/MakePageCommand.php
+++ b/packages/framework/src/Console/Commands/MakePageCommand.php
@@ -14,7 +14,7 @@
 /**
  * Hyde Command to scaffold a new Markdown or Blade page file.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeMakePageCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\MakePageCommandTest
  */
 class MakePageCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
index aaec2182792..a996e562066 100644
--- a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
+++ b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
@@ -9,7 +9,7 @@
 use Illuminate\Foundation\PackageManifest;
 
 /**
- * @see \Hyde\Framework\Testing\Feature\Commands\HydePackageDiscoverCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\PackageDiscoverCommandTest
  */
 class PackageDiscoverCommand extends BaseCommand
 {
diff --git a/packages/framework/src/Console/Commands/PublishHomepageCommand.php b/packages/framework/src/Console/Commands/PublishHomepageCommand.php
index 20ba9f725c6..9e3d99abf55 100644
--- a/packages/framework/src/Console/Commands/PublishHomepageCommand.php
+++ b/packages/framework/src/Console/Commands/PublishHomepageCommand.php
@@ -13,7 +13,7 @@
 /**
  * Publish one of the default homepages.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydePublishHomepageCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\PublishHomepageCommandTest
  */
 class PublishHomepageCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
index 25dc5b5f77e..8cf2967eff4 100644
--- a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
+++ b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
@@ -14,7 +14,7 @@
 /**
  * Hyde Command to build a single static site file.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeRebuildStaticSiteCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\RebuildStaticSiteCommandTest
  */
 class RebuildStaticSiteCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index 3e244fb9144..a5635dcb815 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -11,7 +11,7 @@
 /**
  * Hyde command to display the list of site routes.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeRouteListCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\RouteListCommandTest
  */
 class RouteListCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/UpdateConfigsCommand.php b/packages/framework/src/Console/Commands/UpdateConfigsCommand.php
index e1957125f35..ba5632aa26d 100644
--- a/packages/framework/src/Console/Commands/UpdateConfigsCommand.php
+++ b/packages/framework/src/Console/Commands/UpdateConfigsCommand.php
@@ -11,7 +11,7 @@
 /**
  * Publish the Hyde Config Files.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeUpdateConfigsCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\UpdateConfigsCommandTest
  */
 class UpdateConfigsCommand extends Command
 {
diff --git a/packages/framework/src/Console/Commands/ValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
index 4ba9168242c..87b1cfaf1e6 100644
--- a/packages/framework/src/Console/Commands/ValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -8,7 +8,7 @@
 use LaravelZero\Framework\Commands\Command;
 
 /**
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeValidateCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidateCommand extends Command
 {
diff --git a/packages/framework/src/Framework/Models/Support/ValidationResult.php b/packages/framework/src/Framework/Models/Support/ValidationResult.php
index 4526a9c8caa..2f06e51c753 100644
--- a/packages/framework/src/Framework/Models/Support/ValidationResult.php
+++ b/packages/framework/src/Framework/Models/Support/ValidationResult.php
@@ -6,7 +6,7 @@
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeValidateCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationResult
 {
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index ce4f7be07a5..065f7544b16 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -10,7 +10,7 @@
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
- * @see \Hyde\Framework\Testing\Feature\Commands\HydeValidateCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationService
 {

From 9bb708ccfc0bc5c69734a5a5638c3439ac974f10 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:34:38 +0200
Subject: [PATCH 032/768] Add todo

---
 .../framework/src/Framework/Concerns/AbstractBuildTask.php    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
index eb2843aa648..2e6e9889866 100644
--- a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
@@ -20,6 +20,10 @@ abstract class AbstractBuildTask implements BuildTaskContract
     protected static string $description = 'Generic build task';
 
     protected float $timeStart;
+
+    /**
+     * @todo Consider setting default value to 0
+     */
     protected ?int $exitCode = null;
 
     public function __construct(?OutputStyle $output = null)

From 41c60f5c0bd3c106ee52c738b8edf7b11bb256fd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:33:10 +0200
Subject: [PATCH 033/768] Add type annotations

---
 .../framework/src/Console/Commands/BuildRssFeedCommand.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
index f17cd16dbf4..c7d905dba55 100644
--- a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
+++ b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
@@ -14,7 +14,10 @@
  */
 class BuildRssFeedCommand extends Command
 {
+    /** @var string */
     protected $signature = 'build:rss';
+
+    /** @var string */
     protected $description = 'Generate the RSS feed';
 
     public function handle(): int

From 2c9894b308fd8c3b479a5ede62749ccfa143efcf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:35:09 +0200
Subject: [PATCH 034/768] Add type annotations

---
 packages/framework/src/Console/Commands/BuildSearchCommand.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index b15595d4bd3..42fcd21344c 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -14,7 +14,10 @@
  */
 class BuildSearchCommand extends Command
 {
+    /** @var string */
     protected $signature = 'build:search';
+
+    /** @var string */
     protected $description = 'Generate the docs/search.json';
 
     public function handle(): int

From 99d0d6ee20a221aca461d2ca7d063d6e71061131 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:36:30 +0200
Subject: [PATCH 035/768] Replace redundant PHPDoc comments with shorter type
 annotations

---
 .../src/Console/Commands/BuildSiteCommand.php        | 12 ++----------
 .../framework/src/Console/Commands/DebugCommand.php  | 12 ++----------
 .../src/Console/Commands/MakePostCommand.php         | 12 ++----------
 .../Console/Commands/RebuildStaticSiteCommand.php    | 12 ++----------
 .../framework/src/Console/Commands/ServeCommand.php  | 12 ++----------
 5 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 46bddc3c593..84df6c718bb 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -23,11 +23,7 @@
  */
 class BuildSiteCommand extends Command
 {
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'build 
         {--run-dev : Run the NPM dev script after build}
         {--run-prod : Run the NPM prod script after build}
@@ -35,11 +31,7 @@ class BuildSiteCommand extends Command
         {--pretty-urls : Should links in output use pretty URLs?}
         {--no-api : Disable API calls, for example, Torchlight}';
 
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Build the static site';
 
     protected BuildService $service;
diff --git a/packages/framework/src/Console/Commands/DebugCommand.php b/packages/framework/src/Console/Commands/DebugCommand.php
index 957db4bb736..1b33738df9d 100644
--- a/packages/framework/src/Console/Commands/DebugCommand.php
+++ b/packages/framework/src/Console/Commands/DebugCommand.php
@@ -13,18 +13,10 @@
  */
 class DebugCommand extends Command
 {
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'debug';
 
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Print debug info';
 
     public function __construct()
diff --git a/packages/framework/src/Console/Commands/MakePostCommand.php b/packages/framework/src/Console/Commands/MakePostCommand.php
index 195805af19b..41bfabf74a3 100644
--- a/packages/framework/src/Console/Commands/MakePostCommand.php
+++ b/packages/framework/src/Console/Commands/MakePostCommand.php
@@ -13,20 +13,12 @@
  */
 class MakePostCommand extends Command
 {
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'make:post
                             {title? : The title for the Post. Will be used to generate the slug}
                             {--force : Should the generated file overwrite existing posts with the same slug?}';
 
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Scaffold a new Markdown blog post file';
 
     /**
diff --git a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
index 8cf2967eff4..8275fba29d2 100644
--- a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
+++ b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
@@ -18,19 +18,11 @@
  */
 class RebuildStaticSiteCommand extends Command
 {
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'rebuild
         {path : The relative file path (example: _posts/hello-world.md)}';
 
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Run the static site builder for a single file';
 
     /**
diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 9541bc2793a..92bc72c18e3 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -12,18 +12,10 @@
  */
 class ServeCommand extends Command
 {
-    /**
-     * The signature of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'serve {--port=8080} {--host=localhost}';
 
-    /**
-     * The description of the command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Start the experimental realtime compiler.';
 
     /**

From b85f54449454a64c88d615d86d07af48e3359ad2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:37:22 +0200
Subject: [PATCH 036/768] Remove redundant PHPDoc comments

---
 .../src/Console/Commands/BuildSiteCommand.php        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 84df6c718bb..df34306762d 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -36,13 +36,6 @@ class BuildSiteCommand extends Command
 
     protected BuildService $service;
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     *
-     * @throws Exception
-     */
     public function handle(): int
     {
         $time_start = microtime(true);
@@ -84,11 +77,6 @@ protected function runPreBuildActions(): void
         }
     }
 
-    /**
-     * Run any post-build actions.
-     *
-     * @return void
-     */
     public function runPostBuildActions(): void
     {
         $service = new BuildTaskService($this->output);

From 1d0573f12576b97da6a066c10c8b1d4b2b5f19cf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:37:55 +0200
Subject: [PATCH 037/768] Protected methods are already internal

---
 packages/framework/src/Console/Commands/BuildSiteCommand.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index df34306762d..298942bb303 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -59,7 +59,6 @@ public function handle(): int
         return 0;
     }
 
-    /** @internal */
     protected function runPreBuildActions(): void
     {
         if ($this->option('no-api')) {
@@ -104,7 +103,6 @@ public function runPostBuildActions(): void
         $service->runPostBuildTasks();
     }
 
-    /** @internal */
     protected function printFinishMessage(float $time_start): void
     {
         $execution_time = (microtime(true) - $time_start);
@@ -121,7 +119,6 @@ protected function printFinishMessage(float $time_start): void
         );
     }
 
-    /* @internal */
     protected function runNodeCommand(string $command, string $message, ?string $actionMessage = null): void
     {
         $this->info($message.' This may take a second.');

From 3b5c46d85ee65616f5e7adbee69922a3d94ace17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:38:47 +0200
Subject: [PATCH 038/768] Remove redundant PHPDoc comments

---
 packages/framework/src/Console/Commands/DebugCommand.php     | 5 -----
 packages/framework/src/Console/Commands/MakePostCommand.php  | 5 -----
 .../src/Console/Commands/RebuildStaticSiteCommand.php        | 5 -----
 packages/framework/src/Console/Commands/ServeCommand.php     | 5 -----
 4 files changed, 20 deletions(-)

diff --git a/packages/framework/src/Console/Commands/DebugCommand.php b/packages/framework/src/Console/Commands/DebugCommand.php
index 1b33738df9d..9e3a1a6aba2 100644
--- a/packages/framework/src/Console/Commands/DebugCommand.php
+++ b/packages/framework/src/Console/Commands/DebugCommand.php
@@ -28,11 +28,6 @@ public function __construct()
         }
     }
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
     public function handle(): int
     {
         $this->info('HydePHP Debug Screen');
diff --git a/packages/framework/src/Console/Commands/MakePostCommand.php b/packages/framework/src/Console/Commands/MakePostCommand.php
index 41bfabf74a3..06d9089188a 100644
--- a/packages/framework/src/Console/Commands/MakePostCommand.php
+++ b/packages/framework/src/Console/Commands/MakePostCommand.php
@@ -21,11 +21,6 @@ class MakePostCommand extends Command
     /** @var string */
     protected $description = 'Scaffold a new Markdown blog post file';
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
     public function handle(): int
     {
         $this->title('Creating a new post!');
diff --git a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
index 8275fba29d2..0c83081893a 100644
--- a/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
+++ b/packages/framework/src/Console/Commands/RebuildStaticSiteCommand.php
@@ -32,11 +32,6 @@ class RebuildStaticSiteCommand extends Command
      */
     public string $path;
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
     public function handle(): int
     {
         $time_start = microtime(true);
diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 92bc72c18e3..03777b7b315 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -18,11 +18,6 @@ class ServeCommand extends Command
     /** @var string */
     protected $description = 'Start the experimental realtime compiler.';
 
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
     public function handle(): int
     {
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');

From 09ecd5e2e3e74bf4b9e6b6309dd472e158a1dfb0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:41:00 +0200
Subject: [PATCH 039/768] Remove unnecessary PHPDoc comments

---
 .../src/Console/Commands/MakePageCommand.php  | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Console/Commands/MakePageCommand.php b/packages/framework/src/Console/Commands/MakePageCommand.php
index df036b5d957..71b3379da33 100644
--- a/packages/framework/src/Console/Commands/MakePageCommand.php
+++ b/packages/framework/src/Console/Commands/MakePageCommand.php
@@ -18,11 +18,7 @@
  */
 class MakePageCommand extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $signature = 'make:page 
 		{title? : The name of the page file to create. Will be used to generate the slug}
 		{--type=markdown : The type of page to create (markdown, blade, or docs)}
@@ -30,11 +26,7 @@ class MakePageCommand extends Command
         {--docs : Create a Documentation page}
 		{--force : Overwrite any existing files}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
+    /** @var string */
     protected $description = 'Scaffold a new Markdown, Blade, or documentation page file';
 
     /**
@@ -57,9 +49,6 @@ class MakePageCommand extends Command
      */
     public bool $force;
 
-    /**
-     * Execute the console command.
-     */
     public function handle(): int
     {
         $this->title('Creating a new page!');
@@ -81,13 +70,6 @@ public function handle(): int
         return 0;
     }
 
-    /**
-     * Validate the options passed to the command.
-     *
-     * @return void
-     *
-     * @throws UnsupportedPageTypeException if the page type is invalid.
-     */
     protected function validateOptions(): void
     {
         $type = $this->getSelectedType();
@@ -112,11 +94,6 @@ protected function validateOptions(): void
         throw new UnsupportedPageTypeException("Invalid page type: $type");
     }
 
-    /**
-     * Get the selected page type.
-     *
-     * @return string
-     */
     protected function getSelectedType(): string
     {
         $type = 'markdown';

From cee0692ce5df10d8cad2edc773f3eb1cd7d1ce54 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:41:35 +0200
Subject: [PATCH 040/768] Add 'void' as the function's return type

---
 .../framework/src/Console/Commands/PackageDiscoverCommand.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
index a996e562066..800373fb217 100644
--- a/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
+++ b/packages/framework/src/Console/Commands/PackageDiscoverCommand.php
@@ -16,7 +16,7 @@ class PackageDiscoverCommand extends BaseCommand
     /** @var true */
     protected $hidden = true;
 
-    public function handle(PackageManifest $manifest)
+    public function handle(PackageManifest $manifest): void
     {
         $manifest->manifestPath = Hyde::path('storage/framework/cache/packages.php');
         parent::handle($manifest);

From b72604d42c82a585a8655ba217b1b17acdd35a42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:42:43 +0200
Subject: [PATCH 041/768] Add type annotations

---
 packages/framework/src/Console/Commands/RouteListCommand.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index a5635dcb815..d11a02bcd26 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -15,7 +15,10 @@
  */
 class RouteListCommand extends Command
 {
+    /** @var string */
     protected $signature = 'route:list';
+
+    /** @var string */
     protected $description = 'Display all registered routes.';
 
     public function handle(): int

From cfdc1d1d5dceae20cd6583ac6f3698764d61086e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 26 Oct 2022 18:43:26 +0000
Subject: [PATCH 042/768] Apply fixes from StyleCI

---
 packages/framework/src/Console/Commands/BuildSiteCommand.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 298942bb303..ab85fcd7e11 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Console\Commands;
 
-use Exception;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;

From d66a5c6a2b44675861236c54343ecf5e45445282 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:46:03 +0200
Subject: [PATCH 043/768] Remove legacy comment

---
 packages/framework/src/Framework/HydeServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 902d378e814..429b7a5a29f 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -121,7 +121,6 @@ protected function registerHydeConsoleCommands(): void
             \Hyde\Console\Commands\MakePostCommand::class,
             \Hyde\Console\Commands\MakePageCommand::class,
             \Hyde\Console\Commands\ValidateCommand::class,
-            // Commands\HydeInstallCommand::class,
             \Hyde\Console\Commands\DebugCommand::class,
             \Hyde\Console\Commands\ServeCommand::class,
 

From cd6da2445787afddb744e34f6899906ac60ade97 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:47:19 +0200
Subject: [PATCH 044/768] Replace qualifier with an import

---
 packages/framework/src/Framework/HydeServiceProvider.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 429b7a5a29f..56b62881977 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework;
 
+use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\RegistersFileLocations;
@@ -133,6 +134,6 @@ protected function registerHydeConsoleCommands(): void
      */
     protected function registerModuleServiceProviders(): void
     {
-        $this->app->register(\Hyde\DataCollections\DataCollectionServiceProvider::class);
+        $this->app->register(DataCollectionServiceProvider::class);
     }
 }

From 0ce1a582ba9cfff025a880cafdb11819f529117b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:47:48 +0200
Subject: [PATCH 045/768] Create HydeConsoleServiceProvider.php

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

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
new file mode 100644
index 00000000000..ee56fff8b29
--- /dev/null
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Hyde\Console;
+
+use Illuminate\Support\ServiceProvider;
+
+class HydeConsoleServiceProvider extends ServiceProvider
+{
+    //
+}

From 4880efa120880f5942beb4d6982c667d17c7689e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:47:56 +0200
Subject: [PATCH 046/768] Declare strict types

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

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index ee56fff8b29..6875e342e20 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Hyde\Console;
 
 use Illuminate\Support\ServiceProvider;

From 3f72517c36f09b0453fb9eeffe9e2e4b1d11aa35 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:49:34 +0200
Subject: [PATCH 047/768] Register the new service provider

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

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 56b62881977..f4670784c7c 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework;
 
+use Hyde\Console\HydeConsoleServiceProvider;
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Actions\MarkdownConverter;
@@ -134,6 +135,7 @@ protected function registerHydeConsoleCommands(): void
      */
     protected function registerModuleServiceProviders(): void
     {
+        $this->app->register(HydeConsoleServiceProvider::class);
         $this->app->register(DataCollectionServiceProvider::class);
     }
 }

From 4f42e655ce10bda031e1eade5d4a5118663e449a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:49:53 +0200
Subject: [PATCH 048/768] Move registerHydeConsoleCommands to the new provider

---
 .../Console/HydeConsoleServiceProvider.php    | 36 ++++++++++++++++++-
 .../src/Framework/HydeServiceProvider.php     | 26 --------------
 2 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index 6875e342e20..23eb683f9f4 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -8,5 +8,39 @@
 
 class HydeConsoleServiceProvider extends ServiceProvider
 {
-    //
+    /**
+     * Register any console services.
+     *
+     * @return void
+     */
+    public function register(): void
+    {
+        $this->registerHydeConsoleCommands();
+    }
+
+    /**
+     * Register the HydeCLI console commands.
+     */
+    protected function registerHydeConsoleCommands(): void
+    {
+        $this->commands([
+            \Hyde\Console\Commands\PublishHomepageCommand::class,
+            \Hyde\Console\Commands\UpdateConfigsCommand::class,
+            \Hyde\Console\Commands\PublishViewsCommand::class,
+            \Hyde\Console\Commands\RebuildStaticSiteCommand::class,
+            \Hyde\Console\Commands\BuildSiteCommand::class,
+            \Hyde\Console\Commands\BuildSitemapCommand::class,
+            \Hyde\Console\Commands\BuildRssFeedCommand::class,
+            \Hyde\Console\Commands\BuildSearchCommand::class,
+            \Hyde\Console\Commands\RouteListCommand::class,
+            \Hyde\Console\Commands\MakePostCommand::class,
+            \Hyde\Console\Commands\MakePageCommand::class,
+            \Hyde\Console\Commands\ValidateCommand::class,
+            \Hyde\Console\Commands\DebugCommand::class,
+            \Hyde\Console\Commands\ServeCommand::class,
+
+            \Hyde\Console\Commands\PackageDiscoverCommand::class,
+        ]);
+    }
+
 }
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index f4670784c7c..bdfa4394be8 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -60,7 +60,6 @@ public function register(): void
 
         $this->discoverBladeViewsIn(BladePage::sourceDirectory());
 
-        $this->registerHydeConsoleCommands();
         $this->registerModuleServiceProviders();
     }
 
@@ -105,31 +104,6 @@ protected function initializeConfiguration()
         }
     }
 
-    /**
-     * Register the HydeCLI console commands.
-     */
-    protected function registerHydeConsoleCommands(): void
-    {
-        $this->commands([
-            \Hyde\Console\Commands\PublishHomepageCommand::class,
-            \Hyde\Console\Commands\UpdateConfigsCommand::class,
-            \Hyde\Console\Commands\PublishViewsCommand::class,
-            \Hyde\Console\Commands\RebuildStaticSiteCommand::class,
-            \Hyde\Console\Commands\BuildSiteCommand::class,
-            \Hyde\Console\Commands\BuildSitemapCommand::class,
-            \Hyde\Console\Commands\BuildRssFeedCommand::class,
-            \Hyde\Console\Commands\BuildSearchCommand::class,
-            \Hyde\Console\Commands\RouteListCommand::class,
-            \Hyde\Console\Commands\MakePostCommand::class,
-            \Hyde\Console\Commands\MakePageCommand::class,
-            \Hyde\Console\Commands\ValidateCommand::class,
-            \Hyde\Console\Commands\DebugCommand::class,
-            \Hyde\Console\Commands\ServeCommand::class,
-
-            \Hyde\Console\Commands\PackageDiscoverCommand::class,
-        ]);
-    }
-
     /**
      * Register module service providers.
      */

From da7c6a16d06aea1448f3cf0760a366f12aee091d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:50:39 +0200
Subject: [PATCH 049/768] Import the namespace group

---
 .../Console/HydeConsoleServiceProvider.php    | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index 23eb683f9f4..b3fc9f6292c 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -5,6 +5,7 @@
 namespace Hyde\Console;
 
 use Illuminate\Support\ServiceProvider;
+use Hyde\Console\Commands;
 
 class HydeConsoleServiceProvider extends ServiceProvider
 {
@@ -24,22 +25,22 @@ public function register(): void
     protected function registerHydeConsoleCommands(): void
     {
         $this->commands([
-            \Hyde\Console\Commands\PublishHomepageCommand::class,
-            \Hyde\Console\Commands\UpdateConfigsCommand::class,
-            \Hyde\Console\Commands\PublishViewsCommand::class,
-            \Hyde\Console\Commands\RebuildStaticSiteCommand::class,
-            \Hyde\Console\Commands\BuildSiteCommand::class,
-            \Hyde\Console\Commands\BuildSitemapCommand::class,
-            \Hyde\Console\Commands\BuildRssFeedCommand::class,
-            \Hyde\Console\Commands\BuildSearchCommand::class,
-            \Hyde\Console\Commands\RouteListCommand::class,
-            \Hyde\Console\Commands\MakePostCommand::class,
-            \Hyde\Console\Commands\MakePageCommand::class,
-            \Hyde\Console\Commands\ValidateCommand::class,
-            \Hyde\Console\Commands\DebugCommand::class,
-            \Hyde\Console\Commands\ServeCommand::class,
+            Commands\PublishHomepageCommand::class,
+            Commands\UpdateConfigsCommand::class,
+            Commands\PublishViewsCommand::class,
+            Commands\RebuildStaticSiteCommand::class,
+            Commands\BuildSiteCommand::class,
+            Commands\BuildSitemapCommand::class,
+            Commands\BuildRssFeedCommand::class,
+            Commands\BuildSearchCommand::class,
+            Commands\RouteListCommand::class,
+            Commands\MakePostCommand::class,
+            Commands\MakePageCommand::class,
+            Commands\ValidateCommand::class,
+            Commands\DebugCommand::class,
+            Commands\ServeCommand::class,
 
-            \Hyde\Console\Commands\PackageDiscoverCommand::class,
+            Commands\PackageDiscoverCommand::class,
         ]);
     }
 

From 3bca1500fa92fb5197da01c808f709d4fccb3efc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:50:50 +0200
Subject: [PATCH 050/768] Remove unnecessary use statement

---
 packages/framework/src/Console/HydeConsoleServiceProvider.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index b3fc9f6292c..dde3df53aa2 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -5,7 +5,6 @@
 namespace Hyde\Console;
 
 use Illuminate\Support\ServiceProvider;
-use Hyde\Console\Commands;
 
 class HydeConsoleServiceProvider extends ServiceProvider
 {

From cafb8599c7b777a9e6fb2af237aeb4e136bdb7ec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:51:07 +0200
Subject: [PATCH 051/768] Remove unnecessary PHPDoc

---
 packages/framework/src/Console/HydeConsoleServiceProvider.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index dde3df53aa2..f6260bce93b 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -10,8 +10,6 @@ class HydeConsoleServiceProvider extends ServiceProvider
 {
     /**
      * Register any console services.
-     *
-     * @return void
      */
     public function register(): void
     {

From 363d9535c94a99373b92c3a8ab26a8b77f180041 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:51:20 +0200
Subject: [PATCH 052/768] Add class PHPDoc

---
 packages/framework/src/Console/HydeConsoleServiceProvider.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index f6260bce93b..a688c078534 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -6,6 +6,9 @@
 
 use Illuminate\Support\ServiceProvider;
 
+/**
+ * Register the HydeCLI console commands.
+ */
 class HydeConsoleServiceProvider extends ServiceProvider
 {
     /**

From 5e941268a3c0d1ad59b6106fef1977fb44040313 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:51:47 +0200
Subject: [PATCH 053/768] Inline helper method

---
 .../framework/src/Console/HydeConsoleServiceProvider.php  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index a688c078534..e0775c8d93f 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -15,14 +15,6 @@ class HydeConsoleServiceProvider extends ServiceProvider
      * Register any console services.
      */
     public function register(): void
-    {
-        $this->registerHydeConsoleCommands();
-    }
-
-    /**
-     * Register the HydeCLI console commands.
-     */
-    protected function registerHydeConsoleCommands(): void
     {
         $this->commands([
             Commands\PublishHomepageCommand::class,

From 1362e6f5b33e5c4871fc931710048e86612fba74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 20:54:19 +0200
Subject: [PATCH 054/768] Attempt some kind of sorting/grouping in register
 method

---
 .../Console/HydeConsoleServiceProvider.php    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Console/HydeConsoleServiceProvider.php b/packages/framework/src/Console/HydeConsoleServiceProvider.php
index e0775c8d93f..8099e7526c7 100644
--- a/packages/framework/src/Console/HydeConsoleServiceProvider.php
+++ b/packages/framework/src/Console/HydeConsoleServiceProvider.php
@@ -17,23 +17,24 @@ class HydeConsoleServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->commands([
-            Commands\PublishHomepageCommand::class,
-            Commands\UpdateConfigsCommand::class,
-            Commands\PublishViewsCommand::class,
-            Commands\RebuildStaticSiteCommand::class,
-            Commands\BuildSiteCommand::class,
-            Commands\BuildSitemapCommand::class,
             Commands\BuildRssFeedCommand::class,
             Commands\BuildSearchCommand::class,
-            Commands\RouteListCommand::class,
-            Commands\MakePostCommand::class,
+            Commands\BuildSiteCommand::class,
+            Commands\BuildSitemapCommand::class,
+            Commands\RebuildStaticSiteCommand::class,
+
             Commands\MakePageCommand::class,
-            Commands\ValidateCommand::class,
-            Commands\DebugCommand::class,
-            Commands\ServeCommand::class,
+            Commands\MakePostCommand::class,
 
+            Commands\PublishHomepageCommand::class,
+            Commands\PublishViewsCommand::class,
+            Commands\UpdateConfigsCommand::class,
             Commands\PackageDiscoverCommand::class,
+
+            Commands\RouteListCommand::class,
+            Commands\ValidateCommand::class,
+            Commands\ServeCommand::class,
+            Commands\DebugCommand::class,
         ]);
     }
-
 }

From 0f2763fc522ce2d87a92ed92267e9f27df779b43 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 21:00:09 +0200
Subject: [PATCH 055/768] Replace qualifier with an import

---
 .../src/DataCollections/DataCollectionServiceProvider.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
index 1c60c6da21d..025fedf2be1 100644
--- a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\DataCollections;
 
+use Hyde\DataCollections\Facades\MarkdownCollection;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Foundation\AliasLoader;
@@ -19,7 +20,7 @@ public function register()
         // Register the class alias
         AliasLoader::getInstance()->alias(
             'MarkdownCollection',
-            \Hyde\DataCollections\Facades\MarkdownCollection::class
+            MarkdownCollection::class
         );
     }
 

From a219183b552a6d716877feafcb7b2bf30276f8fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 21:56:16 +0200
Subject: [PATCH 056/768] Move Author model to Blogging\Models namespace

---
 config/hyde.php                                               | 2 +-
 packages/framework/config/hyde.php                            | 2 +-
 .../{Framework/Models/Support => Blogging/Models}/Author.php  | 2 +-
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 2 +-
 .../framework/src/Framework/Models/Pages/MarkdownPost.php     | 2 +-
 .../framework/tests/Feature/AuthorPostsIntegrationTest.php    | 2 +-
 packages/framework/tests/Feature/AuthorTest.php               | 4 ++--
 packages/framework/tests/Feature/MarkdownPostTest.php         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/framework/src/{Framework/Models/Support => Blogging/Models}/Author.php (98%)

diff --git a/config/hyde.php b/config/hyde.php
index 2bcf6cd9fff..8336a1cdfb4 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Models\Support\Author;
 
 return [
     /*
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 2bcf6cd9fff..8336a1cdfb4 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Models\Support\Author;
 
 return [
     /*
diff --git a/packages/framework/src/Framework/Models/Support/Author.php b/packages/framework/src/Blogging/Models/Author.php
similarity index 98%
rename from packages/framework/src/Framework/Models/Support/Author.php
rename to packages/framework/src/Blogging/Models/Author.php
index 1ebd3bb9b17..7d241848d46 100644
--- a/packages/framework/src/Framework/Models/Support/Author.php
+++ b/packages/framework/src/Blogging/Models/Author.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Blogging\Models;
 
 use Illuminate\Support\Collection;
 use Stringable;
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index e948d04fad0..76e6ac2954d 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Framework\Models\Pages\MarkdownPost;
-use Hyde\Framework\Models\Support\Author;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Framework\Models\Support\Image;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
index 50262032ec3..313451d1cfc 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
+++ b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Models\Pages;
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Models\Support\Author;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Framework\Models\Support\Image;
 
diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index 2bc63aa2146..2dd16814546 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
-use Hyde\Framework\Models\Support\Author;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
diff --git a/packages/framework/tests/Feature/AuthorTest.php b/packages/framework/tests/Feature/AuthorTest.php
index 76aca6e9361..411b93623cb 100644
--- a/packages/framework/tests/Feature/AuthorTest.php
+++ b/packages/framework/tests/Feature/AuthorTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Author;
+use Hyde\Blogging\Models\Author;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Framework\Models\Support\Author
+ * @covers \Hyde\Blogging\Models\Author
  */
 class AuthorTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 14e030e8e2e..cc208c23f21 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Pages\MarkdownPost;
-use Hyde\Framework\Models\Support\Author;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Framework\Models\Support\Image;
 use Hyde\Testing\TestCase;

From 4e1bcc4750a0ec0a65c7ad6774c38b607acc0c80 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 21:56:58 +0200
Subject: [PATCH 057/768] Move Image model to Blogging\Models namespace

---
 .../{Framework/Models/Support => Blogging/Models}/Image.php   | 2 +-
 .../Actions/Constructors/FindsContentLengthForImageObject.php | 2 +-
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 2 +-
 .../Contracts/FrontMatter/Support/FeaturedImageSchema.php     | 2 +-
 .../framework/src/Framework/Models/Pages/MarkdownPost.php     | 2 +-
 .../tests/Feature/FindsContentLengthForImageObjectTest.php    | 4 ++--
 packages/framework/tests/Feature/ImageModelTest.php           | 4 ++--
 packages/framework/tests/Feature/MarkdownPostTest.php         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename packages/framework/src/{Framework/Models/Support => Blogging/Models}/Image.php (99%)

diff --git a/packages/framework/src/Framework/Models/Support/Image.php b/packages/framework/src/Blogging/Models/Image.php
similarity index 99%
rename from packages/framework/src/Framework/Models/Support/Image.php
rename to packages/framework/src/Blogging/Models/Image.php
index e0aff73cfc8..b9135d19cdd 100644
--- a/packages/framework/src/Framework/Models/Support/Image.php
+++ b/packages/framework/src/Blogging/Models/Image.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Blogging\Models;
 
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
index 218121bbca7..a2dbcbd40af 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Framework\Models\Support\Image;
+use Hyde\Blogging\Models\Image;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 76e6ac2954d..e78a74398e0 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Concerns\Internal;
 
 use Hyde\Blogging\Models\Author;
+use Hyde\Blogging\Models\Image;
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\DateString;
-use Hyde\Framework\Models\Support\Image;
 use Hyde\Hyde;
 
 trait ConstructsPageSchemas
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
index a3bbfb61edd..74383567db5 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts\FrontMatter\Support;
 
 /**
- * @see \Hyde\Framework\Models\Support\Image
+ * @see \Hyde\Blogging\Models\Image
  * @see \Hyde\Framework\Models\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
index 313451d1cfc..195b07f95d1 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
+++ b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Models\Pages;
 
 use Hyde\Blogging\Models\Author;
+use Hyde\Blogging\Models\Image;
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Framework\Models\Support\DateString;
-use Hyde\Framework\Models\Support\Image;
 
 /**
  * Page class for Markdown posts.
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index 533dbcf4069..8afd87eb488 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Image;
+use Hyde\Blogging\Models\Image;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
 
@@ -16,7 +16,7 @@ class FindsContentLengthForImageObjectTest extends TestCase
     /**
      * Unit test for the shorthand. Logic is tested in the rest of the case.
      *
-     * @covers \Hyde\Framework\Models\Support\Image::getContentLength
+     * @covers \Hyde\Blogging\Models\Image::getContentLength
      */
     public function test_image_helper_shorthand_returns_content_length()
     {
diff --git a/packages/framework/tests/Feature/ImageModelTest.php b/packages/framework/tests/Feature/ImageModelTest.php
index 0b030e700ba..87c92d9e273 100644
--- a/packages/framework/tests/Feature/ImageModelTest.php
+++ b/packages/framework/tests/Feature/ImageModelTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Image;
+use Hyde\Blogging\Models\Image;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Support\Image
+ * @covers \Hyde\Blogging\Models\Image
  */
 class ImageModelTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index cc208c23f21..a5fbdb3160d 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Blogging\Models\Author;
+use Hyde\Blogging\Models\Image;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\DateString;
-use Hyde\Framework\Models\Support\Image;
 use Hyde\Testing\TestCase;
 
 /**

From 369b2491fb8d177930a4ce5f2c078b07e81a1579 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 21:59:27 +0200
Subject: [PATCH 058/768] Rename Image to FeaturedImage since that's all it's
 used for

---
 .../Models/{Image.php => FeaturedImage.php}   |  2 +-
 .../FindsContentLengthForImageObject.php      |  6 +-
 .../Internal/ConstructsPageSchemas.php        |  6 +-
 .../Support/FeaturedImageSchema.php           |  2 +-
 .../Framework/Models/Pages/MarkdownPost.php   |  4 +-
 .../FindsContentLengthForImageObjectTest.php  | 14 +--
 .../tests/Feature/ImageModelTest.php          | 94 +++++++++----------
 .../tests/Feature/MarkdownPostTest.php        | 12 +--
 8 files changed, 70 insertions(+), 70 deletions(-)
 rename packages/framework/src/Blogging/Models/{Image.php => FeaturedImage.php} (99%)

diff --git a/packages/framework/src/Blogging/Models/Image.php b/packages/framework/src/Blogging/Models/FeaturedImage.php
similarity index 99%
rename from packages/framework/src/Blogging/Models/Image.php
rename to packages/framework/src/Blogging/Models/FeaturedImage.php
index b9135d19cdd..41ff94bc017 100644
--- a/packages/framework/src/Blogging/Models/Image.php
+++ b/packages/framework/src/Blogging/Models/FeaturedImage.php
@@ -28,7 +28,7 @@
  * @see \Hyde\Framework\Testing\Feature\ImageModelTest
  * @phpstan-consistent-constructor
  */
-class Image implements FeaturedImageSchema, Stringable
+class FeaturedImage implements FeaturedImageSchema, Stringable
 {
     /**
      * The image's path (if it is stored locally (in the _media directory)).
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
index a2dbcbd40af..5315b555b98 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -15,14 +15,14 @@
  */
 class FindsContentLengthForImageObject
 {
-    protected Image $image;
+    protected FeaturedImage $image;
 
     /**
      * Testing adding console debug output.
      */
     protected OutputInterface $output;
 
-    public function __construct(Image $image)
+    public function __construct(FeaturedImage $image)
     {
         $this->image = $image;
 
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index e78a74398e0..534451d564b 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Concerns\Internal;
 
 use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
@@ -73,10 +73,10 @@ protected function getAuthor(): ?Author
         return null;
     }
 
-    protected function getImage(): ?Image
+    protected function getImage(): ?FeaturedImage
     {
         if ($this->matter('image')) {
-            return Image::make($this->matter('image'));
+            return FeaturedImage::make($this->matter('image'));
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
index 74383567db5..28ac94ff3d4 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts\FrontMatter\Support;
 
 /**
- * @see \Hyde\Blogging\Models\Image
+ * @see \Hyde\Blogging\Models\FeaturedImage
  * @see \Hyde\Framework\Models\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
index 195b07f95d1..dc44b00948c 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
+++ b/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Models\Pages;
 
 use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
@@ -30,7 +30,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?string $category = null;
     public ?DateString $date = null;
     public ?Author $author = null;
-    public ?Image $image = null;
+    public ?FeaturedImage $image = null;
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Framework\Models\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index 8afd87eb488..713e010fc77 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
 
@@ -16,18 +16,18 @@ class FindsContentLengthForImageObjectTest extends TestCase
     /**
      * Unit test for the shorthand. Logic is tested in the rest of the case.
      *
-     * @covers \Hyde\Blogging\Models\Image::getContentLength
+     * @covers \Hyde\Blogging\Models\FeaturedImage::getContentLength
      */
     public function test_image_helper_shorthand_returns_content_length()
     {
         $this->assertIsInt(
-            (new Image(['path' => 'foo']))->getContentLength()
+            (new FeaturedImage(['path' => 'foo']))->getContentLength()
         );
     }
 
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->path = '_media/image.jpg';
         file_put_contents($image->path, '16bytelongstring');
 
@@ -46,7 +46,7 @@ public function test_it_can_find_the_content_length_for_a_remote_image()
             ]);
         });
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->url = 'https://hyde.test/static/image.png';
 
         $this->assertEquals(
@@ -56,7 +56,7 @@ public function test_it_can_find_the_content_length_for_a_remote_image()
 
     public function test_it_returns_0_if_local_image_is_missing()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->path = '_media/image.jpg';
 
         $this->assertEquals(
@@ -70,7 +70,7 @@ public function test_it_returns_0_if_remote_image_is_missing()
             return Http::response(null, 404);
         });
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->url = 'https://hyde.test/static/image.png';
 
         $this->assertEquals(
diff --git a/packages/framework/tests/Feature/ImageModelTest.php b/packages/framework/tests/Feature/ImageModelTest.php
index 87c92d9e273..d38c59f0dc0 100644
--- a/packages/framework/tests/Feature/ImageModelTest.php
+++ b/packages/framework/tests/Feature/ImageModelTest.php
@@ -4,46 +4,46 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Blogging\Models\Image
+ * @covers \Hyde\Blogging\Models\FeaturedImage
  */
 class ImageModelTest extends TestCase
 {
     public function test_can_construct_new_image()
     {
-        $image = new Image();
-        $this->assertInstanceOf(Image::class, $image);
+        $image = new FeaturedImage();
+        $this->assertInstanceOf(FeaturedImage::class, $image);
     }
 
     public function test_make_can_create_an_image_based_on_string()
     {
-        $image = Image::make('foo');
-        $this->assertInstanceOf(Image::class, $image);
+        $image = FeaturedImage::make('foo');
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo', $image->path);
     }
 
     public function test_make_can_create_an_image_based_on_array()
     {
-        $image = Image::make([
+        $image = FeaturedImage::make([
             'path' => 'foo',
             'title' => 'bar',
         ]);
-        $this->assertInstanceOf(Image::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()
     {
-        $image = Image::fromSource('https://example.com/image.jpg');
-        $this->assertInstanceOf(Image::class, $image);
+        $image = FeaturedImage::fromSource('https://example.com/image.jpg');
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('https://example.com/image.jpg', $image->url);
 
-        $image = Image::fromSource('image.jpg');
-        $this->assertInstanceOf(Image::class, $image);
+        $image = FeaturedImage::fromSource('image.jpg');
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('image.jpg', $image->path);
     }
 
@@ -53,10 +53,10 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
             'path' => 'image.jpg',
             'url' => 'https://example.com/image.jpg',
             'description' => 'This is an image',
-            'title' => 'Image Title',
+            'title' => 'FeaturedImage Title',
         ];
 
-        $image = new Image($data);
+        $image = new FeaturedImage($data);
 
         $this->assertEquals($data['path'], $image->path);
         $this->assertEquals($data['url'], $image->url);
@@ -66,7 +66,7 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
 
     public function test_get_source_method_returns_url_when_both_url_and_path_is_set()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->url = 'https://example.com/image.jpg';
         $image->path = 'image.jpg';
 
@@ -75,7 +75,7 @@ public function test_get_source_method_returns_url_when_both_url_and_path_is_set
 
     public function test_get_source_method_returns_path_when_only_path_is_set()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->path = 'image.jpg';
 
         $this->assertEquals('image.jpg', $image->getSource());
@@ -83,29 +83,29 @@ public function test_get_source_method_returns_path_when_only_path_is_set()
 
     public function test_get_source_method_throws_exception_when_no_source_is_set()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
 
-        $this->expectExceptionMessage('Attempting to get source from Image that has no source.');
+        $this->expectExceptionMessage('Attempting to get source from FeaturedImage that has no source.');
         $image->getSource();
     }
 
     public function test_get_source_method_does_not_throw_exception_when_path_is_set()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->path = 'image.jpg';
         $this->assertEquals('image.jpg', $image->getSource());
     }
 
     public function test_get_source_method_does_not_throw_exception_when_url_is_set()
     {
-        $image = new Image();
+        $image = new FeaturedImage();
         $image->url = 'https://example.com/image.jpg';
         $this->assertEquals('https://example.com/image.jpg', $image->getSource());
     }
 
     public function test_get_image_author_attribution_string_method()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
             'credit' => 'https://example.com/',
         ]);
@@ -116,68 +116,68 @@ public function test_get_image_author_attribution_string_method()
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
         $this->assertStringContainsString('<a href="https://example.com/"', $string);
 
-        $image = new Image(['author' => 'John Doe']);
+        $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $image->getImageAuthorAttributionString();
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $this->assertNull($image->getImageAuthorAttributionString());
     }
 
     public function test_get_copyright_string()
     {
-        $image = new Image(['copyright' => 'foo']);
+        $image = new FeaturedImage(['copyright' => 'foo']);
         $this->assertEquals('<span itemprop="copyrightNotice">foo</span>', $image->getCopyrightString());
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $this->assertNull($image->getCopyrightString());
     }
 
     public function test_get_license_string()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'license' => 'foo',
             'licenseUrl' => 'https://example.com/bar.html',
         ]);
         $this->assertEquals('<a href="https://example.com/bar.html" rel="license nofollow noopener" '.
                 'itemprop="license">foo</a>', $image->getLicenseString());
 
-        $image = new Image(['license' => 'foo']);
+        $image = new FeaturedImage(['license' => 'foo']);
         $this->assertEquals('<span itemprop="license">foo</span>', $image->getLicenseString());
 
-        $image = new Image(['licenseUrl' => 'https://example.com/bar.html']);
+        $image = new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']);
         $this->assertNull($image->getLicenseString());
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $this->assertNull($image->getLicenseString());
     }
 
     public function test_get_fluent_attribution_method()
     {
-        $image = new Image(['author' => 'John Doe']);
+        $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $image->getFluentAttribution();
 
-        $this->assertStringContainsString('Image by ', $string);
+        $this->assertStringContainsString('FeaturedImage by ', $string);
 
-        $image = new Image(['copyright' => 'foo']);
+        $image = new FeaturedImage(['copyright' => 'foo']);
         $string = $image->getFluentAttribution();
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
 
-        $image = new Image(['license' => 'foo']);
+        $image = new FeaturedImage(['license' => 'foo']);
 
         $string = $image->getFluentAttribution();
         $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
 
-        $image = new Image();
+        $image = new FeaturedImage();
         $this->assertEquals('', $image->getFluentAttribution());
     }
 
     public function test_get_metadata_array()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'description' => 'foo',
             'title' => 'bar',
             'path' => 'image.jpg',
@@ -193,7 +193,7 @@ public function test_get_metadata_array()
 
     public function test_get_metadata_array_with_remote_url()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'url' => 'https://foo/bar',
         ]);
 
@@ -205,7 +205,7 @@ public function test_get_metadata_array_with_remote_url()
 
     public function test_get_metadata_array_with_local_path()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'path' => 'foo.png',
         ]);
 
@@ -218,7 +218,7 @@ public function test_get_metadata_array_with_local_path()
     public function test_get_metadata_array_with_local_path_when_on_nested_page()
     {
         $this->mockCurrentPage('foo/bar');
-        $image = new Image([
+        $image = new FeaturedImage([
             'path' => 'foo.png',
         ]);
 
@@ -230,7 +230,7 @@ public function test_get_metadata_array_with_local_path_when_on_nested_page()
 
     public function test_get_link_resolves_remote_paths()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'url' => 'https://example.com/image.jpg',
         ]);
 
@@ -239,7 +239,7 @@ public function test_get_link_resolves_remote_paths()
 
     public function test_get_link_resolves_local_paths()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'path' => 'image.jpg',
         ]);
 
@@ -248,7 +248,7 @@ public function test_get_link_resolves_local_paths()
 
     public function test_get_link_resolves_local_paths_when_on_nested_page()
     {
-        $image = new Image([
+        $image = new FeaturedImage([
             'path' => 'image.jpg',
         ]);
 
@@ -258,26 +258,26 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()
 
     public function test_local_path_is_normalized_to_the_media_directory()
     {
-        $this->assertEquals('image.jpg', (new Image([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => 'image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new Image([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => '_media/image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new Image([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => 'media/image.jpg',
         ]))->path);
     }
 
     public function test_to_string_returns_the_image_source()
     {
-        $this->assertEquals('https://example.com/image.jpg', (string) (new Image([
+        $this->assertEquals('https://example.com/image.jpg', (string) (new FeaturedImage([
             'url' => 'https://example.com/image.jpg',
         ])));
 
-        $this->assertEquals('media/image.jpg', (string) (new Image([
+        $this->assertEquals('media/image.jpg', (string) (new FeaturedImage([
             'path' => 'image.jpg',
         ])));
     }
@@ -285,7 +285,7 @@ public function test_to_string_returns_the_image_source()
     public function test_to_string_returns_the_image_source_for_nested_pages()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->assertEquals('../media/image.jpg', (string) (new Image([
+        $this->assertEquals('../media/image.jpg', (string) (new FeaturedImage([
             'path' => 'image.jpg',
         ])));
     }
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index a5fbdb3160d..18324092eeb 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\Image;
+use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\DateString;
@@ -51,7 +51,7 @@ public function test_constructor_can_create_a_new_image_instance_from_a_string()
             'image' => 'https://example.com/image.jpg',
         ]));
 
-        $this->assertInstanceOf(Image::class, $post->image);
+        $this->assertInstanceOf(FeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -63,7 +63,7 @@ public function test_constructor_can_create_a_new_image_instance_from_an_array()
             ],
         ]));
 
-        $this->assertInstanceOf(Image::class, $post->image);
+        $this->assertInstanceOf(FeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -87,7 +87,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(Image::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
     }
 
@@ -95,7 +95,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(Image::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('https://example.com/foo.png', $image->url);
     }
 
@@ -103,7 +103,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
-        $this->assertInstanceOf(Image::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
         $this->assertEquals('bar', $image->title);
     }

From 069404fd39a6df3e59602464feec160308d44a4c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:01:54 +0200
Subject: [PATCH 059/768] Update ImageModelTest.php

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

diff --git a/packages/framework/tests/Feature/ImageModelTest.php b/packages/framework/tests/Feature/ImageModelTest.php
index d38c59f0dc0..adf0b08d114 100644
--- a/packages/framework/tests/Feature/ImageModelTest.php
+++ b/packages/framework/tests/Feature/ImageModelTest.php
@@ -85,7 +85,7 @@ public function test_get_source_method_throws_exception_when_no_source_is_set()
     {
         $image = new FeaturedImage();
 
-        $this->expectExceptionMessage('Attempting to get source from FeaturedImage that has no source.');
+        $this->expectExceptionMessage('Attempting to get source from Image that has no source.');
         $image->getSource();
     }
 
@@ -159,7 +159,7 @@ public function test_get_fluent_attribution_method()
         $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $image->getFluentAttribution();
 
-        $this->assertStringContainsString('FeaturedImage by ', $string);
+        $this->assertStringContainsString('Image by ', $string);
 
         $image = new FeaturedImage(['copyright' => 'foo']);
         $string = $image->getFluentAttribution();

From a443eb61c76953eb6b51d8e73e504a6cc56ab64b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:06:58 +0200
Subject: [PATCH 060/768] Move navigation models to new Navigation namespace

---
 .../resources/views/components/docs/sidebar.blade.php       | 2 +-
 .../framework/resources/views/layouts/navigation.blade.php  | 2 +-
 .../Actions/Constructors/FindsNavigationDataForPage.php     | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php      | 2 +-
 .../Contracts/FrontMatter/Support/NavigationSchema.php      | 2 +-
 .../Models => }/Navigation/DocumentationSidebar.php         | 2 +-
 .../src/{Framework/Models => }/Navigation/NavItem.php       | 2 +-
 .../{Framework/Models => }/Navigation/NavigationData.php    | 2 +-
 .../{Framework/Models => }/Navigation/NavigationMenu.php    | 2 +-
 packages/framework/tests/Feature/NavigationDataTest.php     | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php     | 6 +++---
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 packages/framework/tests/Unit/NavItemTest.php               | 4 ++--
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php  | 2 +-
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 +-
 15 files changed, 21 insertions(+), 21 deletions(-)
 rename packages/framework/src/{Framework/Models => }/Navigation/DocumentationSidebar.php (97%)
 rename packages/framework/src/{Framework/Models => }/Navigation/NavItem.php (98%)
 rename packages/framework/src/{Framework/Models => }/Navigation/NavigationData.php (97%)
 rename packages/framework/src/{Framework/Models => }/Navigation/NavigationMenu.php (97%)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 3ce61288b01..76cc33e872e 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -6,7 +6,7 @@ class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30
     <nav id="sidebar-navigation"
          class="p-4 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-[calc(100vh_-_8rem)]">
         @php
-            $sidebar = \Hyde\Framework\Models\Navigation\DocumentationSidebar::create();
+            $sidebar = \Hyde\Navigation\DocumentationSidebar::create();
         @endphp
 
         @if($sidebar->hasGroups())
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 0c46fd929e7..06409a90ca7 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\Models\Navigation\NavigationMenu::create();
+    $navigation = \Hyde\Navigation\NavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation"
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index cd0cfd8eed8..3b55b26570e 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Framework\Models\Navigation\NavigationData;
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Navigation\NavigationData;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 8d4ebae0894..bb5692fc357 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -10,11 +10,11 @@
 use Hyde\Framework\Contracts\CompilableContract;
 use Hyde\Framework\Contracts\FrontMatter\PageSchema;
 use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Navigation\NavigationData;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Metadata\PageMetadataBag;
+use Hyde\Navigation\NavigationData;
 use Illuminate\Support\Arr;
 
 /**
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
index 56a4abbe5d3..e8843d892df 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts\FrontMatter\Support;
 
 /**
- * @see \Hyde\Framework\Models\Navigation\NavigationData
+ * @see \Hyde\Navigation\NavigationData
  * @see \Hyde\Framework\Concerns\HydePage
  */
 interface NavigationSchema
diff --git a/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php b/packages/framework/src/Navigation/DocumentationSidebar.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
rename to packages/framework/src/Navigation/DocumentationSidebar.php
index a811c6be301..ea25d143467 100644
--- a/packages/framework/src/Framework/Models/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Navigation/DocumentationSidebar.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Navigation;
+namespace Hyde\Navigation;
 
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
diff --git a/packages/framework/src/Framework/Models/Navigation/NavItem.php b/packages/framework/src/Navigation/NavItem.php
similarity index 98%
rename from packages/framework/src/Framework/Models/Navigation/NavItem.php
rename to packages/framework/src/Navigation/NavItem.php
index cf8411ef4aa..b0053cdd20e 100644
--- a/packages/framework/src/Framework/Models/Navigation/NavItem.php
+++ b/packages/framework/src/Navigation/NavItem.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Navigation;
+namespace Hyde\Navigation;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Models\Support\Route;
diff --git a/packages/framework/src/Framework/Models/Navigation/NavigationData.php b/packages/framework/src/Navigation/NavigationData.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Navigation/NavigationData.php
rename to packages/framework/src/Navigation/NavigationData.php
index 2cb958f1b08..3fc61582229 100644
--- a/packages/framework/src/Framework/Models/Navigation/NavigationData.php
+++ b/packages/framework/src/Navigation/NavigationData.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Navigation;
+namespace Hyde\Navigation;
 
 use ArrayObject;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
diff --git a/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php b/packages/framework/src/Navigation/NavigationMenu.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
rename to packages/framework/src/Navigation/NavigationMenu.php
index f0c9c1fc10b..09b09745b06 100644
--- a/packages/framework/src/Framework/Models/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Navigation/NavigationMenu.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Navigation;
+namespace Hyde\Navigation;
 
 use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
diff --git a/packages/framework/tests/Feature/NavigationDataTest.php b/packages/framework/tests/Feature/NavigationDataTest.php
index 57099fef740..520dbf180fc 100644
--- a/packages/framework/tests/Feature/NavigationDataTest.php
+++ b/packages/framework/tests/Feature/NavigationDataTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Contracts\FrontMatter\Support\NavigationSchema;
-use Hyde\Framework\Models\Navigation\NavigationData;
+use Hyde\Navigation\NavigationData;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Navigation\NavigationData
+ * @covers \Hyde\Navigation\NavigationData
  */
 class NavigationDataTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 6d63b0f69f0..0cd78f9eab3 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,15 +4,15 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Navigation\NavigationMenu;
-use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Navigation\NavigationMenu;
+use Hyde\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Framework\Models\Navigation\NavigationMenu
+ * @covers \Hyde\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index c2c779a41c4..75707be8f9a 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -5,16 +5,16 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Models\Navigation\DocumentationSidebar;
-use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Navigation\DocumentationSidebar;
+use Hyde\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Models\Navigation\DocumentationSidebar
+ * @covers \Hyde\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  */
 class DocumentationSidebarTest extends TestCase
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2376ae269e7..6ac72c34f9e 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -5,15 +5,15 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 
 /**
  * This unit test covers the basics of the NavItem class.
  * For the full feature test, see the NavigationMenuTest class.
  *
- * @covers \Hyde\Framework\Models\Navigation\NavItem
+ * @covers \Hyde\Navigation\NavItem
  */
 class NavItemTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index efff4955728..255ce10646c 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => \Hyde\Framework\Models\Navigation\NavigationMenu::create(),
+            'navigation' => \Hyde\Navigation\NavigationMenu::create(),
         ])->render();
     }
 
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 8601558d529..e9e22a1d336 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Models\Navigation\NavItem;
 use Hyde\Framework\Models\Support\Route;
+use Hyde\Navigation\NavItem;
 use Hyde\Testing\TestCase;
 
 /**

From bebcf48177424a8b4dad9597276fb55b08f5502e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:09:37 +0200
Subject: [PATCH 061/768] Move page models to new Pages namespace

---
 config/app.php                                         |  8 ++++----
 .../views/components/article-excerpt.blade.php         |  2 +-
 .../views/pages/documentation-search.blade.php         |  8 ++++----
 .../framework/src/Console/Commands/MakePageCommand.php |  6 +++---
 packages/framework/src/Foundation/FileCollection.php   | 10 +++++-----
 packages/framework/src/Foundation/Filesystem.php       |  8 ++++----
 packages/framework/src/Foundation/Hyperlinks.php       |  2 +-
 packages/framework/src/Foundation/PageCollection.php   | 10 +++++-----
 .../Constructors/FindsNavigationDataForPage.php        |  4 ++--
 .../src/Framework/Actions/CreatesNewPageSourceFile.php |  6 +++---
 .../src/Framework/Actions/SourceFileParser.php         |  2 +-
 .../src/Framework/Concerns/BaseMarkdownPage.php        |  6 +++---
 .../Concerns/Internal/ConstructsPageSchemas.php        |  2 +-
 .../Framework/Contracts/FrontMatter/BlogPostSchema.php |  2 +-
 .../Contracts/FrontMatter/DocumentationPageSchema.php  |  2 +-
 .../FrontMatter/Support/FeaturedImageSchema.php        |  2 +-
 .../framework/src/Framework/HydeServiceProvider.php    |  8 ++++----
 .../src/Framework/Services/DiscoveryService.php        |  8 ++++----
 .../Framework/Services/DocumentationSearchService.php  |  4 ++--
 .../src/Framework/Services/MarkdownService.php         |  2 +-
 .../src/Framework/Services/RssFeedService.php          |  4 ++--
 .../Services/SemanticDocumentationArticle.php          |  4 ++--
 .../src/Framework/Services/SitemapService.php          |  8 ++++----
 packages/framework/src/Metadata/PageMetadataBag.php    |  2 +-
 .../framework/src/Navigation/DocumentationSidebar.php  |  2 +-
 packages/framework/src/Navigation/NavigationMenu.php   |  2 +-
 .../src/{Framework/Models => }/Pages/BladePage.php     |  2 +-
 .../{Framework/Models => }/Pages/DocumentationPage.php |  2 +-
 .../src/{Framework/Models => }/Pages/HtmlPage.php      |  2 +-
 .../src/{Framework/Models => }/Pages/MarkdownPage.php  |  2 +-
 .../src/{Framework/Models => }/Pages/MarkdownPost.php  |  2 +-
 .../Feature/Actions/CreatesNewPageSourceFileTest.php   |  4 ++--
 .../tests/Feature/Commands/BuildSearchCommandTest.php  |  2 +-
 .../framework/tests/Feature/DarkmodeFeatureTest.php    |  2 +-
 .../framework/tests/Feature/DiscoveryServiceTest.php   | 10 +++++-----
 .../framework/tests/Feature/FileCollectionTest.php     |  8 ++++----
 packages/framework/tests/Feature/FileTest.php          |  2 +-
 .../tests/Feature/Foundation/FilesystemTest.php        |  8 ++++----
 .../framework/tests/Feature/GlobalMetadataBagTest.php  |  2 +-
 packages/framework/tests/Feature/HtmlPageTest.php      |  4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php    |  8 ++++----
 packages/framework/tests/Feature/HydePageTest.php      |  8 ++++----
 packages/framework/tests/Feature/MarkdownPageTest.php  |  2 +-
 packages/framework/tests/Feature/MarkdownPostTest.php  |  4 ++--
 .../framework/tests/Feature/MarkdownServiceTest.php    |  2 +-
 packages/framework/tests/Feature/MetadataTest.php      |  4 ++--
 .../framework/tests/Feature/PageCollectionTest.php     |  8 ++++----
 .../tests/Feature/PageModelConstructorsTest.php        |  6 +++---
 .../framework/tests/Feature/RouteCollectionTest.php    |  8 ++++----
 packages/framework/tests/Feature/RouteTest.php         |  8 ++++----
 .../Services/DocumentationSearchServiceTest.php        |  2 +-
 .../tests/Feature/Services/HydeSmartDocsTest.php       |  2 +-
 .../Feature/SourceDirectoriesCanBeChangedTest.php      |  8 ++++----
 .../framework/tests/Feature/SourceFileParserTest.php   | 10 +++++-----
 .../framework/tests/Feature/StaticPageBuilderTest.php  | 10 +++++-----
 .../tests/Feature/StaticSiteBuilderPostModuleTest.php  |  2 +-
 .../framework/tests/Unit/DocumentationPageTest.php     |  4 ++--
 .../tests/Unit/GetLatestMarkdownPostsTest.php          |  4 ++--
 .../framework/tests/Unit/HasTableOfContentsTest.php    |  4 ++--
 .../framework/tests/Unit/HydeServiceProviderTest.php   |  8 ++++----
 ...ownPageModelConstructorArgumentsAreOptionalTest.php |  6 +++---
 .../framework/tests/Unit/MarkdownPostHelpersTest.php   |  4 ++--
 .../framework/tests/Unit/MarkdownPostParserTest.php    |  2 +-
 .../tests/Unit/PageModelGetAllFilesHelperTest.php      |  8 ++++----
 .../framework/tests/Unit/PageModelGetHelperTest.php    |  8 ++++----
 .../framework/tests/Unit/PageModelParseHelperTest.php  |  8 ++++----
 ...SourceFilesInCustomDirectoriesCanBeCompiledTest.php |  8 ++++----
 .../framework/tests/Unit/ValidatesExistenceTest.php    |  2 +-
 .../tests/Unit/Views/ArticleExcerptViewTest.php        |  2 +-
 packages/testing/src/TestCase.php                      |  2 +-
 tests/Benchmarks/PageParserBenchmark.php               |  8 ++++----
 tests/fixtures/file_seeeder.php                        |  6 +++---
 72 files changed, 176 insertions(+), 176 deletions(-)
 rename packages/framework/src/{Framework/Models => }/Pages/BladePage.php (97%)
 rename packages/framework/src/{Framework/Models => }/Pages/DocumentationPage.php (98%)
 rename packages/framework/src/{Framework/Models => }/Pages/HtmlPage.php (94%)
 rename packages/framework/src/{Framework/Models => }/Pages/MarkdownPage.php (93%)
 rename packages/framework/src/{Framework/Models => }/Pages/MarkdownPost.php (96%)

diff --git a/config/app.php b/config/app.php
index f59506d3d44..83d12928eb3 100644
--- a/config/app.php
+++ b/config/app.php
@@ -97,10 +97,10 @@
         'Asset' => Hyde\Framework\Helpers\Asset::class,
         'Site' => \Hyde\Framework\Models\Support\Site::class,
         'Route' => \Hyde\Framework\Models\Support\Route::class,
-        'BladePage' => Hyde\Framework\Models\Pages\BladePage::class,
-        'MarkdownPage' => Hyde\Framework\Models\Pages\MarkdownPage::class,
-        'MarkdownPost' => Hyde\Framework\Models\Pages\MarkdownPost::class,
-        'DocumentationPage' => Hyde\Framework\Models\Pages\DocumentationPage::class,
+        'BladePage' => \Hyde\Pages\BladePage::class,
+        'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
+        'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
+        'DocumentationPage' => \Hyde\Pages\DocumentationPage::class,
     ],
 
 ];
diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php
index a4806a8c583..bd351ff75f0 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\Framework\Models\Pages\MarkdownPost $post */
+    /** @var \Hyde\Pages\MarkdownPost $post */
 @endphp
 
 <article class="mt-4 mb-8" itemscope itemtype="http://schema.org/Article">
diff --git a/packages/framework/resources/views/pages/documentation-search.blade.php b/packages/framework/resources/views/pages/documentation-search.blade.php
index 339b489d4f8..f0e3365bf28 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 @@
 @php
-// Emulate a page object
-Hyde::shareViewData(Hyde\Framework\Models\Pages\DocumentationPage::make('search', ['title' => 'Search']));
-$markdown = '';
+    // Emulate a page object
+    Hyde::shareViewData(\Hyde\Pages\DocumentationPage::make('search', ['title' => 'Search']));
+    $markdown = '';
 @endphp
 
 @extends('hyde::layouts.docs')
@@ -14,5 +14,5 @@
         #search-results {
             max-height: unset !important;
         }</style>
-    <x-hyde::docs.search-input class="max-w-xs border-b-4 border-indigo-400" />
+    <x-hyde::docs.search-input class="max-w-xs border-b-4 border-indigo-400"/>
 @endsection
diff --git a/packages/framework/src/Console/Commands/MakePageCommand.php b/packages/framework/src/Console/Commands/MakePageCommand.php
index 71b3379da33..520a2bd0022 100644
--- a/packages/framework/src/Console/Commands/MakePageCommand.php
+++ b/packages/framework/src/Console/Commands/MakePageCommand.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Actions\CreatesNewPageSourceFile;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index c258327fe3a..bfdca343ff7 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -7,13 +7,13 @@
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\HtmlPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\File;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 
 /**
  * @see \Hyde\Framework\Foundation\FileCollection
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
index 59ff715a371..ccbd187acce 100644
--- a/packages/framework/src/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 
 /**
  * File helper methods, bound to the HydeKernel instance, and is an integral part of the framework.
diff --git a/packages/framework/src/Foundation/Hyperlinks.php b/packages/framework/src/Foundation/Hyperlinks.php
index 9d8b46c2bb9..82d9fc7550e 100644
--- a/packages/framework/src/Foundation/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Hyperlinks.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation;
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
-use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Pages\DocumentationPage;
 
 /**
  * Contains helpers and logic for resolving web paths for compiled files.
diff --git a/packages/framework/src/Foundation/PageCollection.php b/packages/framework/src/Foundation/PageCollection.php
index e862e1eeccd..bb675b33a81 100644
--- a/packages/framework/src/Foundation/PageCollection.php
+++ b/packages/framework/src/Foundation/PageCollection.php
@@ -8,11 +8,11 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\HtmlPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 3b55b26570e..b8f63653303 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Navigation\NavigationData;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php b/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
index be4f3530a66..341e09aa3c4 100644
--- a/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
+++ b/packages/framework/src/Framework/Actions/CreatesNewPageSourceFile.php
@@ -7,10 +7,10 @@
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Exceptions\FileConflictException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/SourceFileParser.php b/packages/framework/src/Framework/Actions/SourceFileParser.php
index 4d02eb459cc..fa365e5d0fa 100644
--- a/packages/framework/src/Framework/Actions/SourceFileParser.php
+++ b/packages/framework/src/Framework/Actions/SourceFileParser.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Concerns\ValidatesExistence;
-use Hyde\Framework\Models\Pages\BladePage;
+use Hyde\Pages\BladePage;
 
 /**
  * Parses a source file and returns a new page model instance for it.
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index 957fbb4e0b8..6732fddbce8 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -12,9 +12,9 @@
 /**
  * The base class for all Markdown-based page models.
  *
- * @see \Hyde\Framework\Models\Pages\MarkdownPage
- * @see \Hyde\Framework\Models\Pages\MarkdownPost
- * @see \Hyde\Framework\Models\Pages\DocumentationPage
+ * @see \Hyde\Pages\MarkdownPage
+ * @see \Hyde\Pages\MarkdownPost
+ * @see \Hyde\Pages\DocumentationPage
  * @see \Hyde\Framework\Concerns\HydePage
  * @see \Hyde\Framework\Testing\Feature\HydePageTest
  */
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 534451d564b..a46e1c454ab 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -9,9 +9,9 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\DateString;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 
 trait ConstructsPageSchemas
 {
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
index aabce6412dc..5302fc13bbb 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts\FrontMatter;
 
 /**
- * @see \Hyde\Framework\Models\Pages\MarkdownPost
+ * @see \Hyde\Pages\MarkdownPost
  */
 interface BlogPostSchema extends Support\FeaturedImageSchema
 {
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
index 0280e210bb4..6f008ca910c 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Contracts\FrontMatter;
 
 /**
- * @see \Hyde\Framework\Models\Pages\DocumentationPage
+ * @see \Hyde\Pages\DocumentationPage
  */
 interface DocumentationPageSchema
 {
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
index 28ac94ff3d4..62ab3510306 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
@@ -6,7 +6,7 @@
 
 /**
  * @see \Hyde\Blogging\Models\FeaturedImage
- * @see \Hyde\Framework\Models\Pages\MarkdownPost
+ * @see \Hyde\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
 {
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index bdfa4394be8..99b4b56ecae 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -9,14 +9,14 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\RegistersFileLocations;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/packages/framework/src/Framework/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
index d694cb5f412..bddf5d25425 100644
--- a/packages/framework/src/Framework/Services/DiscoveryService.php
+++ b/packages/framework/src/Framework/Services/DiscoveryService.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 
 /**
  * The core service that powers all HydePHP file auto-discovery.
diff --git a/packages/framework/src/Framework/Services/DocumentationSearchService.php b/packages/framework/src/Framework/Services/DocumentationSearchService.php
index 6bc5299d9b1..5d1d9f07682 100644
--- a/packages/framework/src/Framework/Services/DocumentationSearchService.php
+++ b/packages/framework/src/Framework/Services/DocumentationSearchService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use JetBrains\PhpStorm\ArrayShape;
@@ -56,7 +56,7 @@ public function execute(): self
 
     public function run(): self
     {
-        /** @var DocumentationPage $page */
+        /** @var \Hyde\Pages\DocumentationPage $page */
         foreach (DocumentationPage::all() as $page) {
             if (! in_array($page->identifier, config('docs.exclude_from_search', []))) {
                 $this->searchIndex->push(
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 505b963aee6..5bbd7b02c46 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Contracts\MarkdownPostProcessorContract as PostProcessor;
 use Hyde\Framework\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Pages\DocumentationPage;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
 
diff --git a/packages/framework/src/Framework/Services/RssFeedService.php b/packages/framework/src/Framework/Services/RssFeedService.php
index 1582c007cd8..4169e92c75f 100644
--- a/packages/framework/src/Framework/Services/RssFeedService.php
+++ b/packages/framework/src/Framework/Services/RssFeedService.php
@@ -8,8 +8,8 @@
 namespace Hyde\Framework\Services;
 
 use Exception;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 use SimpleXMLElement;
 
 /**
@@ -39,7 +39,7 @@ public function __construct()
      */
     public function generate(): static
     {
-        /** @var MarkdownPost $post */
+        /** @var \Hyde\Pages\MarkdownPost $post */
         foreach (MarkdownPost::getLatestPosts() as $post) {
             $this->addItem($post);
         }
diff --git a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
index 21dd5ae889a..2a1fc180bb7 100644
--- a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Str;
 
 /**
@@ -112,7 +112,7 @@ protected function renderSourceLink(): string
     /**
      * Create a new SemanticDocumentationArticle instance, process, and return it.
      *
-     * @param  \Hyde\Framework\Models\Pages\DocumentationPage  $page  The source page object
+     * @param  \Hyde\Pages\DocumentationPage  $page  The source page object
      * @param  string  $html  compiled HTML content
      * @return static new processed instance
      */
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 7f993e4e04a..f4dd283420c 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -7,12 +7,12 @@
 namespace Hyde\Framework\Services;
 
 use Exception;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Metadata/PageMetadataBag.php b/packages/framework/src/Metadata/PageMetadataBag.php
index 680d0c4d997..13f1dda3db1 100644
--- a/packages/framework/src/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Metadata/PageMetadataBag.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Pages\MarkdownPost;
 
 class PageMetadataBag extends MetadataBag
 {
diff --git a/packages/framework/src/Navigation/DocumentationSidebar.php b/packages/framework/src/Navigation/DocumentationSidebar.php
index ea25d143467..fa639947520 100644
--- a/packages/framework/src/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Navigation/DocumentationSidebar.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Navigation;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Navigation/NavigationMenu.php b/packages/framework/src/Navigation/NavigationMenu.php
index 09b09745b06..5cc5f35d3f6 100644
--- a/packages/framework/src/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Navigation/NavigationMenu.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Navigation;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Models/Pages/BladePage.php b/packages/framework/src/Pages/BladePage.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Pages/BladePage.php
rename to packages/framework/src/Pages/BladePage.php
index c1d1c74b63f..95fdc816d1e 100644
--- a/packages/framework/src/Framework/Models/Pages/BladePage.php
+++ b/packages/framework/src/Pages/BladePage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Pages;
+namespace Hyde\Pages;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Models\Markdown\FrontMatter;
diff --git a/packages/framework/src/Framework/Models/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
similarity index 98%
rename from packages/framework/src/Framework/Models/Pages/DocumentationPage.php
rename to packages/framework/src/Pages/DocumentationPage.php
index ce6d9247bc4..d0cb4eedb87 100644
--- a/packages/framework/src/Framework/Models/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Pages;
+namespace Hyde\Pages;
 
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
diff --git a/packages/framework/src/Framework/Models/Pages/HtmlPage.php b/packages/framework/src/Pages/HtmlPage.php
similarity index 94%
rename from packages/framework/src/Framework/Models/Pages/HtmlPage.php
rename to packages/framework/src/Pages/HtmlPage.php
index 2781cd8ca79..5ce72b1c51a 100644
--- a/packages/framework/src/Framework/Models/Pages/HtmlPage.php
+++ b/packages/framework/src/Pages/HtmlPage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Pages;
+namespace Hyde\Pages;
 
 use Hyde\Framework\Concerns\HydePage;
 
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPage.php b/packages/framework/src/Pages/MarkdownPage.php
similarity index 93%
rename from packages/framework/src/Framework/Models/Pages/MarkdownPage.php
rename to packages/framework/src/Pages/MarkdownPage.php
index a7a30c5b22e..064f2ee6113 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPage.php
+++ b/packages/framework/src/Pages/MarkdownPage.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Pages;
+namespace Hyde\Pages;
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 
diff --git a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
similarity index 96%
rename from packages/framework/src/Framework/Models/Pages/MarkdownPost.php
rename to packages/framework/src/Pages/MarkdownPost.php
index dc44b00948c..fead0f042a3 100644
--- a/packages/framework/src/Framework/Models/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Pages;
+namespace Hyde\Pages;
 
 use Hyde\Blogging\Models\Author;
 use Hyde\Blogging\Models\FeaturedImage;
diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
index 18d95fef9e0..33a12d8a861 100644
--- a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
+++ b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php
@@ -7,9 +7,9 @@
 use Hyde\Framework\Actions\CreatesNewPageSourceFile;
 use Hyde\Framework\Exceptions\FileConflictException;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 1abaa7d33bb..97c0fa7b119 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 88983a146d3..fa8a09e52d0 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
diff --git a/packages/framework/tests/Feature/DiscoveryServiceTest.php b/packages/framework/tests/Feature/DiscoveryServiceTest.php
index db7221c541d..75188ac5f43 100644
--- a/packages/framework/tests/Feature/DiscoveryServiceTest.php
+++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
@@ -123,7 +123,7 @@ public function test_get_source_file_list_for_model_method_finds_customized_mode
             DocumentationPage::class,
         ];
 
-        /** @var MarkdownPage $model */
+        /** @var \Hyde\Pages\MarkdownPage $model */
         foreach ($matrix as $model) {
             // Setup
             @mkdir(Hyde::path('foo'));
diff --git a/packages/framework/tests/Feature/FileCollectionTest.php b/packages/framework/tests/Feature/FileCollectionTest.php
index 4f3767ae831..9e589d0220e 100644
--- a/packages/framework/tests/Feature/FileCollectionTest.php
+++ b/packages/framework/tests/Feature/FileCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Foundation\FileCollection;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index ad400c99dfa..6b890d62f1d 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Foundation/FilesystemTest.php b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
index 1b42b65862a..f3ae5113311 100644
--- a/packages/framework/tests/Feature/Foundation/FilesystemTest.php
+++ b/packages/framework/tests/Feature/Foundation/FilesystemTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature\Foundation;
 
 use Hyde\Foundation\Filesystem;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index 9abe0447490..1c6b38380dc 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Metadata\GlobalMetadataBag;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\View;
 
diff --git a/packages/framework/tests/Feature/HtmlPageTest.php b/packages/framework/tests/Feature/HtmlPageTest.php
index 2f269b9b298..5d9752f4fa8 100644
--- a/packages/framework/tests/Feature/HtmlPageTest.php
+++ b/packages/framework/tests/Feature/HtmlPageTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\HtmlPage;
+use Hyde\Pages\HtmlPage;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Pages\HtmlPage
+ * @covers \Hyde\Pages\HtmlPage
  */
 class HtmlPageTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index d1e0d7c37ca..1871f90ac03 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -7,12 +7,12 @@
 use Composer\InstalledVersions;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 869bf7fe982..2b606efc72b 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -7,12 +7,12 @@
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Models\Markdown\Markdown;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/MarkdownPageTest.php b/packages/framework/tests/Feature/MarkdownPageTest.php
index de075e31f32..dc95247dcf9 100644
--- a/packages/framework/tests/Feature/MarkdownPageTest.php
+++ b/packages/framework/tests/Feature/MarkdownPageTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 18324092eeb..2230baca68c 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -7,12 +7,12 @@
 use Hyde\Blogging\Models\Author;
 use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\DateString;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Pages\MarkdownPost
+ * @covers \Hyde\Pages\MarkdownPost
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  */
 class MarkdownPostTest extends TestCase
diff --git a/packages/framework/tests/Feature/MarkdownServiceTest.php b/packages/framework/tests/Feature/MarkdownServiceTest.php
index 51ca5cc3330..7e08e6fdb06 100644
--- a/packages/framework/tests/Feature/MarkdownServiceTest.php
+++ b/packages/framework/tests/Feature/MarkdownServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\MarkdownService;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index a83b60e3f0c..e630e266108 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Meta;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Metadata\MetadataBag;
 use Hyde\Metadata\Models\LinkElement;
 use Hyde\Metadata\Models\MetadataElement;
 use Hyde\Metadata\Models\OpenGraphElement;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/PageCollectionTest.php b/packages/framework/tests/Feature/PageCollectionTest.php
index cd470afba32..e218b206bb1 100644
--- a/packages/framework/tests/Feature/PageCollectionTest.php
+++ b/packages/framework/tests/Feature/PageCollectionTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Foundation\PageCollection;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index f5e910d9a4e..c55f6098d9c 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 
 /**
@@ -54,7 +54,7 @@ public function test_documentation_page_parser_can_get_group_automatically_from_
         mkdir(Hyde::path('_docs/foo'));
         touch(Hyde::path('_docs/foo/bar.md'));
 
-        /** @var DocumentationPage $page */
+        /** @var \Hyde\Pages\DocumentationPage $page */
         $page = DocumentationPage::parse('foo/bar');
         $this->assertEquals('foo', $page->navigationMenuGroup());
 
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 68c21798376..62837300d9e 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 3d8b9d2c4b9..8b5053bc5b6 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
index c013228b181..e4546efb3d3 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\DocumentationSearchService as Service;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 42e2ec17361..30868a83a8f 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Models\Markdown\Markdown;
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Services\SemanticDocumentationArticle;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
index 77d6b6f0dbe..f4c9a1f08e1 100644
--- a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/SourceFileParserTest.php b/packages/framework/tests/Feature/SourceFileParserTest.php
index 61d188fce24..4d877847957 100644
--- a/packages/framework/tests/Feature/SourceFileParserTest.php
+++ b/packages/framework/tests/Feature/SourceFileParserTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\SourceFileParser;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\HtmlPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php
index 2c0150aebf5..8e64eba13eb 100644
--- a/packages/framework/tests/Feature/StaticPageBuilderTest.php
+++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\HtmlPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\HtmlPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
index 54266a9930e..15d2138df35 100644
--- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
+++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 6ba72fb4f39..48204d42ce9 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -5,15 +5,15 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Pages\DocumentationPage;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Models\Pages\DocumentationPage
+ * @covers \Hyde\Pages\DocumentationPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  */
 class DocumentationPageTest extends TestCase
diff --git a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
index e7f0a82ed38..ce6ab5b3543 100644
--- a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
+++ b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @see \Hyde\Framework\Models\Pages\MarkdownPost::latest()
+ * @see \Hyde\Pages\MarkdownPost::latest()
  */
 class GetLatestMarkdownPostsTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HasTableOfContentsTest.php b/packages/framework/tests/Unit/HasTableOfContentsTest.php
index 42dc0c8cf49..02dfc91dba5 100644
--- a/packages/framework/tests/Unit/HasTableOfContentsTest.php
+++ b/packages/framework/tests/Unit/HasTableOfContentsTest.php
@@ -5,13 +5,13 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Models\Markdown\Markdown;
-use Hyde\Framework\Models\Pages\DocumentationPage;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
 /**
  * Class HasTableOfContentsTest.
  *
- * @covers \Hyde\Framework\Models\Pages\DocumentationPage
+ * @covers \Hyde\Pages\DocumentationPage
  *
  * @see \Hyde\Framework\Testing\Feature\Actions\GeneratesSidebarTableOfContentsTest
  */
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 9702e85928d..5b57cfc1e32 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php b/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php
index addd94fca63..0157e124720 100644
--- a/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php
+++ b/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 class MarkdownPageModelConstructorArgumentsAreOptionalTest extends TestCase
diff --git a/packages/framework/tests/Unit/MarkdownPostHelpersTest.php b/packages/framework/tests/Unit/MarkdownPostHelpersTest.php
index a0e92229e91..d03688ce15c 100644
--- a/packages/framework/tests/Unit/MarkdownPostHelpersTest.php
+++ b/packages/framework/tests/Unit/MarkdownPostHelpersTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\MarkdownPost;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
- * @see \Hyde\Framework\Models\Pages\MarkdownPost
+ * @see \Hyde\Pages\MarkdownPost
  */
 class MarkdownPostHelpersTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/MarkdownPostParserTest.php b/packages/framework/tests/Unit/MarkdownPostParserTest.php
index 3864c1988f8..03631602057 100644
--- a/packages/framework/tests/Unit/MarkdownPostParserTest.php
+++ b/packages/framework/tests/Unit/MarkdownPostParserTest.php
@@ -6,8 +6,8 @@
 
 use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Markdown\Markdown;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
index 7f2f124e61c..fe9cb872dd8 100644
--- a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/PageModelGetHelperTest.php b/packages/framework/tests/Unit/PageModelGetHelperTest.php
index 6f3be829cda..6b2af27b4f4 100644
--- a/packages/framework/tests/Unit/PageModelGetHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Unit/PageModelParseHelperTest.php b/packages/framework/tests/Unit/PageModelParseHelperTest.php
index bcc75f01bf1..d49f6d1623c 100644
--- a/packages/framework/tests/Unit/PageModelParseHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelParseHelperTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
index 63337682905..65b68698400 100644
--- a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
+++ b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/ValidatesExistenceTest.php b/packages/framework/tests/Unit/ValidatesExistenceTest.php
index 9998a92dfe1..a0f0859606e 100644
--- a/packages/framework/tests/Unit/ValidatesExistenceTest.php
+++ b/packages/framework/tests/Unit/ValidatesExistenceTest.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\ValidatesExistence;
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Models\Pages\BladePage;
+use Hyde\Pages\BladePage;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
index d4c166188db..8219143271a 100644
--- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
+++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;
 
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 7209185bc94..7b430096efb 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -4,9 +4,9 @@
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Pages\MarkdownPage;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 
diff --git a/tests/Benchmarks/PageParserBenchmark.php b/tests/Benchmarks/PageParserBenchmark.php
index 9670e243e87..e51da3da87b 100644
--- a/tests/Benchmarks/PageParserBenchmark.php
+++ b/tests/Benchmarks/PageParserBenchmark.php
@@ -4,11 +4,11 @@
 
 namespace Tests\Benchmarks;
 
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
-use Hyde\Framework\Models\Pages\MarkdownPost;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Tests\Benchmarks\CBench\Benchmark;
 
 class PageParserBenchmark extends BenchCase
diff --git a/tests/fixtures/file_seeeder.php b/tests/fixtures/file_seeeder.php
index 51135076d1b..b9c9b6fe392 100644
--- a/tests/fixtures/file_seeeder.php
+++ b/tests/fixtures/file_seeeder.php
@@ -8,9 +8,9 @@
 // Generate some file fixtures for quick visual testing.
 
 use Hyde\Framework\Actions\CreatesNewPageSourceFile;
-use Hyde\Framework\Models\Pages\BladePage;
-use Hyde\Framework\Models\Pages\DocumentationPage;
-use Hyde\Framework\Models\Pages\MarkdownPage;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
 
 $autoloader = require __DIR__.'/../../vendor/autoload.php';
 $app = require_once __DIR__.'/../../app/bootstrap.php';

From 6b7ed6db40caad9ba871d856a51396ecc0ca2983 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:11:35 +0200
Subject: [PATCH 062/768] Mode Markdown models to the Markdown namespace

---
 docs/digging-deeper/collections.md                     |  2 +-
 .../framework/src/DataCollections/DataCollection.php   |  2 +-
 .../Actions/GeneratesSidebarTableOfContents.php        |  2 +-
 .../src/Framework/Actions/MarkdownFileParser.php       |  2 +-
 .../src/Framework/Concerns/BaseMarkdownPage.php        |  8 ++++----
 packages/framework/src/Framework/Concerns/HydePage.php |  6 +++---
 .../Framework/Contracts/MarkdownDocumentContract.php   |  6 +++---
 packages/framework/src/Framework/Helpers/Includes.php  |  2 +-
 .../Markdown => Markdown/Models}/FrontMatter.php       |  2 +-
 .../Models/Markdown => Markdown/Models}/Markdown.php   |  2 +-
 .../Markdown => Markdown/Models}/MarkdownDocument.php  |  2 +-
 packages/framework/src/Pages/BladePage.php             |  4 ++--
 .../framework/tests/Feature/DataCollectionTest.php     |  2 +-
 packages/framework/tests/Feature/HydePageTest.php      |  2 +-
 .../framework/tests/Feature/MarkdownFileParserTest.php |  4 ++--
 packages/framework/tests/Feature/MarkdownPostTest.php  |  2 +-
 .../tests/Feature/Services/HydeSmartDocsTest.php       |  2 +-
 packages/framework/tests/Unit/FrontMatterModelTest.php |  4 ++--
 .../framework/tests/Unit/HasTableOfContentsTest.php    |  2 +-
 packages/framework/tests/Unit/MarkdownDocumentTest.php | 10 +++++-----
 packages/framework/tests/Unit/MarkdownFacadeTest.php   |  4 ++--
 .../framework/tests/Unit/MarkdownPostParserTest.php    |  4 ++--
 tests/Benchmarks/MarkdownBenchmark.php                 |  2 +-
 23 files changed, 39 insertions(+), 39 deletions(-)
 rename packages/framework/src/{Framework/Models/Markdown => Markdown/Models}/FrontMatter.php (97%)
 rename packages/framework/src/{Framework/Models/Markdown => Markdown/Models}/Markdown.php (97%)
 rename packages/framework/src/{Framework/Models/Markdown => Markdown/Models}/MarkdownDocument.php (96%)

diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index be41b07cd6b..e61a8428ff0 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -88,7 +88,7 @@ MarkdownCollection::get('subdirectory_name')
 
 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 class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Framework\Models\Markdown\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
+<pre class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
 
 
 #### Implementing it in a Blade view
diff --git a/packages/framework/src/DataCollections/DataCollection.php b/packages/framework/src/DataCollections/DataCollection.php
index 9cea37df393..efbef011746 100644
--- a/packages/framework/src/DataCollections/DataCollection.php
+++ b/packages/framework/src/DataCollections/DataCollection.php
@@ -51,7 +51,7 @@ public function getMarkdownFiles(): array
      * Each Markdown file will be parsed into a MarkdownDocument with front matter.
      *
      * @param  string  $key  for a subdirectory of the _data directory
-     * @return DataCollection<\Hyde\Framework\Models\Markdown\MarkdownDocument>
+     * @return DataCollection<\Hyde\Markdown\Models\MarkdownDocument>
      */
     public static function markdown(string $key): static
     {
diff --git a/packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php b/packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php
index 19470895039..98c4459b241 100644
--- a/packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php
+++ b/packages/framework/src/Framework/Actions/GeneratesSidebarTableOfContents.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Markdown\Models\Markdown;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
diff --git a/packages/framework/src/Framework/Actions/MarkdownFileParser.php b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
index 8ed7e87a774..880662e3a4e 100644
--- a/packages/framework/src/Framework/Actions/MarkdownFileParser.php
+++ b/packages/framework/src/Framework/Actions/MarkdownFileParser.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Models\Markdown\MarkdownDocument;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Spatie\YamlFrontMatter\YamlFrontMatter;
 
 /**
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index 6732fddbce8..a02ee73f605 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Framework\Contracts\MarkdownDocumentContract;
-use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
 
 /**
  * The base class for all Markdown-based page models.
@@ -44,8 +44,8 @@ public static function make(string $identifier = '', array $matter = [], string
      * Normally, this is done by the SourceFileParser.
      *
      * @param  string  $identifier
-     * @param  \Hyde\Framework\Models\Markdown\FrontMatter|null  $matter
-     * @param  \Hyde\Framework\Models\Markdown\Markdown|null  $markdown
+     * @param  \Hyde\Markdown\Models\FrontMatter|null  $matter
+     * @param  \Hyde\Markdown\Models\Markdown|null  $markdown
      *
      * @see \Hyde\Framework\Actions\SourceFileParser
      *
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index bb5692fc357..fb24b9c8c06 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -9,10 +9,10 @@
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Contracts\CompilableContract;
 use Hyde\Framework\Contracts\FrontMatter\PageSchema;
-use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Metadata\PageMetadataBag;
 use Hyde\Navigation\NavigationData;
 use Illuminate\Support\Arr;
@@ -231,7 +231,7 @@ public function getBladeView(): string
     /**
      * Get a value from the computed page data, or fallback to the page's front matter, then to the default value.
      *
-     * @return \Hyde\Framework\Models\Markdown\FrontMatter|mixed
+     * @return \Hyde\Markdown\Models\FrontMatter|mixed
      */
     public function get(string $key = null, mixed $default = null): mixed
     {
@@ -244,7 +244,7 @@ public function get(string $key = null, mixed $default = null): mixed
     /**
      * Get the front matter object, or a value from within.
      *
-     * @return \Hyde\Framework\Models\Markdown\FrontMatter|mixed
+     * @return \Hyde\Markdown\Models\FrontMatter|mixed
      */
     public function matter(string $key = null, mixed $default = null): mixed
     {
diff --git a/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php b/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
index ed49993a4e1..43e45b1d2fb 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
+++ b/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
@@ -4,21 +4,21 @@
 
 namespace Hyde\Framework\Contracts;
 
-use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Markdown\Models\Markdown;
 
 interface MarkdownDocumentContract
 {
     /**
      * Get the front matter object, or a value from within.
      *
-     * @return \Hyde\Framework\Models\Markdown\FrontMatter|mixed
+     * @return \Hyde\Markdown\Models\FrontMatter|mixed
      */
     public function matter(string $key = null, mixed $default = null): mixed;
 
     /**
      * Return the document's Markdown object.
      *
-     * @return \Hyde\Framework\Models\Markdown\Markdown
+     * @return \Hyde\Markdown\Models\Markdown
      */
     public function markdown(): Markdown;
 }
diff --git a/packages/framework/src/Framework/Helpers/Includes.php b/packages/framework/src/Framework/Helpers/Includes.php
index 5f16aec6888..ec4101344a6 100644
--- a/packages/framework/src/Framework/Helpers/Includes.php
+++ b/packages/framework/src/Framework/Helpers/Includes.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Helpers;
 
-use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
 class Includes
diff --git a/packages/framework/src/Framework/Models/Markdown/FrontMatter.php b/packages/framework/src/Markdown/Models/FrontMatter.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Markdown/FrontMatter.php
rename to packages/framework/src/Markdown/Models/FrontMatter.php
index 0d9c3120a18..82442c26176 100644
--- a/packages/framework/src/Framework/Models/Markdown/FrontMatter.php
+++ b/packages/framework/src/Markdown/Models/FrontMatter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Markdown;
+namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
diff --git a/packages/framework/src/Framework/Models/Markdown/Markdown.php b/packages/framework/src/Markdown/Models/Markdown.php
similarity index 97%
rename from packages/framework/src/Framework/Models/Markdown/Markdown.php
rename to packages/framework/src/Markdown/Models/Markdown.php
index e12b03a2536..d9dfd6d08a9 100644
--- a/packages/framework/src/Framework/Models/Markdown/Markdown.php
+++ b/packages/framework/src/Markdown/Models/Markdown.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Markdown;
+namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Services\MarkdownService;
diff --git a/packages/framework/src/Framework/Models/Markdown/MarkdownDocument.php b/packages/framework/src/Markdown/Models/MarkdownDocument.php
similarity index 96%
rename from packages/framework/src/Framework/Models/Markdown/MarkdownDocument.php
rename to packages/framework/src/Markdown/Models/MarkdownDocument.php
index 13ed612b137..eeb9f5457eb 100644
--- a/packages/framework/src/Framework/Models/Markdown/MarkdownDocument.php
+++ b/packages/framework/src/Markdown/Models/MarkdownDocument.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Markdown;
+namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Hyde\Framework\Contracts\MarkdownDocumentContract;
diff --git a/packages/framework/src/Pages/BladePage.php b/packages/framework/src/Pages/BladePage.php
index 95fdc816d1e..361ecd1a50b 100644
--- a/packages/framework/src/Pages/BladePage.php
+++ b/packages/framework/src/Pages/BladePage.php
@@ -5,7 +5,7 @@
 namespace Hyde\Pages;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Markdown\FrontMatter;
+use Hyde\Markdown\Models\FrontMatter;
 
 /**
  * Page class for Blade pages.
@@ -27,7 +27,7 @@ class BladePage extends HydePage
 
     /**
      * @param  string  $view
-     * @param  \Hyde\Framework\Models\Markdown\FrontMatter|array  $matter
+     * @param  \Hyde\Markdown\Models\FrontMatter|array  $matter
      */
     public function __construct(string $view = '', FrontMatter|array $matter = [])
     {
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 30aab0ad3c2..696b688a9a1 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -8,8 +8,8 @@
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\DataCollections\Facades\MarkdownCollection;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Markdown\MarkdownDocument;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Testing\TestCase;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Collection;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 2b606efc72b..93bcbe204ee 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
diff --git a/packages/framework/tests/Feature/MarkdownFileParserTest.php b/packages/framework/tests/Feature/MarkdownFileParserTest.php
index 14373b48716..0c4b320d71c 100644
--- a/packages/framework/tests/Feature/MarkdownFileParserTest.php
+++ b/packages/framework/tests/Feature/MarkdownFileParserTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Markdown\MarkdownDocument;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Testing\TestCase;
 
 class MarkdownFileParserTest extends TestCase
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 2230baca68c..bd88174ee53 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -6,8 +6,8 @@
 
 use Hyde\Blogging\Models\Author;
 use Hyde\Blogging\Models\FeaturedImage;
-use Hyde\Framework\Models\Markdown\FrontMatter;
 use Hyde\Framework\Models\Support\DateString;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 30868a83a8f..ba553d2886e 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Framework\Services\SemanticDocumentationArticle;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/FrontMatterModelTest.php b/packages/framework/tests/Unit/FrontMatterModelTest.php
index 80e80ba1935..afbf5eaed93 100644
--- a/packages/framework/tests/Unit/FrontMatterModelTest.php
+++ b/packages/framework/tests/Unit/FrontMatterModelTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Markdown\FrontMatter;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Markdown\FrontMatter
+ * @covers \Hyde\Markdown\Models\FrontMatter
  */
 class FrontMatterModelTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HasTableOfContentsTest.php b/packages/framework/tests/Unit/HasTableOfContentsTest.php
index 02dfc91dba5..9e0b1316223 100644
--- a/packages/framework/tests/Unit/HasTableOfContentsTest.php
+++ b/packages/framework/tests/Unit/HasTableOfContentsTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/MarkdownDocumentTest.php b/packages/framework/tests/Unit/MarkdownDocumentTest.php
index 4378ab90a30..12a76052dfd 100644
--- a/packages/framework/tests/Unit/MarkdownDocumentTest.php
+++ b/packages/framework/tests/Unit/MarkdownDocumentTest.php
@@ -4,15 +4,15 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Markdown\Markdown;
-use Hyde\Framework\Models\Markdown\MarkdownDocument;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
+use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Markdown\MarkdownDocument
- * @covers \Hyde\Framework\Models\Markdown\Markdown
+ * @covers \Hyde\Markdown\Models\MarkdownDocument
+ * @covers \Hyde\Markdown\Models\Markdown
  */
 class MarkdownDocumentTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/MarkdownFacadeTest.php b/packages/framework/tests/Unit/MarkdownFacadeTest.php
index 528e80b6425..3f5a8d20e0d 100644
--- a/packages/framework/tests/Unit/MarkdownFacadeTest.php
+++ b/packages/framework/tests/Unit/MarkdownFacadeTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Testing\TestCase;
 
 /**
  * Class MarkdownConverterTest.
  *
- * @covers \Hyde\Framework\Models\Markdown\Markdown
+ * @covers \Hyde\Markdown\Models\Markdown
  */
 class MarkdownFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/MarkdownPostParserTest.php b/packages/framework/tests/Unit/MarkdownPostParserTest.php
index 03631602057..1763df4ac60 100644
--- a/packages/framework/tests/Unit/MarkdownPostParserTest.php
+++ b/packages/framework/tests/Unit/MarkdownPostParserTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Markdown\FrontMatter;
-use Hyde\Framework\Models\Markdown\Markdown;
 use Hyde\Hyde;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
diff --git a/tests/Benchmarks/MarkdownBenchmark.php b/tests/Benchmarks/MarkdownBenchmark.php
index cef0a357717..33140268afa 100644
--- a/tests/Benchmarks/MarkdownBenchmark.php
+++ b/tests/Benchmarks/MarkdownBenchmark.php
@@ -4,7 +4,7 @@
 
 namespace Tests\Benchmarks;
 
-use Hyde\Framework\Models\Markdown\Markdown;
+use Hyde\Markdown\Models\Markdown;
 
 class MarkdownBenchmark extends BenchCase
 {

From 70d32a9d44328af962beb587bdc21f2e4925d11d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:11:38 +0200
Subject: [PATCH 063/768] Update RouteListCommand.php

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

diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index d11a02bcd26..fe798c73e33 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -51,7 +51,7 @@ protected function getRoutes(): array
 
     protected function formatPageType(string $class): string
     {
-        return str_replace('Hyde\\Framework\\Models\\Pages\\', '', $class);
+        return str_replace('Hyde\\Pages\\', '', $class);
     }
 
     protected function formatSourcePath(string $path): string

From 426e49ccf2bb05deb9616db5c86539362d9b3516 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:14:42 +0200
Subject: [PATCH 064/768] Update BlogPostFrontMatterIsOptionalTest.php

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

diff --git a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
index 3d470195aab..134d752e998 100644
--- a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
+++ b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
@@ -28,7 +28,7 @@ public function test_blog_post_feed_can_be_rendered_when_post_has_no_front_matte
 
         // Create a temporary page to test the feed
         file_put_contents(Hyde::path('_pages/feed-test.blade.php'),
-            '@foreach(\Hyde\Framework\Models\Pages\MarkdownPost::getLatestPosts() as $post)
+            '@foreach(\Hyde\Pages\MarkdownPost::getLatestPosts() as $post)
 				@include(\'hyde::components.article-excerpt\')
 			@endforeach'
         );

From 401d57bbb71a8a008378a46d9e814d849c082d61 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:17:31 +0200
Subject: [PATCH 065/768] Use the component instead of string

---
 .../tests/Unit/BlogPostFrontMatterIsOptionalTest.php          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
index 134d752e998..35f882dea73 100644
--- a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
+++ b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
@@ -28,9 +28,7 @@ public function test_blog_post_feed_can_be_rendered_when_post_has_no_front_matte
 
         // Create a temporary page to test the feed
         file_put_contents(Hyde::path('_pages/feed-test.blade.php'),
-            '@foreach(\Hyde\Pages\MarkdownPost::getLatestPosts() as $post)
-				@include(\'hyde::components.article-excerpt\')
-			@endforeach'
+            file_get_contents(Hyde::vendorPath('resources/views/components/blog-post-feed.blade.php'))
         );
 
         Artisan::call('rebuild _pages/feed-test.blade.php');

From 15203196e5043532bbfa2d1d2762081dfdaf2c73 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Wed, 26 Oct 2022 22:18:00 +0200
Subject: [PATCH 066/768] Use the copy function

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

diff --git a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
index 35f882dea73..57fb5f9363e 100644
--- a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
+++ b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php
@@ -27,8 +27,8 @@ public function test_blog_post_feed_can_be_rendered_when_post_has_no_front_matte
         file_put_contents(Hyde::path('_posts/test-post.md'), '# My New Post');
 
         // Create a temporary page to test the feed
-        file_put_contents(Hyde::path('_pages/feed-test.blade.php'),
-            file_get_contents(Hyde::vendorPath('resources/views/components/blog-post-feed.blade.php'))
+        copy(Hyde::vendorPath('resources/views/components/blog-post-feed.blade.php'),
+            Hyde::path('_pages/feed-test.blade.php')
         );
 
         Artisan::call('rebuild _pages/feed-test.blade.php');

From 2c07e1b04566649cfdac6d63eae17c59dd31a02a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 11:09:27 +0200
Subject: [PATCH 067/768] Move Models\Support namespace to \Hyde\Support

---
 config/app.php                                              | 4 ++--
 .../framework/src/Console/Commands/RouteListCommand.php     | 2 +-
 .../framework/src/Foundation/Concerns/ManagesViewData.php   | 4 ++--
 packages/framework/src/Foundation/FileCollection.php        | 2 +-
 packages/framework/src/Foundation/Filesystem.php            | 2 +-
 packages/framework/src/Foundation/RouteCollection.php       | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php      | 4 ++--
 .../Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 .../src/Framework/Concerns/RegistersFileLocations.php       | 2 +-
 packages/framework/src/Framework/Services/BuildService.php  | 6 +++---
 .../framework/src/Framework/Services/DiscoveryService.php   | 2 +-
 .../framework/src/Framework/Services/SitemapService.php     | 2 +-
 .../framework/src/Framework/Services/ValidationService.php  | 2 +-
 packages/framework/src/Hyde.php                             | 2 +-
 packages/framework/src/Navigation/DocumentationSidebar.php  | 2 +-
 packages/framework/src/Navigation/NavItem.php               | 4 ++--
 packages/framework/src/Navigation/NavigationMenu.php        | 2 +-
 packages/framework/src/Pages/DocumentationPage.php          | 2 +-
 packages/framework/src/Pages/MarkdownPost.php               | 2 +-
 .../src/{Framework/Models => }/Support/DateString.php       | 2 +-
 .../framework/src/{Framework/Models => }/Support/File.php   | 2 +-
 .../framework/src/{Framework/Models => }/Support/Route.php  | 2 +-
 .../framework/src/{Framework/Models => }/Support/Site.php   | 2 +-
 .../src/{Framework/Models => }/Support/ValidationResult.php | 2 +-
 .../tests/Feature/BuildOutputDirectoryCanBeChangedTest.php  | 2 +-
 .../tests/Feature/Commands/BuildSearchCommandTest.php       | 2 +-
 .../tests/Feature/Commands/ValidateCommandTest.php          | 2 +-
 packages/framework/tests/Feature/FileCollectionTest.php     | 2 +-
 packages/framework/tests/Feature/FileTest.php               | 4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php         | 2 +-
 packages/framework/tests/Feature/HydePageTest.php           | 2 +-
 packages/framework/tests/Feature/MarkdownPostTest.php       | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php     | 2 +-
 packages/framework/tests/Feature/RouteCollectionTest.php    | 2 +-
 packages/framework/tests/Feature/RouteTest.php              | 4 ++--
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 2 +-
 .../tests/Feature/Services/ValidationServiceTest.php        | 4 ++--
 packages/framework/tests/Feature/SiteTest.php               | 4 ++--
 packages/framework/tests/Feature/StaticPageBuilderTest.php  | 2 +-
 packages/framework/tests/Feature/StaticSiteServiceTest.php  | 2 +-
 packages/framework/tests/Unit/DateStringTest.php            | 4 ++--
 packages/framework/tests/Unit/DocumentationPageTest.php     | 2 +-
 packages/framework/tests/Unit/HydeFileHelpersTest.php       | 2 +-
 packages/framework/tests/Unit/HydeServiceProviderTest.php   | 2 +-
 packages/framework/tests/Unit/NavItemTest.php               | 2 +-
 .../tests/Unit/Views/Components/LinkComponentTest.php       | 4 ++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 +-
 packages/realtime-compiler/src/Routing/PageRouter.php       | 2 +-
 packages/testing/src/TestCase.php                           | 2 +-
 49 files changed, 61 insertions(+), 61 deletions(-)
 rename packages/framework/src/{Framework/Models => }/Support/DateString.php (96%)
 rename packages/framework/src/{Framework/Models => }/Support/File.php (99%)
 rename packages/framework/src/{Framework/Models => }/Support/Route.php (99%)
 rename packages/framework/src/{Framework/Models => }/Support/Site.php (95%)
 rename packages/framework/src/{Framework/Models => }/Support/ValidationResult.php (98%)

diff --git a/config/app.php b/config/app.php
index 83d12928eb3..db92cc3e598 100644
--- a/config/app.php
+++ b/config/app.php
@@ -95,8 +95,8 @@
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
         'Asset' => Hyde\Framework\Helpers\Asset::class,
-        'Site' => \Hyde\Framework\Models\Support\Site::class,
-        'Route' => \Hyde\Framework\Models\Support\Route::class,
+        'Site' => \Hyde\Support\Site::class,
+        'Route' => \Hyde\Support\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index fe798c73e33..0105af7f6a8 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -36,7 +36,7 @@ public function handle(): int
     protected function getRoutes(): array
     {
         $routes = [];
-        /** @var \Hyde\Framework\Models\Support\Route $route */
+        /** @var \Hyde\Support\Route $route */
         foreach (Hyde::routes() as $route) {
             $routes[] = [
                 $this->formatPageType($route->getPageType()),
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 1996841210b..88682e979c4 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
+use Hyde\Support\Route;
 use Illuminate\Support\Facades\View;
 
 /**
@@ -40,7 +40,7 @@ public function currentPage(): ?string
     /**
      * Get the route for the page being rendered.
      *
-     * @return \Hyde\Framework\Models\Support\Route|null
+     * @return \Hyde\Support\Route|null
      */
     public function currentRoute(): ?Route
     {
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index bfdca343ff7..5877e497679 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -7,13 +7,13 @@
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Support\File;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\File;
 
 /**
  * @see \Hyde\Framework\Foundation\FileCollection
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
index ccbd187acce..de799453dec 100644
--- a/packages/framework/src/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Site;
 
 /**
  * File helper methods, bound to the HydeKernel instance, and is an integral part of the framework.
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index 07bdf3a31a4..d2332e9041f 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
+use Hyde\Support\Route;
 
 /**
  * Pseudo-Router for Hyde.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index fb24b9c8c06..8c472885813 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -9,12 +9,12 @@
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Contracts\CompilableContract;
 use Hyde\Framework\Contracts\FrontMatter\PageSchema;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Metadata\PageMetadataBag;
 use Hyde\Navigation\NavigationData;
+use Hyde\Support\Route;
 use Illuminate\Support\Arr;
 
 /**
@@ -185,7 +185,7 @@ public function getRouteKey(): string
     /**
      * Get the route for the page.
      *
-     * @return \Hyde\Framework\Models\Support\Route The page's route.
+     * @return \Hyde\Support\Route The page's route.
      */
     public function getRoute(): Route
     {
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index a46e1c454ab..306ceb52b13 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -9,9 +9,9 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Models\Support\DateString;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\DateString;
 
 trait ConstructsPageSchemas
 {
diff --git a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
index c9d42abb3ed..018f2e027a9 100644
--- a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
+++ b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Hyde\Framework\Models\Support\Site;
+use Hyde\Support\Site;
 
 /**
  * This trait registers the file paths for important Hyde locations.
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index c9405d6f2ac..8c6d393d719 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -8,9 +8,9 @@
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Models\Support\Route;
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
+use Hyde\Support\Route;
+use Hyde\Support\Site;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Facades\File;
@@ -96,7 +96,7 @@ protected function compilePagesForClass(string $pageClass): void
         $this->newLine(2);
     }
 
-    /** @psalm-return \Closure(\Hyde\Framework\Models\Support\Route):string */
+    /** @psalm-return \Closure(\Hyde\Support\Route):string */
     protected function compileRoute(): Closure
     {
         return function (Route $route) {
diff --git a/packages/framework/src/Framework/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
index bddf5d25425..e10d4753e98 100644
--- a/packages/framework/src/Framework/Services/DiscoveryService.php
+++ b/packages/framework/src/Framework/Services/DiscoveryService.php
@@ -6,12 +6,12 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
-use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\File;
 
 /**
  * The core service that powers all HydePHP file auto-discovery.
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index f4dd283420c..91098743faa 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -7,12 +7,12 @@
 namespace Hyde\Framework\Services;
 
 use Exception;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Route;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 065f7544b16..6e7bc29d001 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Support\ValidationResult as Result;
 use Hyde\Hyde;
+use Hyde\Support\ValidationResult as Result;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 7fd44305fbb..4f7af4a4724 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -10,7 +10,7 @@
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Support\Route;
+use Hyde\Support\Route;
 use Illuminate\Support\Facades\Facade;
 
 /**
diff --git a/packages/framework/src/Navigation/DocumentationSidebar.php b/packages/framework/src/Navigation/DocumentationSidebar.php
index fa639947520..f6926557ffe 100644
--- a/packages/framework/src/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Navigation/DocumentationSidebar.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Navigation;
 
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Navigation/NavItem.php b/packages/framework/src/Navigation/NavItem.php
index b0053cdd20e..5fb0172e3d6 100644
--- a/packages/framework/src/Navigation/NavItem.php
+++ b/packages/framework/src/Navigation/NavItem.php
@@ -5,8 +5,8 @@
 namespace Hyde\Navigation;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Support\Route;
 use Illuminate\Support\Str;
 use Stringable;
 
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  \Hyde\Framework\Models\Support\Route|null  $route
+     * @param  \Hyde\Support\Route|null  $route
      * @param  string  $label
      * @param  int  $priority
      * @param  bool  $hidden
diff --git a/packages/framework/src/Navigation/NavigationMenu.php b/packages/framework/src/Navigation/NavigationMenu.php
index 5cc5f35d3f6..2b5c9451ff1 100644
--- a/packages/framework/src/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Navigation/NavigationMenu.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Navigation;
 
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Route;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index d0cb4eedb87..3f4d6d70aa7 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Framework\Models\Support\Route;
+use Hyde\Support\Route;
 
 /**
  * Page class for documentation pages.
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index fead0f042a3..5b16a535bef 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Models\Support\DateString;
+use Hyde\Support\DateString;
 
 /**
  * Page class for Markdown posts.
diff --git a/packages/framework/src/Framework/Models/Support/DateString.php b/packages/framework/src/Support/DateString.php
similarity index 96%
rename from packages/framework/src/Framework/Models/Support/DateString.php
rename to packages/framework/src/Support/DateString.php
index eceded29a44..37cd9d97209 100644
--- a/packages/framework/src/Framework/Models/Support/DateString.php
+++ b/packages/framework/src/Support/DateString.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Support;
 
 use DateTime;
 use Stringable;
diff --git a/packages/framework/src/Framework/Models/Support/File.php b/packages/framework/src/Support/File.php
similarity index 99%
rename from packages/framework/src/Framework/Models/Support/File.php
rename to packages/framework/src/Support/File.php
index 93f93ad44c4..c60a4c50bbf 100644
--- a/packages/framework/src/Framework/Models/Support/File.php
+++ b/packages/framework/src/Support/File.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Support;
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Framework/Models/Support/Route.php b/packages/framework/src/Support/Route.php
similarity index 99%
rename from packages/framework/src/Framework/Models/Support/Route.php
rename to packages/framework/src/Support/Route.php
index 7cc8407d6e6..1e2183b3fa2 100644
--- a/packages/framework/src/Framework/Models/Support/Route.php
+++ b/packages/framework/src/Support/Route.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Support;
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
diff --git a/packages/framework/src/Framework/Models/Support/Site.php b/packages/framework/src/Support/Site.php
similarity index 95%
rename from packages/framework/src/Framework/Models/Support/Site.php
rename to packages/framework/src/Support/Site.php
index 2e3f6aadb53..15a0175f11c 100644
--- a/packages/framework/src/Framework/Models/Support/Site.php
+++ b/packages/framework/src/Support/Site.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Support;
 
 use Hyde\Metadata\GlobalMetadataBag;
 
diff --git a/packages/framework/src/Framework/Models/Support/ValidationResult.php b/packages/framework/src/Support/ValidationResult.php
similarity index 98%
rename from packages/framework/src/Framework/Models/Support/ValidationResult.php
rename to packages/framework/src/Support/ValidationResult.php
index 2f06e51c753..b7a11e1ce7b 100644
--- a/packages/framework/src/Framework/Models/Support/ValidationResult.php
+++ b/packages/framework/src/Support/ValidationResult.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Models\Support;
+namespace Hyde\Support;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
index b8d7e24fa04..5b7fea9e727 100644
--- a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\RebuildService;
 use Hyde\Hyde;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 97c0fa7b119..3dcb0d093fb 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Feature\Commands;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index c550c0b56b7..2c88dac4042 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Framework\Models\Support\ValidationResult
+ * @covers \Hyde\Support\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
diff --git a/packages/framework/tests/Feature/FileCollectionTest.php b/packages/framework/tests/Feature/FileCollectionTest.php
index 9e589d0220e..0e00bcd3b79 100644
--- a/packages/framework/tests/Feature/FileCollectionTest.php
+++ b/packages/framework/tests/Feature/FileCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Foundation\FileCollection;
-use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\File;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 6b890d62f1d..09727cfba24 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\File;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Support\File;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Support\File
+ * @covers \Hyde\Support\File
  */
 class FileTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 1871f90ac03..5216bebbeee 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -7,12 +7,12 @@
 use Composer\InstalledVersions;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 93bcbe204ee..70fde5dd9ad 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index bd88174ee53..9218b4b1c13 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -6,9 +6,9 @@
 
 use Hyde\Blogging\Models\Author;
 use Hyde\Blogging\Models\FeaturedImage;
-use Hyde\Framework\Models\Support\DateString;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\DateString;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 0cd78f9eab3..b400773e74e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Navigation\NavigationMenu;
 use Hyde\Navigation\NavItem;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 62837300d9e..cb6de428368 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 8b5053bc5b6..cf55d8e96e6 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -6,16 +6,16 @@
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Support\Route
+ * @covers \Hyde\Support\Route
  */
 class RouteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 75707be8f9a..43a3103b5d0 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Navigation\DocumentationSidebar;
 use Hyde\Navigation\NavItem;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 19ea66e166b..ff967641a5e 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -4,16 +4,16 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Models\Support\ValidationResult;
 use Hyde\Framework\Services\ValidationService;
 use Hyde\Hyde;
+use Hyde\Support\ValidationResult;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Framework\Models\Support\ValidationResult
+ * @covers \Hyde\Support\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index af5c6204d78..b48406cbeb4 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Metadata\GlobalMetadataBag;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Support\Site
+ * @covers \Hyde\Support\Site
  */
 class SiteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php
index 8e64eba13eb..3cd519504cd 100644
--- a/packages/framework/tests/Feature/StaticPageBuilderTest.php
+++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index adecf6872d9..9579d59e9c9 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Hyde;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/DateStringTest.php b/packages/framework/tests/Unit/DateStringTest.php
index 698863ffee2..b7e0eb314cd 100644
--- a/packages/framework/tests/Unit/DateStringTest.php
+++ b/packages/framework/tests/Unit/DateStringTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use DateTime;
-use Hyde\Framework\Models\Support\DateString;
+use Hyde\Support\DateString;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Hyde\Framework\Models\Support\DateString
+ * @covers \Hyde\Support\DateString
  */
 class DateStringTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 48204d42ce9..483bc4a7620 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index 86244813fcb..c904a6559fa 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 5b57cfc1e32..2844774dc55 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -6,13 +6,13 @@
 
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
-use Hyde\Framework\Models\Support\Site;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 6ac72c34f9e..77f82f86b64 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Navigation\NavItem;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
index 03891278422..9e1459bb477 100644
--- a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
+++ b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
@@ -20,7 +20,7 @@ public function test_link_component_can_be_rendered()
 
     public function test_link_component_can_be_rendered_with_route()
     {
-        $route = \Hyde\Framework\Models\Support\Route::get('index');
+        $route = \Hyde\Support\Route::get('index');
         $this->assertEquals('<a href="index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
@@ -28,7 +28,7 @@ public function test_link_component_can_be_rendered_with_route()
     public function test_link_component_can_be_rendered_with_route_for_nested_pages()
     {
         View::share('currentPage', 'foo/bar');
-        $route = \Hyde\Framework\Models\Support\Route::get('index');
+        $route = \Hyde\Support\Route::get('index');
         $this->assertEquals('<a href="../index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index e9e22a1d336..06603aca62f 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Navigation\NavItem;
+use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 7097aadd1d2..6b8fb934cf0 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -6,9 +6,9 @@
 use Desilva\Microserve\Response;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
+use Hyde\Support\Route;
 
 /**
  * Handle routing for a web page request.
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 7b430096efb..1341cf0c5bd 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -4,9 +4,9 @@
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Models\Support\Route;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Support\Route;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 

From 00a1ab4837fd5ca2098545b10af47146a7a93bca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 11:11:22 +0200
Subject: [PATCH 068/768] Move Framework\Helpers namespace to \Hyde\Helpers

---
 config/app.php                                |  2 +-
 config/hyde.php                               |  4 +--
 packages/framework/config/hyde.php            |  4 +--
 .../views/components/post/article.blade.php   | 13 ++++----
 .../resources/views/layouts/docs.blade.php    | 33 ++++++++++---------
 .../resources/views/layouts/footer.blade.php  |  2 +-
 .../resources/views/layouts/page.blade.php    | 10 +++---
 .../src/Console/Commands/BuildSiteCommand.php |  2 +-
 .../DataCollectionServiceProvider.php         |  2 +-
 .../src/Foundation/FileCollection.php         |  2 +-
 .../framework/src/Foundation/HydeKernel.php   |  4 +--
 .../src/Foundation/PageCollection.php         |  2 +-
 .../src/Framework/Services/AssetService.php   |  2 +-
 .../Framework/Services/MarkdownService.php    |  2 +-
 .../Services/SemanticDocumentationArticle.php |  2 +-
 .../Framework/Services/ValidationService.php  |  2 +-
 .../src/{Framework => }/Helpers/Asset.php     |  2 +-
 .../src/{Framework => }/Helpers/Features.php  |  2 +-
 .../src/{Framework => }/Helpers/Includes.php  |  2 +-
 .../src/{Framework => }/Helpers/Meta.php      |  2 +-
 .../src/{Framework => }/Helpers/Redirect.php  |  2 +-
 packages/framework/src/Hyde.php               |  2 +-
 .../src/Metadata/GlobalMetadataBag.php        |  4 +--
 .../src/Metadata/PageMetadataBag.php          |  2 +-
 .../Feature/ConfigurableFeaturesTest.php      |  4 +--
 .../tests/Feature/DarkmodeFeatureTest.php     |  6 ++--
 .../tests/Feature/DataCollectionTest.php      |  2 +-
 .../tests/Feature/GlobalMetadataBagTest.php   |  2 +-
 .../tests/Feature/HydeKernelTest.php          |  2 +-
 .../tests/Feature/IncludesFacadeTest.php      |  4 +--
 .../tests/Feature/MetadataHelperTest.php      |  4 +--
 .../framework/tests/Feature/MetadataTest.php  |  2 +-
 .../framework/tests/Feature/RedirectTest.php  |  4 +--
 .../Feature/Services/RssFeedServiceTest.php   |  2 +-
 .../framework/tests/Unit/AssetFacadeTest.php  |  4 +--
 .../tests/Unit/HydeHelperFacadeTest.php       |  2 +-
 .../Unit/Views/StylesComponentViewTest.php    |  2 +-
 37 files changed, 75 insertions(+), 71 deletions(-)
 rename packages/framework/src/{Framework => }/Helpers/Asset.php (94%)
 rename packages/framework/src/{Framework => }/Helpers/Features.php (99%)
 rename packages/framework/src/{Framework => }/Helpers/Includes.php (98%)
 rename packages/framework/src/{Framework => }/Helpers/Meta.php (98%)
 rename packages/framework/src/{Framework => }/Helpers/Redirect.php (96%)

diff --git a/config/app.php b/config/app.php
index db92cc3e598..e8dca5050ab 100644
--- a/config/app.php
+++ b/config/app.php
@@ -94,7 +94,7 @@
 
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
-        'Asset' => Hyde\Framework\Helpers\Asset::class,
+        'Asset' => \Hyde\Helpers\Asset::class,
         'Site' => \Hyde\Support\Site::class,
         'Route' => \Hyde\Support\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
diff --git a/config/hyde.php b/config/hyde.php
index 8336a1cdfb4..09399ce8080 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -12,8 +12,8 @@
 */
 
 use Hyde\Blogging\Models\Author;
-use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Features;
+use Hyde\Helpers\Meta;
 
 return [
     /*
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 8336a1cdfb4..09399ce8080 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -12,8 +12,8 @@
 */
 
 use Hyde\Blogging\Models\Author;
-use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Features;
+use Hyde\Helpers\Meta;
 
 return [
     /*
diff --git a/packages/framework/resources/views/components/post/article.blade.php b/packages/framework/resources/views/components/post/article.blade.php
index 925f53714f0..798b318c6c2 100644
--- a/packages/framework/resources/views/components/post/article.blade.php
+++ b/packages/framework/resources/views/components/post/article.blade.php
@@ -1,15 +1,16 @@
-<article aria-label="Article" id="{{ Hyde::url("posts/$page->identifier", '') }}" itemscope itemtype="http://schema.org/Article"
-    @class(['post-article mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Framework\Helpers\Features::hasTorchlight()])>
+<article aria-label="Article" id="{{ Hyde::url("posts/$page->identifier", '') }}" itemscope
+         itemtype="http://schema.org/Article"
+        @class(['post-article mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Helpers\Features::hasTorchlight()])>
     <meta itemprop="identifier" content="{{ $page->identifier }}">
     @if(Hyde::hasSiteUrl())
-    <meta itemprop="url" content="{{ Hyde::url('posts/' . $page->identifier) }}">
+        <meta itemprop="url" content="{{ Hyde::url('posts/' . $page->identifier) }}">
     @endif
-    
+
     <header aria-label="Header section" role="doc-pageheader">
         <h1 itemprop="headline" class="mb-4">{{ $page->title }}</h1>
-		<div id="byline" aria-label="About the post" role="doc-introduction">
+        <div id="byline" aria-label="About the post" role="doc-introduction">
             @includeWhen(isset($page->date), 'hyde::components.post.date')
-		    @includeWhen(isset($page->author), 'hyde::components.post.author')
+            @includeWhen(isset($page->author), 'hyde::components.post.author')
             @includeWhen(isset($page->category), 'hyde::components.post.category')
         </div>
     </header>
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index 9b026e236ba..227337256f4 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -3,28 +3,31 @@
 <head>
     @include('hyde::layouts.head')
 </head>
-<body id="hyde-docs" class="bg-white dark:bg-gray-900 dark:text-white min-h-screen w-screen relative overflow-x-hidden overflow-y-auto"
+<body id="hyde-docs"
+      class="bg-white dark:bg-gray-900 dark:text-white min-h-screen w-screen relative overflow-x-hidden overflow-y-auto"
       x-data="{ sidebarOpen: false, searchWindowOpen: false }"
       x-on:keydown.escape="searchWindowOpen = false; sidebarOpen = false" x-on:keydown.slash="searchWindowOpen = true">
 
-    @include('hyde::components.skip-to-content-button')
+@include('hyde::components.skip-to-content-button')
 
-    @include('hyde::components.docs.mobile-navigation')
-    @include('hyde::components.docs.sidebar')
+@include('hyde::components.docs.mobile-navigation')
+@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)]">
-        <x-hyde::docs.documentation-article :document="\Hyde\Framework\Services\SemanticDocumentationArticle::create($page, $markdown)"/>
-    </main>
+<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)]">
+    <x-hyde::docs.documentation-article
+            :document="\Hyde\Framework\Services\SemanticDocumentationArticle::create($page, $markdown)"/>
+</main>
 
-    <div id="support">
-        @include('hyde::components.docs.sidebar-backdrop')
+<div id="support">
+    @include('hyde::components.docs.sidebar-backdrop')
 
-        @if(Hyde\Framework\Helpers\Features::hasDocumentationSearch())
-            @include('hyde::components.docs.search-widget')
-            @include('hyde::components.docs.search-scripts')
-        @endif
-    </div>
+    @if(Hyde\Helpers\Features::hasDocumentationSearch())
+        @include('hyde::components.docs.search-widget')
+        @include('hyde::components.docs.search-scripts')
+    @endif
+</div>
 
-    @include('hyde::layouts.scripts')
+@include('hyde::layouts.scripts')
 </body>
 </html>
diff --git a/packages/framework/resources/views/layouts/footer.blade.php b/packages/framework/resources/views/layouts/footer.blade.php
index dba53a65ce7..8a182f357bc 100644
--- a/packages/framework/resources/views/layouts/footer.blade.php
+++ b/packages/framework/resources/views/layouts/footer.blade.php
@@ -1,7 +1,7 @@
 @if(config('hyde.footer') !== false)
     <footer aria-label="Page footer" class="flex py-4 px-6 w-full text-center mt-auto bg-slate-100 dark:bg-gray-800">
         <div class="prose dark:prose-invert text-center mx-auto">
-            {!! \Hyde\Framework\Helpers\Includes::markdown('footer',
+            {!! \Hyde\Helpers\Includes::markdown('footer',
                     config('hyde.footer', 'Site proudly built with [HydePHP](https://github.com/hydephp/hyde) 🎩')) !!}
         </div>
         <a href="#app" aria-label="Go to top of page" class="float-right">
diff --git a/packages/framework/resources/views/layouts/page.blade.php b/packages/framework/resources/views/layouts/page.blade.php
index df1fca295ed..488426d7e95 100644
--- a/packages/framework/resources/views/layouts/page.blade.php
+++ b/packages/framework/resources/views/layouts/page.blade.php
@@ -2,10 +2,10 @@
 @extends('hyde::layouts.app')
 @section('content')
 
-<main id="content" class="mx-auto max-w-7xl py-16 px-8">
-	<article @class(['mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Framework\Helpers\Features::hasTorchlight()])>
-		{!! $markdown !!}
-	</article>
-</main>
+    <main id="content" class="mx-auto max-w-7xl py-16 px-8">
+        <article @class(['mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Helpers\Features::hasTorchlight()])>
+            {!! $markdown !!}
+        </article>
+    </main>
 
 @endsection
diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index ab85fcd7e11..1d2c2286649 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -7,10 +7,10 @@
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
-use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
index 025fedf2be1..9957c158f19 100644
--- a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
@@ -5,7 +5,7 @@
 namespace Hyde\DataCollections;
 
 use Hyde\DataCollections\Facades\MarkdownCollection;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index 5877e497679..df7b092ccef 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -6,8 +6,8 @@
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Services\DiscoveryService;
+use Hyde\Helpers\Features;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index d29622ef8d6..5dd358cdb03 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation;
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
 use JsonSerializable;
@@ -82,7 +82,7 @@ public function hasFeature(string $feature): bool
 
     /**
      * @inheritDoc
-     * @psalm-return array{basePath: string, features: \Hyde\Framework\Helpers\Features, pages: \Hyde\Foundation\PageCollection, routes: \Hyde\Foundation\RouteCollection}
+     * @psalm-return array{basePath: string, features: \Hyde\Helpers\Features, pages: \Hyde\Foundation\PageCollection, routes: \Hyde\Foundation\RouteCollection}
      */
     public function toArray(): array
     {
diff --git a/packages/framework/src/Foundation/PageCollection.php b/packages/framework/src/Foundation/PageCollection.php
index bb675b33a81..98805c840bd 100644
--- a/packages/framework/src/Foundation/PageCollection.php
+++ b/packages/framework/src/Foundation/PageCollection.php
@@ -7,7 +7,7 @@
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index 67cb9dbc4fe..e8ac60fa8ba 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -11,7 +11,7 @@
  *
  * This class is loaded into the service container, making it easy to access and modify.
  *
- * @see \Hyde\Framework\Helpers\Asset
+ * @see \Hyde\Helpers\Asset
  */
 class AssetService
 {
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 5bbd7b02c46..bf26abaafeb 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
 use Hyde\Framework\Contracts\MarkdownPostProcessorContract as PostProcessor;
 use Hyde\Framework\Contracts\MarkdownPreProcessorContract as PreProcessor;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Pages\DocumentationPage;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
diff --git a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
index 2a1fc180bb7..70330eee8ca 100644
--- a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 6e7bc29d001..f2704b38848 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Support\ValidationResult as Result;
 
diff --git a/packages/framework/src/Framework/Helpers/Asset.php b/packages/framework/src/Helpers/Asset.php
similarity index 94%
rename from packages/framework/src/Framework/Helpers/Asset.php
rename to packages/framework/src/Helpers/Asset.php
index 7c1945636c4..c9187bc68ad 100644
--- a/packages/framework/src/Framework/Helpers/Asset.php
+++ b/packages/framework/src/Helpers/Asset.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Helpers;
+namespace Hyde\Helpers;
 
 use Hyde\Framework\Services\AssetService;
 use Illuminate\Support\Facades\Facade;
diff --git a/packages/framework/src/Framework/Helpers/Features.php b/packages/framework/src/Helpers/Features.php
similarity index 99%
rename from packages/framework/src/Framework/Helpers/Features.php
rename to packages/framework/src/Helpers/Features.php
index 42f4092ebc5..128dc498745 100644
--- a/packages/framework/src/Framework/Helpers/Features.php
+++ b/packages/framework/src/Helpers/Features.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Helpers;
+namespace Hyde\Helpers;
 
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Services\DiscoveryService;
diff --git a/packages/framework/src/Framework/Helpers/Includes.php b/packages/framework/src/Helpers/Includes.php
similarity index 98%
rename from packages/framework/src/Framework/Helpers/Includes.php
rename to packages/framework/src/Helpers/Includes.php
index ec4101344a6..87b04bb2df9 100644
--- a/packages/framework/src/Framework/Helpers/Includes.php
+++ b/packages/framework/src/Helpers/Includes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Helpers;
+namespace Hyde\Helpers;
 
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
diff --git a/packages/framework/src/Framework/Helpers/Meta.php b/packages/framework/src/Helpers/Meta.php
similarity index 98%
rename from packages/framework/src/Framework/Helpers/Meta.php
rename to packages/framework/src/Helpers/Meta.php
index 3f2f4f0154f..a5898e3a546 100644
--- a/packages/framework/src/Framework/Helpers/Meta.php
+++ b/packages/framework/src/Helpers/Meta.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Helpers;
+namespace Hyde\Helpers;
 
 use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Metadata\Models\LinkElement;
diff --git a/packages/framework/src/Framework/Helpers/Redirect.php b/packages/framework/src/Helpers/Redirect.php
similarity index 96%
rename from packages/framework/src/Framework/Helpers/Redirect.php
rename to packages/framework/src/Helpers/Redirect.php
index 3d5a8f3e9bd..9179c898778 100644
--- a/packages/framework/src/Framework/Helpers/Redirect.php
+++ b/packages/framework/src/Helpers/Redirect.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Helpers;
+namespace Hyde\Helpers;
 
 use Hyde\Hyde;
 
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 4f7af4a4724..6b178253c2b 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Support\Route;
 use Illuminate\Support\Facades\Facade;
 
diff --git a/packages/framework/src/Metadata/GlobalMetadataBag.php b/packages/framework/src/Metadata/GlobalMetadataBag.php
index 4687c323590..93c9bee1776 100644
--- a/packages/framework/src/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Metadata/GlobalMetadataBag.php
@@ -5,9 +5,9 @@
 namespace Hyde\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Helpers\Features;
-use Hyde\Framework\Helpers\Meta;
 use Hyde\Framework\Services\RssFeedService;
+use Hyde\Helpers\Features;
+use Hyde\Helpers\Meta;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\View;
 
diff --git a/packages/framework/src/Metadata/PageMetadataBag.php b/packages/framework/src/Metadata/PageMetadataBag.php
index 13f1dda3db1..f79d40fa3ab 100644
--- a/packages/framework/src/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Metadata/PageMetadataBag.php
@@ -5,7 +5,7 @@
 namespace Hyde\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPost;
 
 class PageMetadataBag extends MetadataBag
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index e073d472c83..6d36dcc7d07 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Framework\Helpers\Features
+ * @covers \Hyde\Helpers\Features
  */
 class ConfigurableFeaturesTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index fa8a09e52d0..52815d23fa1 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Framework\Helpers\Features::darkmode
- * @covers \Hyde\Framework\Helpers\Features::hasDarkmode
+ * @covers \Hyde\Helpers\Features::darkmode
+ * @covers \Hyde\Helpers\Features::hasDarkmode
  */
 class DarkmodeFeatureTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 696b688a9a1..54b69a563f5 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -7,7 +7,7 @@
 use Hyde\DataCollections\DataCollection;
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\DataCollections\Facades\MarkdownCollection;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Testing\TestCase;
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index 1c6b38380dc..ef89aa08c65 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Meta;
 use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index 5216bebbeee..ed27866ed2b 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -6,7 +6,7 @@
 
 use Composer\InstalledVersions;
 use Hyde\Foundation\HydeKernel;
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index fa4eaa0a1ba..7c2a3a93479 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Includes;
+use Hyde\Helpers\Includes;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Framework\Helpers\Includes
+ * @covers \Hyde\Helpers\Includes
  */
 class IncludesFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataHelperTest.php b/packages/framework/tests/Feature/MetadataHelperTest.php
index 932f98c6c79..84d4f2ef39e 100644
--- a/packages/framework/tests/Feature/MetadataHelperTest.php
+++ b/packages/framework/tests/Feature/MetadataHelperTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Meta;
 use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Helpers\Meta
+ * @covers \Hyde\Helpers\Meta
  */
 class MetadataHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index e630e266108..daa0e24024c 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Helpers\Meta;
+use Hyde\Helpers\Meta;
 use Hyde\Metadata\MetadataBag;
 use Hyde\Metadata\Models\LinkElement;
 use Hyde\Metadata\Models\MetadataElement;
diff --git a/packages/framework/tests/Feature/RedirectTest.php b/packages/framework/tests/Feature/RedirectTest.php
index 66fdabfc207..dcee9623b56 100644
--- a/packages/framework/tests/Feature/RedirectTest.php
+++ b/packages/framework/tests/Feature/RedirectTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Helpers\Redirect;
+use Hyde\Helpers\Redirect;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Helpers\Redirect
+ * @covers \Hyde\Helpers\Redirect
  */
 class RedirectTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index 55816480958..67a652a91a5 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Helpers\Features;
 use Hyde\Framework\Services\RssFeedService;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/AssetFacadeTest.php b/packages/framework/tests/Unit/AssetFacadeTest.php
index 18805217b09..bd08a0903f0 100644
--- a/packages/framework/tests/Unit/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/AssetFacadeTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Helpers\Asset;
 use Hyde\Framework\Services\AssetService;
+use Hyde\Helpers\Asset;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Helpers\Asset
+ * @covers \Hyde\Helpers\Asset
  */
 class AssetFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeTest.php b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
index 2ad4c283784..3c90a6aefd7 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Helpers\Features;
+use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index 67f86c5b1ce..1933499d579 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Helpers\Asset;
+use Hyde\Helpers\Asset;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;

From b130fb648993b6b34c230894ce79c17e518dc14d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 13:38:23 +0200
Subject: [PATCH 069/768] Move contracts to Hyde\Support namespace

---
 .../src/Blogging/Models/FeaturedImage.php          |  2 +-
 .../Constructors/FindsNavigationDataForPage.php    |  2 +-
 .../src/Framework/Concerns/AbstractBuildTask.php   |  2 +-
 .../src/Framework/Concerns/BaseMarkdownPage.php    |  2 +-
 .../framework/src/Framework/Concerns/HydePage.php  |  4 ++--
 .../Concerns/Internal/ConstructsPageSchemas.php    |  2 +-
 .../src/Framework/Services/BuildTaskService.php    |  2 +-
 .../src/Framework/Services/MarkdownService.php     |  4 ++--
 .../framework/src/Markdown/BladeDownProcessor.php  |  4 ++--
 .../src/Markdown/CodeblockFilepathProcessor.php    |  4 ++--
 .../src/Markdown/Models/MarkdownDocument.php       |  2 +-
 .../framework/src/Markdown/ShortcodeProcessor.php  |  4 ++--
 .../src/Markdown/Shortcodes/ColoredBlockquotes.php |  2 +-
 .../framework/src/Navigation/NavigationData.php    |  2 +-
 packages/framework/src/Pages/DocumentationPage.php |  2 +-
 packages/framework/src/Pages/MarkdownPost.php      |  2 +-
 .../Contracts/BuildTaskContract.php                |  2 +-
 .../Contracts/CompilableContract.php               |  2 +-
 .../Contracts/FrontMatter/BlogPostSchema.php       |  4 ++--
 .../FrontMatter/DocumentationPageSchema.php        |  2 +-
 .../Contracts/FrontMatter/PageSchema.php           |  4 ++--
 .../FrontMatter/Support/FeaturedImageSchema.php    |  2 +-
 .../FrontMatter/Support/NavigationSchema.php       |  2 +-
 .../Contracts/MarkdownDocumentContract.php         |  2 +-
 .../Contracts/MarkdownPostProcessorContract.php    |  4 ++--
 .../Contracts/MarkdownPreProcessorContract.php     |  4 ++--
 .../Contracts/MarkdownShortcodeContract.php        |  2 +-
 .../framework/tests/Feature/NavigationDataTest.php |  2 +-
 .../Services/Markdown/ShortcodeProcessorTest.php   |  2 +-
 .../framework/tests/Unit/SchemaContractsTest.php   | 14 +++++++-------
 30 files changed, 45 insertions(+), 45 deletions(-)
 rename packages/framework/src/{Framework => Support}/Contracts/BuildTaskContract.php (91%)
 rename packages/framework/src/{Framework => Support}/Contracts/CompilableContract.php (94%)
 rename packages/framework/src/{Framework => Support}/Contracts/FrontMatter/BlogPostSchema.php (78%)
 rename packages/framework/src/{Framework => Support}/Contracts/FrontMatter/DocumentationPageSchema.php (84%)
 rename packages/framework/src/{Framework => Support}/Contracts/FrontMatter/PageSchema.php (65%)
 rename packages/framework/src/{Framework => Support}/Contracts/FrontMatter/Support/FeaturedImageSchema.php (90%)
 rename packages/framework/src/{Framework => Support}/Contracts/FrontMatter/Support/NavigationSchema.php (85%)
 rename packages/framework/src/{Framework => Support}/Contracts/MarkdownDocumentContract.php (93%)
 rename packages/framework/src/{Framework => Support}/Contracts/MarkdownPostProcessorContract.php (72%)
 rename packages/framework/src/{Framework => Support}/Contracts/MarkdownPreProcessorContract.php (73%)
 rename packages/framework/src/{Framework => Support}/Contracts/MarkdownShortcodeContract.php (87%)

diff --git a/packages/framework/src/Blogging/Models/FeaturedImage.php b/packages/framework/src/Blogging/Models/FeaturedImage.php
index 41ff94bc017..42aa4880d79 100644
--- a/packages/framework/src/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Blogging/Models/FeaturedImage.php
@@ -6,8 +6,8 @@
 
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
-use Hyde\Framework\Contracts\FrontMatter\Support\FeaturedImageSchema;
 use Hyde\Hyde;
+use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index b8f63653303..9414831ba82 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Actions\Constructors;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
 use Hyde\Navigation\NavigationData;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
index 2e6e9889866..bc6d8473443 100644
--- a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Hyde\Framework\Contracts\BuildTaskContract;
 use Hyde\Hyde;
+use Hyde\Support\Contracts\BuildTaskContract;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Throwable;
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index a02ee73f605..2b74d486058 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Hyde\Framework\Contracts\MarkdownDocumentContract;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
+use Hyde\Support\Contracts\MarkdownDocumentContract;
 
 /**
  * The base class for all Markdown-based page models.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 8c472885813..ac606f3e384 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -7,13 +7,13 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
-use Hyde\Framework\Contracts\CompilableContract;
-use Hyde\Framework\Contracts\FrontMatter\PageSchema;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Metadata\PageMetadataBag;
 use Hyde\Navigation\NavigationData;
+use Hyde\Support\Contracts\CompilableContract;
+use Hyde\Support\Contracts\FrontMatter\PageSchema;
 use Hyde\Support\Route;
 use Illuminate\Support\Arr;
 
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 306ceb52b13..dbddf8e89c9 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -8,9 +8,9 @@
 use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
-use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
+use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
 trait ConstructsPageSchemas
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index 0d00f67c684..ad996d79ac6 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
-use Hyde\Framework\Contracts\BuildTaskContract;
 use Hyde\Hyde;
+use Hyde\Support\Contracts\BuildTaskContract;
 use Illuminate\Console\OutputStyle;
 
 /**
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index bf26abaafeb..1f6241962ca 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -6,10 +6,10 @@
 
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
-use Hyde\Framework\Contracts\MarkdownPostProcessorContract as PostProcessor;
-use Hyde\Framework\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use Hyde\Helpers\Features;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Contracts\MarkdownPostProcessorContract as PostProcessor;
+use Hyde\Support\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
 
diff --git a/packages/framework/src/Markdown/BladeDownProcessor.php b/packages/framework/src/Markdown/BladeDownProcessor.php
index b3df0e6a8fc..c649359c27b 100644
--- a/packages/framework/src/Markdown/BladeDownProcessor.php
+++ b/packages/framework/src/Markdown/BladeDownProcessor.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Markdown;
 
-use Hyde\Framework\Contracts\MarkdownPostProcessorContract;
-use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
+use Hyde\Support\Contracts\MarkdownPostProcessorContract;
+use Hyde\Support\Contracts\MarkdownPreProcessorContract;
 use Illuminate\Support\Facades\Blade;
 
 /**
diff --git a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
index 7e22fb25ac1..f28a8b75d60 100644
--- a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
+++ b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Markdown;
 
-use Hyde\Framework\Contracts\MarkdownPostProcessorContract;
-use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
+use Hyde\Support\Contracts\MarkdownPostProcessorContract;
+use Hyde\Support\Contracts\MarkdownPreProcessorContract;
 
 /**
  * Resolves file path comments found in Markdown code blocks into a neat badge shown in the top right corner.
diff --git a/packages/framework/src/Markdown/Models/MarkdownDocument.php b/packages/framework/src/Markdown/Models/MarkdownDocument.php
index eeb9f5457eb..07d8ea971f9 100644
--- a/packages/framework/src/Markdown/Models/MarkdownDocument.php
+++ b/packages/framework/src/Markdown/Models/MarkdownDocument.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Framework\Contracts\MarkdownDocumentContract;
+use Hyde\Support\Contracts\MarkdownDocumentContract;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Markdown/ShortcodeProcessor.php b/packages/framework/src/Markdown/ShortcodeProcessor.php
index 6f122d2df5b..789a40412a8 100644
--- a/packages/framework/src/Markdown/ShortcodeProcessor.php
+++ b/packages/framework/src/Markdown/ShortcodeProcessor.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Markdown;
 
-use Hyde\Framework\Contracts\MarkdownPreProcessorContract;
-use Hyde\Framework\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
+use Hyde\Support\Contracts\MarkdownPreProcessorContract;
+use Hyde\Support\Contracts\MarkdownShortcodeContract;
 
 /**
  * Handle all shortcode processing for a Markdown conversion.
diff --git a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
index fb846e96ab9..f743df507b5 100644
--- a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
+++ b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Markdown\Shortcodes;
 
-use Hyde\Framework\Contracts\MarkdownShortcodeContract;
+use Hyde\Support\Contracts\MarkdownShortcodeContract;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\ColoredBlockquoteShortcodesTest
diff --git a/packages/framework/src/Navigation/NavigationData.php b/packages/framework/src/Navigation/NavigationData.php
index 3fc61582229..64c2baccf24 100644
--- a/packages/framework/src/Navigation/NavigationData.php
+++ b/packages/framework/src/Navigation/NavigationData.php
@@ -6,7 +6,7 @@
 
 use ArrayObject;
 use Hyde\Framework\Concerns\JsonSerializesArrayable;
-use Hyde\Framework\Contracts\FrontMatter\Support\NavigationSchema;
+use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 3f4d6d70aa7..bad6ddad77b 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
 use Hyde\Support\Route;
 
 /**
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 5b16a535bef..c7648f3be2c 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -8,7 +8,7 @@
 use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
 /**
diff --git a/packages/framework/src/Framework/Contracts/BuildTaskContract.php b/packages/framework/src/Support/Contracts/BuildTaskContract.php
similarity index 91%
rename from packages/framework/src/Framework/Contracts/BuildTaskContract.php
rename to packages/framework/src/Support/Contracts/BuildTaskContract.php
index 139c1ae97d5..ce59f2a230d 100644
--- a/packages/framework/src/Framework/Contracts/BuildTaskContract.php
+++ b/packages/framework/src/Support/Contracts/BuildTaskContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 use Illuminate\Console\OutputStyle;
 
diff --git a/packages/framework/src/Framework/Contracts/CompilableContract.php b/packages/framework/src/Support/Contracts/CompilableContract.php
similarity index 94%
rename from packages/framework/src/Framework/Contracts/CompilableContract.php
rename to packages/framework/src/Support/Contracts/CompilableContract.php
index 8867f48c1dc..b0f871e8f6c 100644
--- a/packages/framework/src/Framework/Contracts/CompilableContract.php
+++ b/packages/framework/src/Support/Contracts/CompilableContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 interface CompilableContract
 {
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
similarity index 78%
rename from packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
index 5302fc13bbb..353a8073be8 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/BlogPostSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts\FrontMatter;
+namespace Hyde\Support\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Pages\MarkdownPost
  */
-interface BlogPostSchema extends Support\FeaturedImageSchema
+interface BlogPostSchema extends \Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema
 {
     public const MARKDOWN_POST_SCHEMA = [
         'title'        => 'string',
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php
similarity index 84%
rename from packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php
index 6f008ca910c..2f185462a63 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/DocumentationPageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts\FrontMatter;
+namespace Hyde\Support\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Pages\DocumentationPage
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
similarity index 65%
rename from packages/framework/src/Framework/Contracts/FrontMatter/PageSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
index 4f33b7e31d5..6a6e90b8fb2 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/PageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts\FrontMatter;
+namespace Hyde\Support\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Framework\Concerns\HydePage
  */
-interface PageSchema extends Support\NavigationSchema
+interface PageSchema extends \Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema
 {
     public const PAGE_SCHEMA = [
         'title'         => 'string',
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
similarity index 90%
rename from packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
index 62ab3510306..953119f0fac 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts\FrontMatter\Support;
+namespace Hyde\Support\Contracts\FrontMatter\Support;
 
 /**
  * @see \Hyde\Blogging\Models\FeaturedImage
diff --git a/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
similarity index 85%
rename from packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
index e8843d892df..2c94fd2c5d9 100644
--- a/packages/framework/src/Framework/Contracts/FrontMatter/Support/NavigationSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts\FrontMatter\Support;
+namespace Hyde\Support\Contracts\FrontMatter\Support;
 
 /**
  * @see \Hyde\Navigation\NavigationData
diff --git a/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php b/packages/framework/src/Support/Contracts/MarkdownDocumentContract.php
similarity index 93%
rename from packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
rename to packages/framework/src/Support/Contracts/MarkdownDocumentContract.php
index 43e45b1d2fb..2a271fd821b 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownDocumentContract.php
+++ b/packages/framework/src/Support/Contracts/MarkdownDocumentContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 use Hyde\Markdown\Models\Markdown;
 
diff --git a/packages/framework/src/Framework/Contracts/MarkdownPostProcessorContract.php b/packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php
similarity index 72%
rename from packages/framework/src/Framework/Contracts/MarkdownPostProcessorContract.php
rename to packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php
index cf3aa5ad7e8..476a2165853 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownPostProcessorContract.php
+++ b/packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 /**
  * Process Markdown after it is converted to HTML.
  *
- * @see \Hyde\Framework\Contracts\MarkdownPreProcessorContract for pre-processing
+ * @see \Hyde\Support\Contracts\MarkdownPreProcessorContract for pre-processing
  */
 interface MarkdownPostProcessorContract
 {
diff --git a/packages/framework/src/Framework/Contracts/MarkdownPreProcessorContract.php b/packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php
similarity index 73%
rename from packages/framework/src/Framework/Contracts/MarkdownPreProcessorContract.php
rename to packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php
index d81fe076401..8e93c097b53 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownPreProcessorContract.php
+++ b/packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 /**
  * Process Markdown before it is converted to HTML.
  *
- * @see \Hyde\Framework\Contracts\MarkdownPostProcessorContract for post-processing
+ * @see \Hyde\Support\Contracts\MarkdownPostProcessorContract for post-processing
  */
 interface MarkdownPreProcessorContract
 {
diff --git a/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php b/packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php
similarity index 87%
rename from packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
rename to packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php
index b7e5e0eecf1..596e273e5cc 100644
--- a/packages/framework/src/Framework/Contracts/MarkdownShortcodeContract.php
+++ b/packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Contracts;
+namespace Hyde\Support\Contracts;
 
 /**
  * @see \Hyde\Markdown\ShortcodeProcessor to see how this is used.
diff --git a/packages/framework/tests/Feature/NavigationDataTest.php b/packages/framework/tests/Feature/NavigationDataTest.php
index 520dbf180fc..62f1795cad3 100644
--- a/packages/framework/tests/Feature/NavigationDataTest.php
+++ b/packages/framework/tests/Feature/NavigationDataTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Contracts\FrontMatter\Support\NavigationSchema;
 use Hyde\Navigation\NavigationData;
+use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 4a72e001206..d431abad555 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Framework\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\ShortcodeProcessor;
+use Hyde\Support\Contracts\MarkdownShortcodeContract;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index f56115c26c3..8f5f9739c4a 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -4,19 +4,19 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Framework\Contracts\FrontMatter\PageSchema;
-use Hyde\Framework\Contracts\FrontMatter\Support\NavigationSchema;
+use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Support\Contracts\FrontMatter\PageSchema;
+use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
  * A state test to ensure the schemas can't be changed without breaking the tests.
  * This requires contributors to consider the impact of their changes as schema changes are rarely backwards compatible.
  *
- * @see \Hyde\Framework\Contracts\FrontMatter\PageSchema
- * @see \Hyde\Framework\Contracts\FrontMatter\BlogPostSchema
- * @see \Hyde\Framework\Contracts\FrontMatter\DocumentationPageSchema
+ * @see \Hyde\Support\Contracts\FrontMatter\PageSchema
+ * @see \Hyde\Support\Contracts\FrontMatter\BlogPostSchema
+ * @see \Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema
  */
 class SchemaContractsTest extends TestCase
 {

From c9b148bb75e27eba7a0f3245431e168e9fc96cd9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 13:39:24 +0200
Subject: [PATCH 070/768] Move Markdown contracts to Markdown\Contracts
 namespace

---
 .../framework/src/Framework/Concerns/BaseMarkdownPage.php     | 2 +-
 packages/framework/src/Framework/Services/MarkdownService.php | 4 ++--
 packages/framework/src/Markdown/BladeDownProcessor.php        | 4 ++--
 .../framework/src/Markdown/CodeblockFilepathProcessor.php     | 4 ++--
 .../Contracts/MarkdownDocumentContract.php                    | 2 +-
 .../Contracts/MarkdownPostProcessorContract.php               | 4 ++--
 .../Contracts/MarkdownPreProcessorContract.php                | 4 ++--
 .../Contracts/MarkdownShortcodeContract.php                   | 2 +-
 packages/framework/src/Markdown/Models/MarkdownDocument.php   | 2 +-
 packages/framework/src/Markdown/ShortcodeProcessor.php        | 4 ++--
 .../framework/src/Markdown/Shortcodes/ColoredBlockquotes.php  | 2 +-
 .../Feature/Services/Markdown/ShortcodeProcessorTest.php      | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)
 rename packages/framework/src/{Support => Markdown}/Contracts/MarkdownDocumentContract.php (93%)
 rename packages/framework/src/{Support => Markdown}/Contracts/MarkdownPostProcessorContract.php (73%)
 rename packages/framework/src/{Support => Markdown}/Contracts/MarkdownPreProcessorContract.php (74%)
 rename packages/framework/src/{Support => Markdown}/Contracts/MarkdownShortcodeContract.php (88%)

diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index 2b74d486058..a043ff6656d 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Hyde;
+use Hyde\Markdown\Contracts\MarkdownDocumentContract;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Support\Contracts\MarkdownDocumentContract;
 
 /**
  * The base class for all Markdown-based page models.
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 1f6241962ca..453fb379c75 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -7,9 +7,9 @@
 use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
 use Hyde\Helpers\Features;
+use Hyde\Markdown\Contracts\MarkdownPostProcessorContract as PostProcessor;
+use Hyde\Markdown\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Contracts\MarkdownPostProcessorContract as PostProcessor;
-use Hyde\Support\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
 
diff --git a/packages/framework/src/Markdown/BladeDownProcessor.php b/packages/framework/src/Markdown/BladeDownProcessor.php
index c649359c27b..1796c28e552 100644
--- a/packages/framework/src/Markdown/BladeDownProcessor.php
+++ b/packages/framework/src/Markdown/BladeDownProcessor.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Markdown;
 
-use Hyde\Support\Contracts\MarkdownPostProcessorContract;
-use Hyde\Support\Contracts\MarkdownPreProcessorContract;
+use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
+use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
 use Illuminate\Support\Facades\Blade;
 
 /**
diff --git a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
index f28a8b75d60..a8f09e9876f 100644
--- a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
+++ b/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Markdown;
 
-use Hyde\Support\Contracts\MarkdownPostProcessorContract;
-use Hyde\Support\Contracts\MarkdownPreProcessorContract;
+use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
+use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
 
 /**
  * Resolves file path comments found in Markdown code blocks into a neat badge shown in the top right corner.
diff --git a/packages/framework/src/Support/Contracts/MarkdownDocumentContract.php b/packages/framework/src/Markdown/Contracts/MarkdownDocumentContract.php
similarity index 93%
rename from packages/framework/src/Support/Contracts/MarkdownDocumentContract.php
rename to packages/framework/src/Markdown/Contracts/MarkdownDocumentContract.php
index 2a271fd821b..6155a552639 100644
--- a/packages/framework/src/Support/Contracts/MarkdownDocumentContract.php
+++ b/packages/framework/src/Markdown/Contracts/MarkdownDocumentContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts;
+namespace Hyde\Markdown\Contracts;
 
 use Hyde\Markdown\Models\Markdown;
 
diff --git a/packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php b/packages/framework/src/Markdown/Contracts/MarkdownPostProcessorContract.php
similarity index 73%
rename from packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php
rename to packages/framework/src/Markdown/Contracts/MarkdownPostProcessorContract.php
index 476a2165853..9d6fe3a0c54 100644
--- a/packages/framework/src/Support/Contracts/MarkdownPostProcessorContract.php
+++ b/packages/framework/src/Markdown/Contracts/MarkdownPostProcessorContract.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts;
+namespace Hyde\Markdown\Contracts;
 
 /**
  * Process Markdown after it is converted to HTML.
  *
- * @see \Hyde\Support\Contracts\MarkdownPreProcessorContract for pre-processing
+ * @see \Hyde\Markdown\Contracts\MarkdownPreProcessorContract for pre-processing
  */
 interface MarkdownPostProcessorContract
 {
diff --git a/packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php b/packages/framework/src/Markdown/Contracts/MarkdownPreProcessorContract.php
similarity index 74%
rename from packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php
rename to packages/framework/src/Markdown/Contracts/MarkdownPreProcessorContract.php
index 8e93c097b53..d9f3255e992 100644
--- a/packages/framework/src/Support/Contracts/MarkdownPreProcessorContract.php
+++ b/packages/framework/src/Markdown/Contracts/MarkdownPreProcessorContract.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts;
+namespace Hyde\Markdown\Contracts;
 
 /**
  * Process Markdown before it is converted to HTML.
  *
- * @see \Hyde\Support\Contracts\MarkdownPostProcessorContract for post-processing
+ * @see \Hyde\Markdown\Contracts\MarkdownPostProcessorContract for post-processing
  */
 interface MarkdownPreProcessorContract
 {
diff --git a/packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php b/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
similarity index 88%
rename from packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php
rename to packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
index 596e273e5cc..beb4aef95b9 100644
--- a/packages/framework/src/Support/Contracts/MarkdownShortcodeContract.php
+++ b/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts;
+namespace Hyde\Markdown\Contracts;
 
 /**
  * @see \Hyde\Markdown\ShortcodeProcessor to see how this is used.
diff --git a/packages/framework/src/Markdown/Models/MarkdownDocument.php b/packages/framework/src/Markdown/Models/MarkdownDocument.php
index 07d8ea971f9..4d45e62dee0 100644
--- a/packages/framework/src/Markdown/Models/MarkdownDocument.php
+++ b/packages/framework/src/Markdown/Models/MarkdownDocument.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
-use Hyde\Support\Contracts\MarkdownDocumentContract;
+use Hyde\Markdown\Contracts\MarkdownDocumentContract;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Markdown/ShortcodeProcessor.php b/packages/framework/src/Markdown/ShortcodeProcessor.php
index 789a40412a8..e15949b0f2d 100644
--- a/packages/framework/src/Markdown/ShortcodeProcessor.php
+++ b/packages/framework/src/Markdown/ShortcodeProcessor.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Markdown;
 
+use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
+use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
-use Hyde\Support\Contracts\MarkdownPreProcessorContract;
-use Hyde\Support\Contracts\MarkdownShortcodeContract;
 
 /**
  * Handle all shortcode processing for a Markdown conversion.
diff --git a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
index f743df507b5..f9893ed3224 100644
--- a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
+++ b/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Markdown\Shortcodes;
 
-use Hyde\Support\Contracts\MarkdownShortcodeContract;
+use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\ColoredBlockquoteShortcodesTest
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index d431abad555..102978173cb 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
+use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 use Hyde\Markdown\ShortcodeProcessor;
-use Hyde\Support\Contracts\MarkdownShortcodeContract;
 use Hyde\Testing\TestCase;
 
 /**

From 9dbc0dad660f35bf1600bcf4dfb68cdee60b2b5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 13:45:52 +0200
Subject: [PATCH 071/768] Move generic trait to Support namespace

---
 packages/framework/src/Foundation/HydeKernel.php              | 2 +-
 packages/framework/src/Helpers/Features.php                   | 2 +-
 packages/framework/src/Markdown/Models/FrontMatter.php        | 2 +-
 packages/framework/src/Navigation/NavigationData.php          | 2 +-
 .../Concerns/JsonSerializesArrayable.php                      | 2 +-
 packages/framework/src/Support/File.php                       | 2 +-
 packages/framework/src/Support/Route.php                      | 2 +-
 packages/framework/tests/Unit/JsonSerializesArrayableTest.php | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/framework/src/{Framework => Support}/Concerns/JsonSerializesArrayable.php (93%)

diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 5dd358cdb03..7a916b75f07 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Helpers\Features;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
 use JsonSerializable;
diff --git a/packages/framework/src/Helpers/Features.php b/packages/framework/src/Helpers/Features.php
index 128dc498745..5e74cad02c5 100644
--- a/packages/framework/src/Helpers/Features.php
+++ b/packages/framework/src/Helpers/Features.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Helpers;
 
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 use JsonSerializable;
diff --git a/packages/framework/src/Markdown/Models/FrontMatter.php b/packages/framework/src/Markdown/Models/FrontMatter.php
index 82442c26176..067cc3e4c40 100644
--- a/packages/framework/src/Markdown/Models/FrontMatter.php
+++ b/packages/framework/src/Markdown/Models/FrontMatter.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Models;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 use JsonSerializable;
diff --git a/packages/framework/src/Navigation/NavigationData.php b/packages/framework/src/Navigation/NavigationData.php
index 64c2baccf24..55ae3073d3a 100644
--- a/packages/framework/src/Navigation/NavigationData.php
+++ b/packages/framework/src/Navigation/NavigationData.php
@@ -5,7 +5,7 @@
 namespace Hyde\Navigation;
 
 use ArrayObject;
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
diff --git a/packages/framework/src/Framework/Concerns/JsonSerializesArrayable.php b/packages/framework/src/Support/Concerns/JsonSerializesArrayable.php
similarity index 93%
rename from packages/framework/src/Framework/Concerns/JsonSerializesArrayable.php
rename to packages/framework/src/Support/Concerns/JsonSerializesArrayable.php
index 6e905dfccc1..489bd5204b9 100644
--- a/packages/framework/src/Framework/Concerns/JsonSerializesArrayable.php
+++ b/packages/framework/src/Support/Concerns/JsonSerializesArrayable.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Concerns;
+namespace Hyde\Support\Concerns;
 
 /**
  * Automatically serializes an Arrayable interface when JSON is requested.
diff --git a/packages/framework/src/Support/File.php b/packages/framework/src/Support/File.php
index c60a4c50bbf..d5e834cd73b 100644
--- a/packages/framework/src/Support/File.php
+++ b/packages/framework/src/Support/File.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Support;
 
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Hyde;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
diff --git a/packages/framework/src/Support/Route.php b/packages/framework/src/Support/Route.php
index 1e2183b3fa2..32d9530b195 100644
--- a/packages/framework/src/Support/Route.php
+++ b/packages/framework/src/Support/Route.php
@@ -6,9 +6,9 @@
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
diff --git a/packages/framework/tests/Unit/JsonSerializesArrayableTest.php b/packages/framework/tests/Unit/JsonSerializesArrayableTest.php
index 6e2c67f0963..1e932043ccd 100644
--- a/packages/framework/tests/Unit/JsonSerializesArrayableTest.php
+++ b/packages/framework/tests/Unit/JsonSerializesArrayableTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Concerns\JsonSerializesArrayable
+ * @covers \Hyde\Support\Concerns\JsonSerializesArrayable
  */
 class JsonSerializesArrayableTest extends TestCase
 {

From a4b946a8532283f9b6618fb9a0cebc82244e430e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 13:47:27 +0200
Subject: [PATCH 072/768] Move Markdown processing classes to Processing
 subnamespace

---
 .../Internal/SetsUpMarkdownConverter.php      |  6 ++---
 .../Contracts/MarkdownShortcodeContract.php   |  2 +-
 .../{ => Processing}/BladeDownProcessor.php   |  2 +-
 .../CodeblockFilepathProcessor.php            |  2 +-
 .../ColoredBlockquotes.php                    |  2 +-
 .../{ => Processing}/ShortcodeProcessor.php   |  3 +--
 .../ColoredBlockquoteShortcodesTest.php       |  4 ++--
 .../Services/BladeDownProcessorTest.php       |  4 ++--
 .../CodeblockFilepathProcessorTest.php        | 22 +++++++++----------
 .../Markdown/ShortcodeProcessorTest.php       | 13 +++++------
 10 files changed, 29 insertions(+), 31 deletions(-)
 rename packages/framework/src/Markdown/{ => Processing}/BladeDownProcessor.php (98%)
 rename packages/framework/src/Markdown/{ => Processing}/CodeblockFilepathProcessor.php (99%)
 rename packages/framework/src/Markdown/{Shortcodes => Processing}/ColoredBlockquotes.php (97%)
 rename packages/framework/src/Markdown/{ => Processing}/ShortcodeProcessor.php (97%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
index a016487bce9..e2d539c8968 100644
--- a/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
+++ b/packages/framework/src/Framework/Concerns/Internal/SetsUpMarkdownConverter.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
-use Hyde\Markdown\BladeDownProcessor;
-use Hyde\Markdown\CodeblockFilepathProcessor;
-use Hyde\Markdown\ShortcodeProcessor;
+use Hyde\Markdown\Processing\BladeDownProcessor;
+use Hyde\Markdown\Processing\CodeblockFilepathProcessor;
+use Hyde\Markdown\Processing\ShortcodeProcessor;
 use Torchlight\Commonmark\V2\TorchlightExtension;
 
 /**
diff --git a/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php b/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
index beb4aef95b9..329368f1ad7 100644
--- a/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
+++ b/packages/framework/src/Markdown/Contracts/MarkdownShortcodeContract.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Contracts;
 
 /**
- * @see \Hyde\Markdown\ShortcodeProcessor to see how this is used.
+ * @see \Hyde\Markdown\Processing\ShortcodeProcessor to see how this is used.
  */
 interface MarkdownShortcodeContract
 {
diff --git a/packages/framework/src/Markdown/BladeDownProcessor.php b/packages/framework/src/Markdown/Processing/BladeDownProcessor.php
similarity index 98%
rename from packages/framework/src/Markdown/BladeDownProcessor.php
rename to packages/framework/src/Markdown/Processing/BladeDownProcessor.php
index 1796c28e552..cd155c14411 100644
--- a/packages/framework/src/Markdown/BladeDownProcessor.php
+++ b/packages/framework/src/Markdown/Processing/BladeDownProcessor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Markdown;
+namespace Hyde\Markdown\Processing;
 
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
diff --git a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php b/packages/framework/src/Markdown/Processing/CodeblockFilepathProcessor.php
similarity index 99%
rename from packages/framework/src/Markdown/CodeblockFilepathProcessor.php
rename to packages/framework/src/Markdown/Processing/CodeblockFilepathProcessor.php
index a8f09e9876f..cc2577291aa 100644
--- a/packages/framework/src/Markdown/CodeblockFilepathProcessor.php
+++ b/packages/framework/src/Markdown/Processing/CodeblockFilepathProcessor.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Markdown;
+namespace Hyde\Markdown\Processing;
 
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract;
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
diff --git a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php b/packages/framework/src/Markdown/Processing/ColoredBlockquotes.php
similarity index 97%
rename from packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
rename to packages/framework/src/Markdown/Processing/ColoredBlockquotes.php
index f9893ed3224..62de816768e 100644
--- a/packages/framework/src/Markdown/Shortcodes/ColoredBlockquotes.php
+++ b/packages/framework/src/Markdown/Processing/ColoredBlockquotes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Markdown\Shortcodes;
+namespace Hyde\Markdown\Processing;
 
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
 
diff --git a/packages/framework/src/Markdown/ShortcodeProcessor.php b/packages/framework/src/Markdown/Processing/ShortcodeProcessor.php
similarity index 97%
rename from packages/framework/src/Markdown/ShortcodeProcessor.php
rename to packages/framework/src/Markdown/Processing/ShortcodeProcessor.php
index e15949b0f2d..959880bc066 100644
--- a/packages/framework/src/Markdown/ShortcodeProcessor.php
+++ b/packages/framework/src/Markdown/Processing/ShortcodeProcessor.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Markdown;
+namespace Hyde\Markdown\Processing;
 
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract;
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
-use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
 
 /**
  * Handle all shortcode processing for a Markdown conversion.
diff --git a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
index b142a2c58f0..318c35999a2 100644
--- a/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
+++ b/packages/framework/tests/Feature/ColoredBlockquoteShortcodesTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Markdown\Shortcodes\ColoredBlockquotes;
+use Hyde\Markdown\Processing\ColoredBlockquotes;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ColoredBlockquoteShortcodesTest.
  *
- * @covers \Hyde\Markdown\Shortcodes\ColoredBlockquotes
+ * @covers \Hyde\Markdown\Processing\ColoredBlockquotes
  */
 class ColoredBlockquoteShortcodesTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php b/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
index 21a38012551..f7d26d277b5 100644
--- a/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/BladeDownProcessorTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Markdown\BladeDownProcessor;
+use Hyde\Markdown\Processing\BladeDownProcessor;
 use Hyde\Testing\TestCase;
 
 /**
  * Class BladeDownProcessorTest.
  *
- * @covers \Hyde\Markdown\BladeDownProcessor
+ * @covers \Hyde\Markdown\Processing\BladeDownProcessor
  */
 class BladeDownProcessorTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
index 90facf347f2..20ce1e05382 100644
--- a/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/CodeblockFilepathProcessorTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
-use Hyde\Markdown\CodeblockFilepathProcessor;
+use Hyde\Markdown\Processing\CodeblockFilepathProcessor;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Markdown\CodeblockFilepathProcessor
+ * @covers \Hyde\Markdown\Processing\CodeblockFilepathProcessor
  */
 class CodeblockFilepathProcessorTest extends TestCase
 {
@@ -37,7 +37,7 @@ public function test_preprocess_accepts_multiple_filepath_formats()
             $markdown = "\n```php\n{$pattern}foo.php\necho 'Hello World';\n```";
             $expected = "\n<!-- HYDE[Filepath]foo.php -->\n```php\necho 'Hello World';\n```";
 
-            $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+            $this->assertEquals($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
         }
     }
 
@@ -55,10 +55,10 @@ public function test_preprocess_accepts_multiple_languages()
             $markdown = "\n```{$language}\n// filepath: foo.{$language}\nfoo\n```";
             $expected = "\n<!-- HYDE[Filepath]foo.{$language} -->\n```{$language}\nfoo\n```";
 
-            $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+            $this->assertEquals($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
         }
 
-        $this->assertEquals($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEquals($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_preprocess_accepts_multiple_input_blocks()
@@ -89,7 +89,7 @@ public function test_preprocess_accepts_multiple_input_blocks()
         ```
         MD;
 
-        $this->assertEqualsIgnoringLineReturnType($expected, CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_preprocess_accepts_multi_line_codeblocks()
@@ -114,7 +114,7 @@ public function test_preprocess_accepts_multi_line_codeblocks()
         ```
         MD;
 
-        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_space_after_filepath_is_optional()
@@ -136,8 +136,8 @@ public function test_space_after_filepath_is_optional()
         ```
         MD;
 
-        $this->assertEqualsIgnoringLineReturnType(\Hyde\Markdown\CodeblockFilepathProcessor::preprocess($expected),
-            \Hyde\Markdown\CodeblockFilepathProcessor::preprocess($markdown));
+        $this->assertEqualsIgnoringLineReturnType(\Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($expected),
+            \Hyde\Markdown\Processing\CodeblockFilepathProcessor::preprocess($markdown));
     }
 
     public function test_processor_expands_filepath_directive_in_standard_codeblock()
@@ -151,7 +151,7 @@ public function test_processor_expands_filepath_directive_in_standard_codeblock(
         <pre><code class="language-html"><small class="filepath"><span class="sr-only">Filepath: </span>foo.html</small></code></pre>
         HTML;
 
-        $this->assertEqualsIgnoringLineReturnType($expected, CodeblockFilepathProcessor::postprocess($html));
+        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::postprocess($html));
     }
 
     public function test_processor_expands_filepath_directive_in_torchlight_codeblock()
@@ -165,7 +165,7 @@ public function test_processor_expands_filepath_directive_in_torchlight_codebloc
         <pre><code class="torchlight"><!-- Syntax highlighted by torchlight.dev --><small class="filepath"><span class="sr-only">Filepath: </span>foo.html</small><div class="line"><span class="line-number">1</span>&nbsp;</div></code></pre>
         HTML;
 
-        $this->assertEqualsIgnoringLineReturnType($expected, CodeblockFilepathProcessor::postprocess($html));
+        $this->assertEqualsIgnoringLineReturnType($expected, \Hyde\Markdown\Processing\CodeblockFilepathProcessor::postprocess($html));
     }
 
     protected function assertEqualsIgnoringLineReturnType(string $expected, string $actual)
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 102978173cb..8951c30fb9e 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -5,17 +5,16 @@
 namespace Hyde\Framework\Testing\Feature\Services\Markdown;
 
 use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
-use Hyde\Markdown\ShortcodeProcessor;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Markdown\ShortcodeProcessor
+ * @covers \Hyde\Markdown\Processing\ShortcodeProcessor
  */
 class ShortcodeProcessorTest extends TestCase
 {
     public function test_constructor_discovers_default_shortcodes()
     {
-        $shortcodes = (new ShortcodeProcessor('foo'))->shortcodes;
+        $shortcodes = (new \Hyde\Markdown\Processing\ShortcodeProcessor('foo'))->shortcodes;
 
         $this->assertCount(4, $shortcodes);
         $this->assertContainsOnlyInstancesOf(MarkdownShortcodeContract::class, $shortcodes);
@@ -23,7 +22,7 @@ public function test_constructor_discovers_default_shortcodes()
 
     public function test_discovered_shortcodes_are_used_to_process_input()
     {
-        $processor = new \Hyde\Markdown\ShortcodeProcessor('>info foo');
+        $processor = new \Hyde\Markdown\Processing\ShortcodeProcessor('>info foo');
 
         $this->assertEquals('<blockquote class="info">foo</blockquote>',
             $processor->run());
@@ -31,7 +30,7 @@ public function test_discovered_shortcodes_are_used_to_process_input()
 
     public function test_string_without_shortcode_is_not_modified()
     {
-        $processor = new \Hyde\Markdown\ShortcodeProcessor('foo');
+        $processor = new \Hyde\Markdown\Processing\ShortcodeProcessor('foo');
 
         $this->assertEquals('foo', $processor->run());
     }
@@ -39,12 +38,12 @@ public function test_string_without_shortcode_is_not_modified()
     public function test_process_static_shorthand()
     {
         $this->assertEquals('<blockquote class="info">foo</blockquote>',
-            \Hyde\Markdown\ShortcodeProcessor::preprocess('>info foo'));
+            \Hyde\Markdown\Processing\ShortcodeProcessor::preprocess('>info foo'));
     }
 
     public function test_shortcodes_can_be_added_to_processor()
     {
-        $processor = new \Hyde\Markdown\ShortcodeProcessor('foo');
+        $processor = new \Hyde\Markdown\Processing\ShortcodeProcessor('foo');
 
         $processor->addShortcode(new class implements MarkdownShortcodeContract
         {

From 50f5cef41e58e71967793c79cf20bb02f0bd4407 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 13:48:08 +0200
Subject: [PATCH 073/768] Move Markdown converter to Markdown namespace

---
 packages/framework/src/Framework/HydeServiceProvider.php        | 2 +-
 packages/framework/src/Framework/Services/MarkdownService.php   | 2 +-
 .../src/{Framework/Actions => Markdown}/MarkdownConverter.php   | 2 +-
 packages/framework/src/Markdown/Models/Markdown.php             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/framework/src/{Framework/Actions => Markdown}/MarkdownConverter.php (95%)

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 99b4b56ecae..7bcc1b61811 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -7,12 +7,12 @@
 use Hyde\Console\HydeConsoleServiceProvider;
 use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Foundation\HydeKernel;
-use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
 use Hyde\Hyde;
+use Hyde\Markdown\MarkdownConverter;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 453fb379c75..2f20ee68131 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
 use Hyde\Helpers\Features;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract as PostProcessor;
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract as PreProcessor;
+use Hyde\Markdown\MarkdownConverter;
 use Hyde\Pages\DocumentationPage;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\HeadingPermalink\HeadingPermalinkExtension;
diff --git a/packages/framework/src/Framework/Actions/MarkdownConverter.php b/packages/framework/src/Markdown/MarkdownConverter.php
similarity index 95%
rename from packages/framework/src/Framework/Actions/MarkdownConverter.php
rename to packages/framework/src/Markdown/MarkdownConverter.php
index 3425d547b2b..ef6265f1a5b 100644
--- a/packages/framework/src/Framework/Actions/MarkdownConverter.php
+++ b/packages/framework/src/Markdown/MarkdownConverter.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions;
+namespace Hyde\Markdown;
 
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
diff --git a/packages/framework/src/Markdown/Models/Markdown.php b/packages/framework/src/Markdown/Models/Markdown.php
index d9dfd6d08a9..e6dc021ebc7 100644
--- a/packages/framework/src/Markdown/Models/Markdown.php
+++ b/packages/framework/src/Markdown/Models/Markdown.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Markdown\Models;
 
-use Hyde\Framework\Actions\MarkdownConverter;
 use Hyde\Framework\Services\MarkdownService;
+use Hyde\Markdown\MarkdownConverter;
 use Illuminate\Contracts\Support\Arrayable;
 use Stringable;
 

From ec175db2ca122ee5694ac128d010ae6f8eec808b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:13:01 +0200
Subject: [PATCH 074/768] Move Nagivation namespace into Features

---
 .../resources/views/components/docs/sidebar.blade.php       | 2 +-
 .../framework/resources/views/layouts/navigation.blade.php  | 2 +-
 .../Actions/Constructors/FindsNavigationDataForPage.php     | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php      | 2 +-
 .../Features}/Navigation/DocumentationSidebar.php           | 3 ++-
 .../src/{ => Framework/Features}/Navigation/NavItem.php     | 2 +-
 .../{ => Framework/Features}/Navigation/NavigationData.php  | 2 +-
 .../{ => Framework/Features}/Navigation/NavigationMenu.php  | 2 +-
 .../Contracts/FrontMatter/Support/NavigationSchema.php      | 2 +-
 packages/framework/tests/Feature/NavigationDataTest.php     | 4 ++--
 packages/framework/tests/Feature/NavigationMenuTest.php     | 6 +++---
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 6 +++---
 packages/framework/tests/Unit/NavItemTest.php               | 4 ++--
 .../framework/tests/Unit/Views/NavigationBrandViewTest.php  | 2 +-
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 +-
 15 files changed, 22 insertions(+), 21 deletions(-)
 rename packages/framework/src/{ => Framework/Features}/Navigation/DocumentationSidebar.php (95%)
 rename packages/framework/src/{ => Framework/Features}/Navigation/NavItem.php (98%)
 rename packages/framework/src/{ => Framework/Features}/Navigation/NavigationData.php (97%)
 rename packages/framework/src/{ => Framework/Features}/Navigation/NavigationMenu.php (97%)

diff --git a/packages/framework/resources/views/components/docs/sidebar.blade.php b/packages/framework/resources/views/components/docs/sidebar.blade.php
index 76cc33e872e..17e95c05d1c 100644
--- a/packages/framework/resources/views/components/docs/sidebar.blade.php
+++ b/packages/framework/resources/views/components/docs/sidebar.blade.php
@@ -6,7 +6,7 @@ class="bg-gray-100 dark:bg-gray-800 dark:text-gray-200 h-screen w-64 fixed z-30
     <nav id="sidebar-navigation"
          class="p-4 overflow-y-auto border-y border-gray-300 dark:border-[#1b2533] h-[calc(100vh_-_8rem)]">
         @php
-            $sidebar = \Hyde\Navigation\DocumentationSidebar::create();
+            $sidebar = \Hyde\Framework\Features\Navigation\DocumentationSidebar::create();
         @endphp
 
         @if($sidebar->hasGroups())
diff --git a/packages/framework/resources/views/layouts/navigation.blade.php b/packages/framework/resources/views/layouts/navigation.blade.php
index 06409a90ca7..34aca85a61f 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\Navigation\NavigationMenu::create();
+    $navigation = \Hyde\Framework\Features\Navigation\NavigationMenu::create();
 @endphp
 
 <nav aria-label="Main navigation" id="main-navigation"
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 9414831ba82..b72b2ec475b 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Actions\Constructors;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Navigation\NavigationData;
+use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index ac606f3e384..0dd036b98f7 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -7,11 +7,11 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
+use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Metadata\PageMetadataBag;
-use Hyde\Navigation\NavigationData;
 use Hyde\Support\Contracts\CompilableContract;
 use Hyde\Support\Contracts\FrontMatter\PageSchema;
 use Hyde\Support\Route;
diff --git a/packages/framework/src/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
similarity index 95%
rename from packages/framework/src/Navigation/DocumentationSidebar.php
rename to packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index f6926557ffe..117e18260b2 100644
--- a/packages/framework/src/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Navigation;
+namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use function Hyde\Navigation\count;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
diff --git a/packages/framework/src/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
similarity index 98%
rename from packages/framework/src/Navigation/NavItem.php
rename to packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5fb0172e3d6..45844cab676 100644
--- a/packages/framework/src/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Navigation;
+namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
diff --git a/packages/framework/src/Navigation/NavigationData.php b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
similarity index 97%
rename from packages/framework/src/Navigation/NavigationData.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationData.php
index 55ae3073d3a..ed97fb202c1 100644
--- a/packages/framework/src/Navigation/NavigationData.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Navigation;
+namespace Hyde\Framework\Features\Navigation;
 
 use ArrayObject;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
diff --git a/packages/framework/src/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
similarity index 97%
rename from packages/framework/src/Navigation/NavigationMenu.php
rename to packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 2b5c9451ff1..0ad8c5bf4d9 100644
--- a/packages/framework/src/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Navigation;
+namespace Hyde\Framework\Features\Navigation;
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
index 2c94fd2c5d9..fb845a115fa 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Support\Contracts\FrontMatter\Support;
 
 /**
- * @see \Hyde\Navigation\NavigationData
+ * @see \Hyde\Framework\Features\Navigation\NavigationData
  * @see \Hyde\Framework\Concerns\HydePage
  */
 interface NavigationSchema
diff --git a/packages/framework/tests/Feature/NavigationDataTest.php b/packages/framework/tests/Feature/NavigationDataTest.php
index 62f1795cad3..2b395048f64 100644
--- a/packages/framework/tests/Feature/NavigationDataTest.php
+++ b/packages/framework/tests/Feature/NavigationDataTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Navigation\NavigationData;
+use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Navigation\NavigationData
+ * @covers \Hyde\Framework\Features\Navigation\NavigationData
  */
 class NavigationDataTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index b400773e74e..3ccd95f8c58 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -4,15 +4,15 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Navigation\NavigationMenu;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Navigation\NavigationMenu;
-use Hyde\Navigation\NavItem;
 use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
 /**
- * @covers \Hyde\Navigation\NavigationMenu
+ * @covers \Hyde\Framework\Features\Navigation\NavigationMenu
  */
 class NavigationMenuTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 43a3103b5d0..7a1579a1a99 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -5,16 +5,16 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
+use Hyde\Framework\Features\Navigation\DocumentationSidebar;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Navigation\DocumentationSidebar;
-use Hyde\Navigation\NavItem;
 use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Navigation\DocumentationSidebar
+ * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  */
 class DocumentationSidebarTest extends TestCase
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 77f82f86b64..3002d056005 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 
@@ -13,7 +13,7 @@
  * This unit test covers the basics of the NavItem class.
  * For the full feature test, see the NavigationMenuTest class.
  *
- * @covers \Hyde\Navigation\NavItem
+ * @covers \Hyde\Framework\Features\Navigation\NavItem
  */
 class NavItemTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 255ce10646c..da3d72806c2 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
     protected function render(): string
     {
         return view('hyde::components.navigation.navigation-brand', [
-            'navigation' => \Hyde\Navigation\NavigationMenu::create(),
+            'navigation' => \Hyde\Framework\Features\Navigation\NavigationMenu::create(),
         ])->render();
     }
 
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 06603aca62f..498824661c6 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Navigation\NavItem;
+use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Support\Route;
 use Hyde\Testing\TestCase;
 

From e7d04df4c83d257a565cc38c9693172f6a68f881 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:14:11 +0200
Subject: [PATCH 075/768] Move Metadata namespace into Features

---
 .../src/Framework/Concerns/HydePage.php       |  2 +-
 .../Features}/Metadata/GlobalMetadataBag.php  |  2 +-
 .../Features}/Metadata/MetadataBag.php        | 12 +++++------
 .../Metadata/MetadataElementContract.php      |  2 +-
 .../Features}/Metadata/Models/LinkElement.php |  4 ++--
 .../Metadata/Models/MetadataElement.php       |  4 ++--
 .../Metadata/Models/OpenGraphElement.php      |  4 ++--
 .../Features}/Metadata/PageMetadataBag.php    |  2 +-
 .../Navigation/DocumentationSidebar.php       |  1 -
 packages/framework/src/Helpers/Meta.php       | 14 ++++++-------
 packages/framework/src/Support/Site.php       |  2 +-
 .../tests/Feature/GlobalMetadataBagTest.php   |  4 ++--
 .../tests/Feature/MetadataHelperTest.php      |  2 +-
 .../framework/tests/Feature/MetadataTest.php  | 20 +++++++++----------
 .../tests/Feature/MetadataViewTest.php        |  6 +++---
 packages/framework/tests/Feature/SiteTest.php |  2 +-
 16 files changed, 41 insertions(+), 42 deletions(-)
 rename packages/framework/src/{ => Framework/Features}/Metadata/GlobalMetadataBag.php (97%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/MetadataBag.php (79%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/MetadataElementContract.php (93%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/Models/LinkElement.php (88%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/Models/MetadataElement.php (82%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/Models/OpenGraphElement.php (86%)
 rename packages/framework/src/{ => Framework/Features}/Metadata/PageMetadataBag.php (98%)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 0dd036b98f7..a33242e921f 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -7,11 +7,11 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
+use Hyde\Framework\Features\Metadata\PageMetadataBag;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\FrontMatter;
-use Hyde\Metadata\PageMetadataBag;
 use Hyde\Support\Contracts\CompilableContract;
 use Hyde\Support\Contracts\FrontMatter\PageSchema;
 use Hyde\Support\Route;
diff --git a/packages/framework/src/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
similarity index 97%
rename from packages/framework/src/Metadata/GlobalMetadataBag.php
rename to packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index 93c9bee1776..15eddefc9ec 100644
--- a/packages/framework/src/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata;
+namespace Hyde\Framework\Features\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\RssFeedService;
diff --git a/packages/framework/src/Metadata/MetadataBag.php b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
similarity index 79%
rename from packages/framework/src/Metadata/MetadataBag.php
rename to packages/framework/src/Framework/Features/Metadata/MetadataBag.php
index a555e341f6a..1223edc573c 100644
--- a/packages/framework/src/Metadata/MetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata;
+namespace Hyde\Framework\Features\Metadata;
 
 use Illuminate\Contracts\Support\Htmlable;
 
@@ -10,8 +10,8 @@
  * Holds the metadata tags for a page or the site model.
  *
  * @see \Hyde\Framework\Testing\Feature\MetadataTest
- * @see \Hyde\Metadata\PageMetadataBag
- * @see \Hyde\Metadata\GlobalMetadataBag
+ * @see \Hyde\Framework\Features\Metadata\PageMetadataBag
+ * @see \Hyde\Framework\Features\Metadata\GlobalMetadataBag
  */
 class MetadataBag implements Htmlable
 {
@@ -42,15 +42,15 @@ public function get(): array
 
     public function add(MetadataElementContract|string $element): static
     {
-        if ($element instanceof \Hyde\Metadata\Models\LinkElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\LinkElement) {
             return $this->addElement('links', $element);
         }
 
-        if ($element instanceof \Hyde\Metadata\Models\MetadataElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\MetadataElement) {
             return $this->addElement('metadata', $element);
         }
 
-        if ($element instanceof \Hyde\Metadata\Models\OpenGraphElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\OpenGraphElement) {
             return $this->addElement('properties', $element);
         }
 
diff --git a/packages/framework/src/Metadata/MetadataElementContract.php b/packages/framework/src/Framework/Features/Metadata/MetadataElementContract.php
similarity index 93%
rename from packages/framework/src/Metadata/MetadataElementContract.php
rename to packages/framework/src/Framework/Features/Metadata/MetadataElementContract.php
index 64b724aaf26..c1d496aed09 100644
--- a/packages/framework/src/Metadata/MetadataElementContract.php
+++ b/packages/framework/src/Framework/Features/Metadata/MetadataElementContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata;
+namespace Hyde\Framework\Features\Metadata;
 
 use Stringable;
 
diff --git a/packages/framework/src/Metadata/Models/LinkElement.php b/packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php
similarity index 88%
rename from packages/framework/src/Metadata/Models/LinkElement.php
rename to packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php
index 6b7807599a1..c17cace9388 100644
--- a/packages/framework/src/Metadata/Models/LinkElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Models;
 
-use Hyde\Metadata\MetadataElementContract;
+use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
 class LinkElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Metadata/Models/MetadataElement.php b/packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php
similarity index 82%
rename from packages/framework/src/Metadata/Models/MetadataElement.php
rename to packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php
index 035d3688b4b..38723e50c3d 100644
--- a/packages/framework/src/Metadata/Models/MetadataElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Models;
 
-use Hyde\Metadata\MetadataElementContract;
+use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
 class MetadataElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Metadata/Models/OpenGraphElement.php b/packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php
similarity index 86%
rename from packages/framework/src/Metadata/Models/OpenGraphElement.php
rename to packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php
index 85eeed4dde0..1fb54036f2c 100644
--- a/packages/framework/src/Metadata/Models/OpenGraphElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Models;
 
-use Hyde\Metadata\MetadataElementContract;
+use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
 class OpenGraphElement implements MetadataElementContract
 {
diff --git a/packages/framework/src/Metadata/PageMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
similarity index 98%
rename from packages/framework/src/Metadata/PageMetadataBag.php
rename to packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
index f79d40fa3ab..e3345c7901d 100644
--- a/packages/framework/src/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Metadata;
+namespace Hyde\Framework\Features\Metadata;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Helpers\Meta;
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 117e18260b2..e4fcaff6389 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -9,7 +9,6 @@
 use Hyde\Support\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
-use function Hyde\Navigation\count;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\DocumentationSidebarTest
diff --git a/packages/framework/src/Helpers/Meta.php b/packages/framework/src/Helpers/Meta.php
index a5898e3a546..dfd88e6b73e 100644
--- a/packages/framework/src/Helpers/Meta.php
+++ b/packages/framework/src/Helpers/Meta.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Helpers;
 
-use Hyde\Metadata\GlobalMetadataBag;
-use Hyde\Metadata\Models\LinkElement;
-use Hyde\Metadata\Models\MetadataElement;
-use Hyde\Metadata\Models\OpenGraphElement;
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
+use Hyde\Framework\Features\Metadata\Models\LinkElement;
+use Hyde\Framework\Features\Metadata\Models\MetadataElement;
+use Hyde\Framework\Features\Metadata\Models\OpenGraphElement;
 
 /**
  * Helpers to fluently declare HTML meta elements using their object representations.
@@ -21,7 +21,7 @@ class Meta
      *
      * @param  string  $name  The meta tag's name attribute.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Metadata\Models\MetadataElement
+     * @return \Hyde\Framework\Features\Metadata\Models\MetadataElement
      *
      * @link https://www.w3schools.com/tags/tag_meta.asp
      */
@@ -35,7 +35,7 @@ public static function name(string $name, string $content): MetadataElement
      *
      * @param  string  $property  The meta tag's property attribute. The "og:" prefix is optional.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Metadata\Models\OpenGraphElement
+     * @return \Hyde\Framework\Features\Metadata\Models\OpenGraphElement
      *
      * @link https://ogp.me/
      */
@@ -50,7 +50,7 @@ public static function property(string $property, string $content): OpenGraphEle
      * @param  string  $rel  The link tag's rel attribute.
      * @param  string  $href  The link tag's href attribute.
      * @param  array  $attr  An optional key-value array of additional attributes.
-     * @return \Hyde\Metadata\Models\LinkElement
+     * @return \Hyde\Framework\Features\Metadata\Models\LinkElement
      *
      * @link https://www.w3schools.com/tags/tag_link.asp
      */
diff --git a/packages/framework/src/Support/Site.php b/packages/framework/src/Support/Site.php
index 15a0175f11c..3a9369a4f40 100644
--- a/packages/framework/src/Support/Site.php
+++ b/packages/framework/src/Support/Site.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Support;
 
-use Hyde\Metadata\GlobalMetadataBag;
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 
 /**
  * Object representation for the HydePHP site.
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index ef89aa08c65..cb7d98e80b9 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 use Hyde\Helpers\Meta;
-use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\View;
 
 /**
- * @covers \Hyde\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\GlobalMetadataBag
  */
 class GlobalMetadataBagTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataHelperTest.php b/packages/framework/tests/Feature/MetadataHelperTest.php
index 84d4f2ef39e..773881ce2e5 100644
--- a/packages/framework/tests/Feature/MetadataHelperTest.php
+++ b/packages/framework/tests/Feature/MetadataHelperTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 use Hyde\Helpers\Meta;
-use Hyde\Metadata\GlobalMetadataBag;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index daa0e24024c..8f5f948f932 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -5,22 +5,22 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Concerns\HydePage;
+use Hyde\Framework\Features\Metadata\MetadataBag;
+use Hyde\Framework\Features\Metadata\Models\LinkElement;
+use Hyde\Framework\Features\Metadata\Models\MetadataElement;
+use Hyde\Framework\Features\Metadata\Models\OpenGraphElement;
 use Hyde\Helpers\Meta;
-use Hyde\Metadata\MetadataBag;
-use Hyde\Metadata\Models\LinkElement;
-use Hyde\Metadata\Models\MetadataElement;
-use Hyde\Metadata\Models\OpenGraphElement;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Metadata\MetadataBag
- * @covers \Hyde\Metadata\PageMetadataBag
- * @covers \Hyde\Metadata\GlobalMetadataBag
- * @covers \Hyde\Metadata\Models\LinkElement
- * @covers \Hyde\Metadata\Models\MetadataElement
- * @covers \Hyde\Metadata\Models\OpenGraphElement
+ * @covers \Hyde\Framework\Features\Metadata\MetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\PageMetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\Models\LinkElement
+ * @covers \Hyde\Framework\Features\Metadata\Models\MetadataElement
+ * @covers \Hyde\Framework\Features\Metadata\Models\OpenGraphElement
  */
 class MetadataTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataViewTest.php b/packages/framework/tests/Feature/MetadataViewTest.php
index 2ca023589df..a20a09827dd 100644
--- a/packages/framework/tests/Feature/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/MetadataViewTest.php
@@ -15,9 +15,9 @@
  *
  * This test is useful both as a regression test, and also to ensure all tags are covered.
  *
- * @covers \Hyde\Metadata\MetadataBag
- * @covers \Hyde\Metadata\PageMetadataBag
- * @covers \Hyde\Metadata\GlobalMetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\MetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\PageMetadataBag
+ * @covers \Hyde\Framework\Features\Metadata\GlobalMetadataBag
  */
 class MetadataViewTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index b48406cbeb4..68366cfb6dc 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Metadata\GlobalMetadataBag;
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 use Hyde\Support\Site;
 use Hyde\Testing\TestCase;
 

From a851f642d383aa70f825013520dc3df179ff410d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:16:15 +0200
Subject: [PATCH 076/768] Rename Metadata subnamespace Models to Elements

---
 .../Metadata/{Models => Elements}/LinkElement.php    |  2 +-
 .../{Models => Elements}/MetadataElement.php         |  2 +-
 .../{Models => Elements}/OpenGraphElement.php        |  2 +-
 .../src/Framework/Features/Metadata/MetadataBag.php  |  6 +++---
 packages/framework/src/Helpers/Meta.php              | 12 ++++++------
 packages/framework/tests/Feature/MetadataTest.php    | 12 ++++++------
 6 files changed, 18 insertions(+), 18 deletions(-)
 rename packages/framework/src/Framework/Features/Metadata/{Models => Elements}/LinkElement.php (94%)
 rename packages/framework/src/Framework/Features/Metadata/{Models => Elements}/MetadataElement.php (91%)
 rename packages/framework/src/Framework/Features/Metadata/{Models => Elements}/OpenGraphElement.php (93%)

diff --git a/packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php b/packages/framework/src/Framework/Features/Metadata/Elements/LinkElement.php
similarity index 94%
rename from packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php
rename to packages/framework/src/Framework/Features/Metadata/Elements/LinkElement.php
index c17cace9388..e4a4df05e1e 100644
--- a/packages/framework/src/Framework/Features/Metadata/Models/LinkElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Elements/LinkElement.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Features\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Elements;
 
 use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
diff --git a/packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php b/packages/framework/src/Framework/Features/Metadata/Elements/MetadataElement.php
similarity index 91%
rename from packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php
rename to packages/framework/src/Framework/Features/Metadata/Elements/MetadataElement.php
index 38723e50c3d..f9ab3c7ed0f 100644
--- a/packages/framework/src/Framework/Features/Metadata/Models/MetadataElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Elements/MetadataElement.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Features\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Elements;
 
 use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
diff --git a/packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php b/packages/framework/src/Framework/Features/Metadata/Elements/OpenGraphElement.php
similarity index 93%
rename from packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php
rename to packages/framework/src/Framework/Features/Metadata/Elements/OpenGraphElement.php
index 1fb54036f2c..fce5be8608f 100644
--- a/packages/framework/src/Framework/Features/Metadata/Models/OpenGraphElement.php
+++ b/packages/framework/src/Framework/Features/Metadata/Elements/OpenGraphElement.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Features\Metadata\Models;
+namespace Hyde\Framework\Features\Metadata\Elements;
 
 use Hyde\Framework\Features\Metadata\MetadataElementContract;
 
diff --git a/packages/framework/src/Framework/Features/Metadata/MetadataBag.php b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
index 1223edc573c..a8be0c4d339 100644
--- a/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
@@ -42,15 +42,15 @@ public function get(): array
 
     public function add(MetadataElementContract|string $element): static
     {
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\LinkElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\LinkElement) {
             return $this->addElement('links', $element);
         }
 
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\MetadataElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\MetadataElement) {
             return $this->addElement('metadata', $element);
         }
 
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Models\OpenGraphElement) {
+        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\OpenGraphElement) {
             return $this->addElement('properties', $element);
         }
 
diff --git a/packages/framework/src/Helpers/Meta.php b/packages/framework/src/Helpers/Meta.php
index dfd88e6b73e..7de052b1a8b 100644
--- a/packages/framework/src/Helpers/Meta.php
+++ b/packages/framework/src/Helpers/Meta.php
@@ -5,9 +5,9 @@
 namespace Hyde\Helpers;
 
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
-use Hyde\Framework\Features\Metadata\Models\LinkElement;
-use Hyde\Framework\Features\Metadata\Models\MetadataElement;
-use Hyde\Framework\Features\Metadata\Models\OpenGraphElement;
+use Hyde\Framework\Features\Metadata\Elements\LinkElement;
+use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
+use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
 
 /**
  * Helpers to fluently declare HTML meta elements using their object representations.
@@ -21,7 +21,7 @@ class Meta
      *
      * @param  string  $name  The meta tag's name attribute.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Framework\Features\Metadata\Models\MetadataElement
+     * @return \Hyde\Framework\Features\Metadata\Elements\MetadataElement
      *
      * @link https://www.w3schools.com/tags/tag_meta.asp
      */
@@ -35,7 +35,7 @@ public static function name(string $name, string $content): MetadataElement
      *
      * @param  string  $property  The meta tag's property attribute. The "og:" prefix is optional.
      * @param  string  $content  The content of the meta tag.
-     * @return \Hyde\Framework\Features\Metadata\Models\OpenGraphElement
+     * @return \Hyde\Framework\Features\Metadata\Elements\OpenGraphElement
      *
      * @link https://ogp.me/
      */
@@ -50,7 +50,7 @@ public static function property(string $property, string $content): OpenGraphEle
      * @param  string  $rel  The link tag's rel attribute.
      * @param  string  $href  The link tag's href attribute.
      * @param  array  $attr  An optional key-value array of additional attributes.
-     * @return \Hyde\Framework\Features\Metadata\Models\LinkElement
+     * @return \Hyde\Framework\Features\Metadata\Elements\LinkElement
      *
      * @link https://www.w3schools.com/tags/tag_link.asp
      */
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index 8f5f948f932..6835cb04265 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Metadata\MetadataBag;
-use Hyde\Framework\Features\Metadata\Models\LinkElement;
-use Hyde\Framework\Features\Metadata\Models\MetadataElement;
-use Hyde\Framework\Features\Metadata\Models\OpenGraphElement;
+use Hyde\Framework\Features\Metadata\Elements\LinkElement;
+use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
+use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
 use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
@@ -18,9 +18,9 @@
  * @covers \Hyde\Framework\Features\Metadata\MetadataBag
  * @covers \Hyde\Framework\Features\Metadata\PageMetadataBag
  * @covers \Hyde\Framework\Features\Metadata\GlobalMetadataBag
- * @covers \Hyde\Framework\Features\Metadata\Models\LinkElement
- * @covers \Hyde\Framework\Features\Metadata\Models\MetadataElement
- * @covers \Hyde\Framework\Features\Metadata\Models\OpenGraphElement
+ * @covers \Hyde\Framework\Features\Metadata\Elements\LinkElement
+ * @covers \Hyde\Framework\Features\Metadata\Elements\MetadataElement
+ * @covers \Hyde\Framework\Features\Metadata\Elements\OpenGraphElement
  */
 class MetadataTest extends TestCase
 {

From afad8ead9d64e92123bb9eeac522e3c5ede2cfb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:17:11 +0200
Subject: [PATCH 077/768] Move Blogging namespace into Features

---
 config/hyde.php                                               | 2 +-
 packages/framework/config/hyde.php                            | 2 +-
 .../Actions/Constructors/FindsContentLengthForImageObject.php | 2 +-
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 4 ++--
 .../src/{ => Framework/Features}/Blogging/Models/Author.php   | 2 +-
 .../Features}/Blogging/Models/FeaturedImage.php               | 3 ++-
 packages/framework/src/Pages/MarkdownPost.php                 | 4 ++--
 .../Contracts/FrontMatter/Support/FeaturedImageSchema.php     | 2 +-
 .../framework/tests/Feature/AuthorPostsIntegrationTest.php    | 2 +-
 packages/framework/tests/Feature/AuthorTest.php               | 4 ++--
 .../tests/Feature/FindsContentLengthForImageObjectTest.php    | 4 ++--
 packages/framework/tests/Feature/ImageModelTest.php           | 4 ++--
 packages/framework/tests/Feature/MarkdownPostTest.php         | 4 ++--
 13 files changed, 20 insertions(+), 19 deletions(-)
 rename packages/framework/src/{ => Framework/Features}/Blogging/Models/Author.php (97%)
 rename packages/framework/src/{ => Framework/Features}/Blogging/Models/FeaturedImage.php (98%)

diff --git a/config/hyde.php b/config/hyde.php
index 09399ce8080..c7146b67578 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,7 +11,7 @@
 |
 */
 
-use Hyde\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\Author;
 use Hyde\Helpers\Features;
 use Hyde\Helpers\Meta;
 
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 09399ce8080..c7146b67578 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,7 +11,7 @@
 |
 */
 
-use Hyde\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\Author;
 use Hyde\Helpers\Features;
 use Hyde\Helpers\Meta;
 
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
index 5315b555b98..be4b4c4fa93 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index dbddf8e89c9..04f1c13582f 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
-use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
+use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
diff --git a/packages/framework/src/Blogging/Models/Author.php b/packages/framework/src/Framework/Features/Blogging/Models/Author.php
similarity index 97%
rename from packages/framework/src/Blogging/Models/Author.php
rename to packages/framework/src/Framework/Features/Blogging/Models/Author.php
index 7d241848d46..4bd792026db 100644
--- a/packages/framework/src/Blogging/Models/Author.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/Author.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Blogging\Models;
+namespace Hyde\Framework\Features\Blogging\Models;
 
 use Illuminate\Support\Collection;
 use Stringable;
diff --git a/packages/framework/src/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
similarity index 98%
rename from packages/framework/src/Blogging/Models/FeaturedImage.php
rename to packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 42aa4880d79..ad7c577ec36 100644
--- a/packages/framework/src/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Blogging\Models;
+namespace Hyde\Framework\Features\Blogging\Models;
 
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;
 use Stringable;
+use function Hyde\Blogging\Models\str_starts_with;
 
 /**
  * Holds the information for an image.
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index c7648f3be2c..4f842ee6cfe 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Pages;
 
-use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\FeaturedImage;
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
+use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
index 953119f0fac..cc17a82bba2 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Support\Contracts\FrontMatter\Support;
 
 /**
- * @see \Hyde\Blogging\Models\FeaturedImage
+ * @see \Hyde\Framework\Features\Blogging\Models\FeaturedImage
  * @see \Hyde\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index 2dd16814546..a637e4ae3b4 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\Author;
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
+use Hyde\Framework\Features\Blogging\Models\Author;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
diff --git a/packages/framework/tests/Feature/AuthorTest.php b/packages/framework/tests/Feature/AuthorTest.php
index 411b93623cb..75ad98e3da5 100644
--- a/packages/framework/tests/Feature/AuthorTest.php
+++ b/packages/framework/tests/Feature/AuthorTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\Author;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Blogging\Models\Author
+ * @covers \Hyde\Framework\Features\Blogging\Models\Author
  */
 class AuthorTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index 713e010fc77..1c5ccfc4810 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
 
@@ -16,7 +16,7 @@ class FindsContentLengthForImageObjectTest extends TestCase
     /**
      * Unit test for the shorthand. Logic is tested in the rest of the case.
      *
-     * @covers \Hyde\Blogging\Models\FeaturedImage::getContentLength
+     * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage::getContentLength
      */
     public function test_image_helper_shorthand_returns_content_length()
     {
diff --git a/packages/framework/tests/Feature/ImageModelTest.php b/packages/framework/tests/Feature/ImageModelTest.php
index adf0b08d114..e3a01ea6382 100644
--- a/packages/framework/tests/Feature/ImageModelTest.php
+++ b/packages/framework/tests/Feature/ImageModelTest.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Blogging\Models\FeaturedImage
+ * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
  */
 class ImageModelTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 9218b4b1c13..ee2e343f2c7 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Blogging\Models\Author;
-use Hyde\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\DateString;

From f387e5239fe28643fb22ccdadf6ec040cd659f20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:17:46 +0200
Subject: [PATCH 078/768] Move DataCollections namespace into Features

---
 docs/digging-deeper/collections.md                   |  2 +-
 .../Features}/DataCollections/DataCollection.php     |  2 +-
 .../DataCollectionServiceProvider.php                |  4 ++--
 .../DataCollections/Facades/MarkdownCollection.php   |  4 ++--
 .../framework/src/Framework/HydeServiceProvider.php  |  2 +-
 .../framework/tests/Feature/DataCollectionTest.php   | 12 ++++++------
 .../framework/tests/Unit/HydeServiceProviderTest.php |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/framework/src/{ => Framework/Features}/DataCollections/DataCollection.php (97%)
 rename packages/framework/src/{ => Framework/Features}/DataCollections/DataCollectionServiceProvider.php (86%)
 rename packages/framework/src/{ => Framework/Features}/DataCollections/Facades/MarkdownCollection.php (69%)

diff --git a/docs/digging-deeper/collections.md b/docs/digging-deeper/collections.md
index e61a8428ff0..4f75a153502 100644
--- a/docs/digging-deeper/collections.md
+++ b/docs/digging-deeper/collections.md
@@ -88,7 +88,7 @@ MarkdownCollection::get('subdirectory_name')
 
 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 class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
+<pre class="sf-dump" id="sf-dump-703277111" data-indent-pad="  " tabindex="0" aria-label="Sample output" style="white-space: pre-wrap; padding: 5px;  color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; font-size: 12px; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; overflow: initial !important;"><code><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;">^</span><span class="sf-dump-default" style="display: inline; font-variant-numeric: normal; font-variant-east-asian: normal; font-stretch: normal; line-height: normal; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all;"> </span><span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">Hyde\Framework\Features\DataCollections\DataCollection</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#270 ▼</a><samp data-depth="1" class="sf-dump-expanded"> <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">key</span>: "<span class="sf-dump-str" title="12 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">testimonials</span>" <!-- <br>&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">parseTimeInMs</span>: <span class="sf-dump-num" style="display: inline; font-weight: bold; color: rgb(18, 153, 218);">5.02</span>  --><br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">items</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:5</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▼</a><samp data-depth="2" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">0</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#273 ▼</a><samp data-depth="3" class="sf-dump-expanded"> <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">matter</span>: <span class="sf-dump-note" style="display: inline; color: rgb(18, 153, 218);">array:1</span> [<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">▶</a>] <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">body</span>: "<span class="sf-dump-str" title="59 characters" style="display: inline; font-weight: bold; color: rgb(86, 219, 58);">Lorem ipsum dolor sit amet, consectetur adipiscing elit...<span class="sf-dump-default sf-dump-ns" style="display: inline; color: rgb(255, 132, 0); font-variant-numeric: normal; font-variant-east-asian: normal; font-weight: normal; font-stretch: normal; line-height: normal; font-family: Menlo, Monaco, Consolas, monospace; overflow-wrap: break-word; position: relative; z-index: 99999; word-break: break-all; user-select: none;">\n</span></span>" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">title</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;+<span class="sf-dump-public" title="Public property" style="display: inline; color: rgb(255, 255, 255);">slug</span>: "" <br>&nbsp;&nbsp;&nbsp;&nbsp;</samp>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">1</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218); "><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#274 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: rgb(18, 153, 218);">2</span> =&gt; <span class="sf-dump-note" title="Hyde\Markdown\Models\MarkdownDocument <br>&nbsp;&nbsp;" style="display: inline; color: rgb(18, 153, 218);"><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis;  white-space: nowrap; overflow: hidden; vertical-align: top;">Hyde\Framework\Models</span><span class="sf-dump-ellipsis sf-dump-ellipsis-note" style="display: inline-block; text-overflow: ellipsis; max-width: none; white-space: nowrap; overflow: hidden; vertical-align: top;">\</span>MarkdownDocument</span> {<a class="sf-dump-ref sf-dump-toggle" title="[Ctrl+click] Expand all children" style="text-decoration: none;  border-style: initial; border-color: initial; outline: none; color: rgb(160, 160, 160);">#275 ▶</a>} <br>&nbsp;&nbsp;&nbsp;&nbsp;<span class="sf-dump-index" style="display: inline; color: gray;">[The rest is truncated to conserve space...]</span> <!-- <br>&nbsp;&nbsp;</samp>] <br>&nbsp;&nbsp;#<span class="sf-dump-protected" title="Protected property" style="display: inline; color: rgb(255, 255, 255);">escapeWhenCastingToString</span>: <span class="sf-dump-const" style="display: inline; font-weight: bold;">false</span> </samp> <br>}--></code></pre>
 
 
 #### Implementing it in a Blade view
diff --git a/packages/framework/src/DataCollections/DataCollection.php b/packages/framework/src/Framework/Features/DataCollections/DataCollection.php
similarity index 97%
rename from packages/framework/src/DataCollections/DataCollection.php
rename to packages/framework/src/Framework/Features/DataCollections/DataCollection.php
index efbef011746..7172a9f921e 100644
--- a/packages/framework/src/DataCollections/DataCollection.php
+++ b/packages/framework/src/Framework/Features/DataCollections/DataCollection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\DataCollections;
+namespace Hyde\Framework\Features\DataCollections;
 
 use Hyde\Framework\Actions\MarkdownFileParser;
 use Hyde\Hyde;
diff --git a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
similarity index 86%
rename from packages/framework/src/DataCollections/DataCollectionServiceProvider.php
rename to packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
index 9957c158f19..c2df6393ca5 100644
--- a/packages/framework/src/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\DataCollections;
+namespace Hyde\Framework\Features\DataCollections;
 
-use Hyde\DataCollections\Facades\MarkdownCollection;
+use Hyde\Framework\Features\DataCollections\Facades\MarkdownCollection;
 use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Foundation\AliasLoader;
diff --git a/packages/framework/src/DataCollections/Facades/MarkdownCollection.php b/packages/framework/src/Framework/Features/DataCollections/Facades/MarkdownCollection.php
similarity index 69%
rename from packages/framework/src/DataCollections/Facades/MarkdownCollection.php
rename to packages/framework/src/Framework/Features/DataCollections/Facades/MarkdownCollection.php
index 795816ca26a..d7286b47a06 100644
--- a/packages/framework/src/DataCollections/Facades/MarkdownCollection.php
+++ b/packages/framework/src/Framework/Features/DataCollections/Facades/MarkdownCollection.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Hyde\DataCollections\Facades;
+namespace Hyde\Framework\Features\DataCollections\Facades;
 
-use Hyde\DataCollections\DataCollection;
+use Hyde\Framework\Features\DataCollections\DataCollection;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\DataCollectionTest
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 7bcc1b61811..97b63a88ff6 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework;
 
 use Hyde\Console\HydeConsoleServiceProvider;
-use Hyde\DataCollections\DataCollectionServiceProvider;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Concerns\RegistersFileLocations;
+use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 54b69a563f5..7532d5d838d 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\DataCollections\DataCollection;
-use Hyde\DataCollections\DataCollectionServiceProvider;
-use Hyde\DataCollections\Facades\MarkdownCollection;
+use Hyde\Framework\Features\DataCollections\DataCollection;
+use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
+use Hyde\Framework\Features\DataCollections\Facades\MarkdownCollection;
 use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\MarkdownDocument;
@@ -16,9 +16,9 @@
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\DataCollections\DataCollection
- * @covers \Hyde\DataCollections\DataCollectionServiceProvider
- * @covers \Hyde\DataCollections\Facades\MarkdownCollection
+ * @covers \Hyde\Framework\Features\DataCollections\DataCollection
+ * @covers \Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider
+ * @covers \Hyde\Framework\Features\DataCollections\Facades\MarkdownCollection
  */
 class DataCollectionTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 2844774dc55..1dba541c211 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\DataCollections\DataCollectionServiceProvider;
+use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Hyde;

From 754db5220ed0e2f3e17844aac71cf529915084fa Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 12:19:14 +0000
Subject: [PATCH 079/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 packages/framework/src/Helpers/Meta.php                         | 2 +-
 packages/framework/tests/Feature/MetadataTest.php               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ad7c577ec36..5cd7c44a9e3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use Exception;
+use function Hyde\Blogging\Models\str_starts_with;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;
 use Stringable;
-use function Hyde\Blogging\Models\str_starts_with;
 
 /**
  * Holds the information for an image.
diff --git a/packages/framework/src/Helpers/Meta.php b/packages/framework/src/Helpers/Meta.php
index 7de052b1a8b..34280af7120 100644
--- a/packages/framework/src/Helpers/Meta.php
+++ b/packages/framework/src/Helpers/Meta.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Helpers;
 
-use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 use Hyde\Framework\Features\Metadata\Elements\LinkElement;
 use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
 use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
+use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 
 /**
  * Helpers to fluently declare HTML meta elements using their object representations.
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index 6835cb04265..28deaaf23da 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Features\Metadata\MetadataBag;
 use Hyde\Framework\Features\Metadata\Elements\LinkElement;
 use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
 use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
+use Hyde\Framework\Features\Metadata\MetadataBag;
 use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;

From 2b6a806bdd4b0b14e83d9407a197c2ce5c15750f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:20:27 +0200
Subject: [PATCH 080/768] Rename class Author to PostAuthor

---
 config/hyde.php                               |  4 +-
 docs/digging-deeper/customization.md          |  2 +-
 packages/framework/config/hyde.php            |  4 +-
 .../Internal/ConstructsPageSchemas.php        |  6 +-
 .../Models/{Author.php => PostAuthor.php}     |  4 +-
 packages/framework/src/Pages/MarkdownPost.php |  4 +-
 .../Feature/AuthorPostsIntegrationTest.php    |  6 +-
 .../framework/tests/Feature/AuthorTest.php    | 58 +++++++++----------
 .../tests/Feature/MarkdownPostTest.php        |  6 +-
 9 files changed, 47 insertions(+), 47 deletions(-)
 rename packages/framework/src/Framework/Features/Blogging/Models/{Author.php => PostAuthor.php} (96%)

diff --git a/config/hyde.php b/config/hyde.php
index c7146b67578..a6d0443a665 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,7 +11,7 @@
 |
 */
 
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Helpers\Features;
 use Hyde\Helpers\Meta;
 
@@ -85,7 +85,7 @@
     */
 
     'authors' => [
-        Author::create(
+        PostAuthor::create(
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com' // Optional website URL
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index d2bf168df0b..d15e5fa0a56 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -95,7 +95,7 @@ and the rest of the data will be pulled from a matching entry.
 ```php
 // torchlight! {"lineNumbers": false}
 'authors' => [
-    Author::create(
+    PostAuthor::create(
         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 c7146b67578..a6d0443a665 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,7 +11,7 @@
 |
 */
 
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Helpers\Features;
 use Hyde\Helpers\Meta;
 
@@ -85,7 +85,7 @@
     */
 
     'authors' => [
-        Author::create(
+        PostAuthor::create(
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com' // Optional website URL
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 04f1c13582f..f0097b3b48b 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
@@ -64,10 +64,10 @@ protected function makeDescription(string $markdown): string
         return $markdown;
     }
 
-    protected function getAuthor(): ?Author
+    protected function getAuthor(): ?PostAuthor
     {
         if ($this->matter('author')) {
-            return Author::make($this->matter('author'));
+            return PostAuthor::make($this->matter('author'));
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/Author.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
similarity index 96%
rename from packages/framework/src/Framework/Features/Blogging/Models/Author.php
rename to packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 4bd792026db..54d398d2e7c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/Author.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -12,7 +12,7 @@
  *
  * @see \Hyde\Framework\Testing\Feature\AuthorTest
  */
-class Author implements Stringable
+class PostAuthor implements Stringable
 {
     /**
      * The username of the author.
@@ -40,7 +40,7 @@ class Author implements Stringable
     public ?string $website = null;
 
     /**
-     * Construct a new Author object.
+     * Construct a new Post Author object.
      *
      * Parameters are supplied through an array to make it
      * easy to load data from Markdown post front matter.
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 4f842ee6cfe..22a89ec2591 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
@@ -29,7 +29,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?string $description = null;
     public ?string $category = null;
     public ?DateString $date = null;
-    public ?Author $author = null;
+    public ?PostAuthor $author = null;
     public ?FeaturedImage $image = null;
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Framework\Models\Pages\MarkdownPost> */
diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index a637e4ae3b4..6c827c0442c 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Actions\CreatesNewMarkdownPostFile;
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
@@ -79,7 +79,7 @@ public function test_create_post_with_defined_author_with_name()
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
         Config::set('authors', [
-            Author::create('test_named_author', 'Test Author'),
+            PostAuthor::create('test_named_author', 'Test PostAuthor'),
         ]);
 
         // Check that the post was created
@@ -117,7 +117,7 @@ public function test_create_post_with_defined_author_with_website()
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
         Config::set('authors', [
-            Author::create('test_author_with_website', 'Test Author', 'https://example.org'),
+            PostAuthor::create('test_author_with_website', 'Test PostAuthor', 'https://example.org'),
         ]);
 
         // Check that the post was created
diff --git a/packages/framework/tests/Feature/AuthorTest.php b/packages/framework/tests/Feature/AuthorTest.php
index 75ad98e3da5..20b6e8f4a57 100644
--- a/packages/framework/tests/Feature/AuthorTest.php
+++ b/packages/framework/tests/Feature/AuthorTest.php
@@ -4,26 +4,26 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Framework\Features\Blogging\Models\Author
+ * @covers \Hyde\Framework\Features\Blogging\Models\PostAuthor
  */
 class AuthorTest extends TestCase
 {
     public function test_create_method_creates_new_author_model()
     {
-        $author = Author::create('foo');
+        $author = PostAuthor::create('foo');
 
-        $this->assertInstanceOf(Author::class, $author);
+        $this->assertInstanceOf(PostAuthor::class, $author);
     }
 
     public function test_create_method_accepts_all_parameters()
     {
-        $author = Author::create('foo', 'bar', 'https://example.com');
+        $author = PostAuthor::create('foo', 'bar', 'https://example.com');
 
         $this->assertEquals('foo', $author->username);
         $this->assertEquals('bar', $author->name);
@@ -32,38 +32,38 @@ public function test_create_method_accepts_all_parameters()
 
     public function test_make_method_creates_new_author_model_from_string()
     {
-        $author = Author::make('foo');
-        $this->assertEquals($author, new Author('foo'));
+        $author = PostAuthor::make('foo');
+        $this->assertEquals($author, new PostAuthor('foo'));
     }
 
     public function test_make_method_creates_new_author_model_from_string_can_find_existing_author()
     {
         Config::set('authors', [
-            Author::create('foo', 'bar'),
+            PostAuthor::create('foo', 'bar'),
         ]);
 
-        $this->assertEquals(Author::make('foo'), Author::create('foo', 'bar'));
+        $this->assertEquals(PostAuthor::make('foo'), PostAuthor::create('foo', 'bar'));
     }
 
     public function test_make_method_creates_new_author_model_from_array()
     {
-        $author = Author::make([
+        $author = PostAuthor::make([
             'username' => 'foo',
             'name' => 'bar',
             'website' => 'https://example.com',
         ]);
-        $this->assertEquals($author, Author::create('foo', 'bar', 'https://example.com'));
+        $this->assertEquals($author, PostAuthor::create('foo', 'bar', 'https://example.com'));
     }
 
     public function test_make_method_creates_new_author_model_from_array_only_needs_username()
     {
-        $this->assertEquals(Author::make(['username' => 'foo']), Author::create('foo'));
+        $this->assertEquals(PostAuthor::make(['username' => 'foo']), PostAuthor::create('foo'));
     }
 
     public function test_all_method_returns_empty_collection_if_no_authors_are_set_in_config()
     {
         Config::set('authors', []);
-        $authors = Author::all();
+        $authors = PostAuthor::all();
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(0, $authors);
@@ -72,37 +72,37 @@ public function test_all_method_returns_empty_collection_if_no_authors_are_set_i
     public function test_all_method_returns_collection_with_all_authors_defined_in_config()
     {
         Config::set('authors', [
-            Author::create('foo'),
+            PostAuthor::create('foo'),
         ]);
-        $authors = Author::all();
+        $authors = PostAuthor::all();
 
         $this->assertInstanceOf(Collection::class, $authors);
         $this->assertCount(1, $authors);
-        $this->assertEquals(Author::create('foo'), $authors->first());
+        $this->assertEquals(PostAuthor::create('foo'), $authors->first());
     }
 
     public function test_multiple_authors_can_be_defined_in_config()
     {
         Config::set('authors', [
-            Author::create('foo'),
-            Author::create('bar'),
+            PostAuthor::create('foo'),
+            PostAuthor::create('bar'),
         ]);
-        $authors = Author::all();
+        $authors = PostAuthor::all();
 
         $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(PostAuthor::create('foo'), $authors->first());
+        $this->assertEquals(PostAuthor::create('bar'), $authors->last());
     }
 
     public function test_get_method_returns_config_defined_author_by_username()
     {
         Config::set('authors', [
-            Author::create('foo', 'bar'),
+            PostAuthor::create('foo', 'bar'),
         ]);
-        $author = Author::get('foo');
+        $author = PostAuthor::get('foo');
 
-        $this->assertInstanceOf(Author::class, $author);
+        $this->assertInstanceOf(PostAuthor::class, $author);
         $this->assertEquals('foo', $author->username);
         $this->assertEquals('bar', $author->name);
     }
@@ -110,15 +110,15 @@ public function test_get_method_returns_config_defined_author_by_username()
     public function test_get_method_returns_new_author_if_username_not_found_in_config()
     {
         Config::set('authors', []);
-        $author = Author::get('foo');
+        $author = PostAuthor::get('foo');
 
-        $this->assertInstanceOf(Author::class, $author);
+        $this->assertInstanceOf(PostAuthor::class, $author);
         $this->assertEquals('foo', $author->username);
     }
 
     public function test_get_name_helper_returns_name_if_set()
     {
-        $author = new Author('username');
+        $author = new PostAuthor('username');
         $author->name = 'John Doe';
 
         $this->assertEquals('John Doe', $author->getName());
@@ -126,14 +126,14 @@ public function test_get_name_helper_returns_name_if_set()
 
     public function test_get_name_helper_returns_username_if_name_is_not_set()
     {
-        $author = new Author('username');
+        $author = new PostAuthor('username');
 
         $this->assertEquals('username', $author->getName());
     }
 
     public function test_to_string_helper_returns_the_name()
     {
-        $author = new Author('username');
+        $author = new PostAuthor('username');
         $author->name = 'John Doe';
 
         $this->assertEquals('John Doe', (string) $author);
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index ee2e343f2c7..5b99d742f9b 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Blogging\Models\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
@@ -23,7 +23,7 @@ public function test_constructor_can_create_a_new_author_instance_from_username_
             'author' => 'John Doe',
         ]));
 
-        $this->assertInstanceOf(Author::class, $post->author);
+        $this->assertInstanceOf(PostAuthor::class, $post->author);
         $this->assertEquals('John Doe', $post->author->username);
         $this->assertNull($post->author->name);
         $this->assertNull($post->author->website);
@@ -39,7 +39,7 @@ public function test_constructor_can_create_a_new_author_instance_from_user_arra
             ],
         ]));
 
-        $this->assertInstanceOf(Author::class, $post->author);
+        $this->assertInstanceOf(PostAuthor::class, $post->author);
         $this->assertEquals('john_doe', $post->author->username);
         $this->assertEquals('John Doe', $post->author->name);
         $this->assertEquals('https://example.com', $post->author->website);

From eb9fb47a8f3c5207fe33afafc188ab0973a30fd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:20:50 +0200
Subject: [PATCH 081/768] Update FeaturedImage.php

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ad7c577ec36..dbfed004adf 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\Hyde;
 use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;
 use Stringable;
-use function Hyde\Blogging\Models\str_starts_with;
 
 /**
  * Holds the information for an image.

From a9f63e362fcd9b7d5d35ee319d8c70e503d3931c Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 12:21:09 +0000
Subject: [PATCH 082/768] Apply fixes from StyleCI

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                   | 2 +-
 packages/framework/tests/Feature/MarkdownPostTest.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index f0097b3b48b..f43c903b431 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -6,8 +6,8 @@
 
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 22a89ec2591..d9974f9123a 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -6,8 +6,8 @@
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 5b99d742f9b..f3d456b03f2 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\DateString;

From c4b7a415e49b37abb5fad68e0d6d4d7d6a47e5d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:23:04 +0200
Subject: [PATCH 083/768] Update AuthorPostsIntegrationTest.php

---
 .../framework/tests/Feature/AuthorPostsIntegrationTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index 6c827c0442c..c5df5d202a1 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -79,7 +79,7 @@ public function test_create_post_with_defined_author_with_name()
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
         Config::set('authors', [
-            PostAuthor::create('test_named_author', 'Test PostAuthor'),
+            PostAuthor::create('test_named_author', 'Test Author'),
         ]);
 
         // Check that the post was created
@@ -117,7 +117,7 @@ public function test_create_post_with_defined_author_with_website()
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
         Config::set('authors', [
-            PostAuthor::create('test_author_with_website', 'Test PostAuthor', 'https://example.org'),
+            PostAuthor::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 
         // Check that the post was created

From 32683329d87e0a18dae9397b003be528e238148f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:27:27 +0200
Subject: [PATCH 084/768] Update FeaturedImage.php

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 5cd7c44a9e3..dbfed004adf 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use Exception;
-use function Hyde\Blogging\Models\str_starts_with;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;

From 3f045508c7836e679fb688c9d71623b5cc072867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:44:25 +0200
Subject: [PATCH 085/768] Update .gitignore

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c1a7a9af3d3..65b0b97ee68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,8 @@
 
 !/.idea
 /rocket
-build/cache
\ No newline at end of file
+build/cache
+
+# Temporary
+
+packages/framework/src/tree.txt

From 991ad82b74352941508d35fc4d9b7f696653ec57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:46:10 +0200
Subject: [PATCH 086/768] Revert "Update .gitignore"

This reverts commit 3f045508c7836e679fb688c9d71623b5cc072867.
---
 .gitignore | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 65b0b97ee68..c1a7a9af3d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,4 @@
 
 !/.idea
 /rocket
-build/cache
-
-# Temporary
-
-packages/framework/src/tree.txt
+build/cache
\ No newline at end of file

From e83fcae7d4152643aed5e9ce4e583545fd144a91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:46:24 +0200
Subject: [PATCH 087/768] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index c1a7a9af3d3..8067590ce48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@
 
 !/.idea
 /rocket
-build/cache
\ No newline at end of file
+build/cache

From e41a2d8d5d3d4550c87152cd3f57e8bf98f86635 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:46:54 +0200
Subject: [PATCH 088/768] Create directory_structure.txt

---
 .../framework/src/directory_structure.txt     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 packages/framework/src/directory_structure.txt

diff --git a/packages/framework/src/directory_structure.txt b/packages/framework/src/directory_structure.txt
new file mode 100644
index 00000000000..24e42dc5d7c
--- /dev/null
+++ b/packages/framework/src/directory_structure.txt
@@ -0,0 +1,35 @@
+.
+├── Blogging
+│   └── Models
+├── Console
+│   └── Commands
+├── DataCollections
+│   └── Facades
+├── Foundation
+│   └── Concerns
+├── Framework
+│   ├── Actions
+│   │   ├── Constructors
+│   │   └── PostBuildTasks
+│   ├── Concerns
+│   │   └── Internal
+│   ├── Exceptions
+│   ├── Services
+│   └── Views
+│       └── Components
+├── Helpers
+├── Markdown
+│   ├── Contracts
+│   ├── Models
+│   └── Processing
+├── Metadata
+│   └── Models
+├── Navigation
+├── Pages
+└── Support
+    ├── Concerns
+    └── Contracts
+        └── FrontMatter
+            └── Support
+
+32 directories

From e3ad0c35f9d4f82ea6be71e331f3df08f5ed14ee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:47:38 +0200
Subject: [PATCH 089/768] Update directory_structure.txt

---
 packages/framework/src/directory_structure.txt | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/directory_structure.txt b/packages/framework/src/directory_structure.txt
index 24e42dc5d7c..0bfbbd77522 100644
--- a/packages/framework/src/directory_structure.txt
+++ b/packages/framework/src/directory_structure.txt
@@ -1,10 +1,6 @@
 .
-├── Blogging
-│   └── Models
 ├── Console
 │   └── Commands
-├── DataCollections
-│   └── Facades
 ├── Foundation
 │   └── Concerns
 ├── Framework
@@ -14,6 +10,14 @@
 │   ├── Concerns
 │   │   └── Internal
 │   ├── Exceptions
+│   ├── Features
+│   │   ├── Blogging
+│   │   │   └── Models
+│   │   ├── DataCollections
+│   │   │   └── Facades
+│   │   ├── Metadata
+│   │   │   └── Elements
+│   │   └── Navigation
 │   ├── Services
 │   └── Views
 │       └── Components
@@ -22,9 +26,6 @@
 │   ├── Contracts
 │   ├── Models
 │   └── Processing
-├── Metadata
-│   └── Models
-├── Navigation
 ├── Pages
 └── Support
     ├── Concerns
@@ -32,4 +33,4 @@
         └── FrontMatter
             └── Support
 
-32 directories
+33 directories

From fa21f22c0b918075202f0a3af5a8f769fc1aae4b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:52:49 +0200
Subject: [PATCH 090/768] Rename subschema directory

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 .../src/Framework/Features/Navigation/NavigationData.php        | 2 +-
 .../src/Support/Contracts/FrontMatter/BlogPostSchema.php        | 2 +-
 .../framework/src/Support/Contracts/FrontMatter/PageSchema.php  | 2 +-
 .../FrontMatter/{Support => SubSchemas}/FeaturedImageSchema.php | 2 +-
 .../FrontMatter/{Support => SubSchemas}/NavigationSchema.php    | 2 +-
 packages/framework/tests/Feature/NavigationDataTest.php         | 2 +-
 packages/framework/tests/Unit/SchemaContractsTest.php           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/framework/src/Support/Contracts/FrontMatter/{Support => SubSchemas}/FeaturedImageSchema.php (90%)
 rename packages/framework/src/Support/Contracts/FrontMatter/{Support => SubSchemas}/NavigationSchema.php (85%)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index dbfed004adf..3f3ea5b345a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -7,7 +7,7 @@
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
-use Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema;
+use Hyde\Support\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationData.php b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
index ed97fb202c1..7ff518997e0 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationData.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
@@ -6,7 +6,7 @@
 
 use ArrayObject;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
-use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
+use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
index 353a8073be8..ee2fe0305ed 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
@@ -7,7 +7,7 @@
 /**
  * @see \Hyde\Pages\MarkdownPost
  */
-interface BlogPostSchema extends \Hyde\Support\Contracts\FrontMatter\Support\FeaturedImageSchema
+interface BlogPostSchema extends \Hyde\Support\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema
 {
     public const MARKDOWN_POST_SCHEMA = [
         'title'        => 'string',
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
index 6a6e90b8fb2..568951dac86 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
@@ -7,7 +7,7 @@
 /**
  * @see \Hyde\Framework\Concerns\HydePage
  */
-interface PageSchema extends \Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema
+interface PageSchema extends \Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema
 {
     public const PAGE_SCHEMA = [
         'title'         => 'string',
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
similarity index 90%
rename from packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
index cc17a82bba2..817beb4e388 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/Support/FeaturedImageSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter\Support;
+namespace Hyde\Support\Contracts\FrontMatter\SubSchemas;
 
 /**
  * @see \Hyde\Framework\Features\Blogging\Models\FeaturedImage
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php b/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
similarity index 85%
rename from packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
rename to packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
index fb845a115fa..71dba7e350c 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/Support/NavigationSchema.php
+++ b/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter\Support;
+namespace Hyde\Support\Contracts\FrontMatter\SubSchemas;
 
 /**
  * @see \Hyde\Framework\Features\Navigation\NavigationData
diff --git a/packages/framework/tests/Feature/NavigationDataTest.php b/packages/framework/tests/Feature/NavigationDataTest.php
index 2b395048f64..d8c2b9e5934 100644
--- a/packages/framework/tests/Feature/NavigationDataTest.php
+++ b/packages/framework/tests/Feature/NavigationDataTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationData;
-use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
+use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 8f5f9739c4a..87ee67eeb02 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -7,7 +7,7 @@
 use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
 use Hyde\Support\Contracts\FrontMatter\PageSchema;
-use Hyde\Support\Contracts\FrontMatter\Support\NavigationSchema;
+use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**

From e161eb9da340696636632c8236d7883effe0a056 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:53:34 +0200
Subject: [PATCH 091/768] Move front matter schemas to Markdown\Contracts
 namespace

---
 .../Constructors/FindsNavigationDataForPage.php    |  2 +-
 .../framework/src/Framework/Concerns/HydePage.php  |  2 +-
 .../Concerns/Internal/ConstructsPageSchemas.php    |  2 +-
 .../Features/Blogging/Models/FeaturedImage.php     |  2 +-
 .../Features/Navigation/NavigationData.php         |  2 +-
 .../Contracts/FrontMatter/BlogPostSchema.php       |  4 ++--
 .../FrontMatter/DocumentationPageSchema.php        |  2 +-
 .../Contracts/FrontMatter/PageSchema.php           |  4 ++--
 .../FrontMatter/SubSchemas/FeaturedImageSchema.php |  2 +-
 .../FrontMatter/SubSchemas/NavigationSchema.php    |  2 +-
 packages/framework/src/Pages/DocumentationPage.php |  2 +-
 packages/framework/src/Pages/MarkdownPost.php      |  2 +-
 .../framework/tests/Feature/NavigationDataTest.php |  2 +-
 .../framework/tests/Unit/SchemaContractsTest.php   | 14 +++++++-------
 14 files changed, 22 insertions(+), 22 deletions(-)
 rename packages/framework/src/{Support => Markdown}/Contracts/FrontMatter/BlogPostSchema.php (77%)
 rename packages/framework/src/{Support => Markdown}/Contracts/FrontMatter/DocumentationPageSchema.php (84%)
 rename packages/framework/src/{Support => Markdown}/Contracts/FrontMatter/PageSchema.php (64%)
 rename packages/framework/src/{Support => Markdown}/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php (90%)
 rename packages/framework/src/{Support => Markdown}/Contracts/FrontMatter/SubSchemas/NavigationSchema.php (85%)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index b72b2ec475b..b0a608ea054 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -6,9 +6,9 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavigationData;
+use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
 use Illuminate\Support\Str;
 
 /**
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index a33242e921f..0bdb60fac84 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -11,9 +11,9 @@
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Contracts\CompilableContract;
-use Hyde\Support\Contracts\FrontMatter\PageSchema;
 use Hyde\Support\Route;
 use Illuminate\Support\Arr;
 
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index f43c903b431..d743b5ee9b0 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -9,8 +9,8 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Hyde;
+use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
 trait ConstructsPageSchemas
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 3f3ea5b345a..22fc8ca3002 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -7,7 +7,7 @@
 use Exception;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
-use Hyde\Support\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Stringable;
 
 /**
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationData.php b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
index 7ff518997e0..2ba4f21be78 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationData.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationData.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Features\Navigation;
 
 use ArrayObject;
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
-use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
similarity index 77%
rename from packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
rename to packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
index ee2fe0305ed..6cd6c59a621 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/BlogPostSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter;
+namespace Hyde\Markdown\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Pages\MarkdownPost
  */
-interface BlogPostSchema extends \Hyde\Support\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema
+interface BlogPostSchema extends \Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema
 {
     public const MARKDOWN_POST_SCHEMA = [
         'title'        => 'string',
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
similarity index 84%
rename from packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php
rename to packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
index 2f185462a63..2b59354556d 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/DocumentationPageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter;
+namespace Hyde\Markdown\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Pages\DocumentationPage
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
similarity index 64%
rename from packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
rename to packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
index 568951dac86..46d47ee1173 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/PageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter;
+namespace Hyde\Markdown\Contracts\FrontMatter;
 
 /**
  * @see \Hyde\Framework\Concerns\HydePage
  */
-interface PageSchema extends \Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema
+interface PageSchema extends \Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema
 {
     public const PAGE_SCHEMA = [
         'title'         => 'string',
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
similarity index 90%
rename from packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
rename to packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
index 817beb4e388..3b64a3baef1 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter\SubSchemas;
+namespace Hyde\Markdown\Contracts\FrontMatter\SubSchemas;
 
 /**
  * @see \Hyde\Framework\Features\Blogging\Models\FeaturedImage
diff --git a/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
similarity index 85%
rename from packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
rename to packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
index 71dba7e350c..61e547e63c7 100644
--- a/packages/framework/src/Support/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts\FrontMatter\SubSchemas;
+namespace Hyde\Markdown\Contracts\FrontMatter\SubSchemas;
 
 /**
  * @see \Hyde\Framework\Features\Navigation\NavigationData
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index bad6ddad77b..727c2c83a6e 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
 use Hyde\Support\Route;
 
 /**
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index d9974f9123a..ca06d459696 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Support\DateString;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationDataTest.php b/packages/framework/tests/Feature/NavigationDataTest.php
index d8c2b9e5934..0bd3764060e 100644
--- a/packages/framework/tests/Feature/NavigationDataTest.php
+++ b/packages/framework/tests/Feature/NavigationDataTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Navigation\NavigationData;
-use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 87ee67eeb02..0f1d96b02ca 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -4,19 +4,19 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Support\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Support\Contracts\FrontMatter\PageSchema;
-use Hyde\Support\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Testing\TestCase;
 
 /**
  * A state test to ensure the schemas can't be changed without breaking the tests.
  * This requires contributors to consider the impact of their changes as schema changes are rarely backwards compatible.
  *
- * @see \Hyde\Support\Contracts\FrontMatter\PageSchema
- * @see \Hyde\Support\Contracts\FrontMatter\BlogPostSchema
- * @see \Hyde\Support\Contracts\FrontMatter\DocumentationPageSchema
+ * @see \Hyde\Markdown\Contracts\FrontMatter\PageSchema
+ * @see \Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema
+ * @see \Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema
  */
 class SchemaContractsTest extends TestCase
 {

From 8c954eaa2bd9b47652a8e0d9541aeacec9840e41 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:56:23 +0200
Subject: [PATCH 092/768] Deprecate DocumentationPageSchema

---
 .../Markdown/Contracts/FrontMatter/DocumentationPageSchema.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
index 2b59354556d..439523d45cc 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/DocumentationPageSchema.php
@@ -6,6 +6,7 @@
 
 /**
  * @see \Hyde\Pages\DocumentationPage
+ * @deprecated The navigation is inherited by the parent page, and the category is not documented, thus presumed to be unused.
  */
 interface DocumentationPageSchema
 {

From c0f2e34de889cc0d67695617444d2b00e81f986f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 14:56:41 +0200
Subject: [PATCH 093/768] Update directory_structure.txt

---
 packages/framework/src/directory_structure.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/directory_structure.txt b/packages/framework/src/directory_structure.txt
index 0bfbbd77522..512d43002c7 100644
--- a/packages/framework/src/directory_structure.txt
+++ b/packages/framework/src/directory_structure.txt
@@ -24,13 +24,13 @@
 ├── Helpers
 ├── Markdown
 │   ├── Contracts
+│   │   └── FrontMatter
+│   │       └── SubSchemas
 │   ├── Models
 │   └── Processing
 ├── Pages
 └── Support
     ├── Concerns
     └── Contracts
-        └── FrontMatter
-            └── Support
 
 33 directories

From cbb7ed4bedd3499a0d38256e52f88d76fc8d5f68 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:00:00 +0200
Subject: [PATCH 094/768] Revert "Create directory_structure.txt"

This reverts commit e41a2d8d5d3d4550c87152cd3f57e8bf98f86635.
---
 .../framework/src/directory_structure.txt     | 36 -------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 packages/framework/src/directory_structure.txt

diff --git a/packages/framework/src/directory_structure.txt b/packages/framework/src/directory_structure.txt
deleted file mode 100644
index 512d43002c7..00000000000
--- a/packages/framework/src/directory_structure.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-.
-├── Console
-│   └── Commands
-├── Foundation
-│   └── Concerns
-├── Framework
-│   ├── Actions
-│   │   ├── Constructors
-│   │   └── PostBuildTasks
-│   ├── Concerns
-│   │   └── Internal
-│   ├── Exceptions
-│   ├── Features
-│   │   ├── Blogging
-│   │   │   └── Models
-│   │   ├── DataCollections
-│   │   │   └── Facades
-│   │   ├── Metadata
-│   │   │   └── Elements
-│   │   └── Navigation
-│   ├── Services
-│   └── Views
-│       └── Components
-├── Helpers
-├── Markdown
-│   ├── Contracts
-│   │   └── FrontMatter
-│   │       └── SubSchemas
-│   ├── Models
-│   └── Processing
-├── Pages
-└── Support
-    ├── Concerns
-    └── Contracts
-
-33 directories

From 9ccbb0f32b5a7b0075fbfcd5b205d57800a6d921 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:01:54 +0200
Subject: [PATCH 095/768] Update RELEASE_NOTES.md

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

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c253f893168..2392b06d200 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -18,6 +18,7 @@ This serves two purposes:
 These are changes that break backwards compatibility and that are likely to concern users using HydePHP to create sites.
 
 - HydePHP now requires PHP 8.1 or higher.
+- Almost all namespaces in the framework have been changed and restructured.
 
 #### Breaking internal changes
 These are changes that break backwards compatibility but are unlikely to concern users using HydePHP to create sites.

From 00ad65417216a25bb1c5e5be645dbb6a3732e0a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:06:46 +0200
Subject: [PATCH 096/768] Move BuildTaskContract to BuildTasks namespace

---
 packages/framework/src/Framework/Concerns/AbstractBuildTask.php | 2 +-
 .../Features/BuildTasks}/Contracts/BuildTaskContract.php        | 2 +-
 packages/framework/src/Framework/Services/BuildTaskService.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/{Support => Framework/Features/BuildTasks}/Contracts/BuildTaskContract.php (86%)

diff --git a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
index bc6d8473443..cda8977f02e 100644
--- a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Concerns;
 
+use Hyde\Framework\Features\BuildTasks\Contracts\BuildTaskContract;
 use Hyde\Hyde;
-use Hyde\Support\Contracts\BuildTaskContract;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Throwable;
diff --git a/packages/framework/src/Support/Contracts/BuildTaskContract.php b/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
similarity index 86%
rename from packages/framework/src/Support/Contracts/BuildTaskContract.php
rename to packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
index ce59f2a230d..6c724035041 100644
--- a/packages/framework/src/Support/Contracts/BuildTaskContract.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Contracts;
+namespace Hyde\Framework\Features\BuildTasks\Contracts;
 
 use Illuminate\Console\OutputStyle;
 
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index ad996d79ac6..583a82c4f04 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
+use Hyde\Framework\Features\BuildTasks\Contracts\BuildTaskContract;
 use Hyde\Hyde;
-use Hyde\Support\Contracts\BuildTaskContract;
 use Illuminate\Console\OutputStyle;
 
 /**

From 4c92706b0904405fd84061d6362087ffed25c486 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:07:42 +0200
Subject: [PATCH 097/768] Move AbstractBuildTask to BuildTasks namespace

---
 docs/digging-deeper/advanced-customization.md               | 2 +-
 .../Actions/PostBuildTasks/GenerateBuildManifest.php        | 2 +-
 .../Framework/Actions/PostBuildTasks/GenerateRssFeed.php    | 2 +-
 .../src/Framework/Actions/PostBuildTasks/GenerateSearch.php | 2 +-
 .../Framework/Actions/PostBuildTasks/GenerateSitemap.php    | 2 +-
 .../{Concerns => Features/BuildTasks}/AbstractBuildTask.php | 2 +-
 .../tests/Feature/Services/BuildTaskServiceTest.php         | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/framework/src/Framework/{Concerns => Features/BuildTasks}/AbstractBuildTask.php (97%)

diff --git a/docs/digging-deeper/advanced-customization.md b/docs/digging-deeper/advanced-customization.md
index 73186dc98e0..abb95a4fd25 100644
--- a/docs/digging-deeper/advanced-customization.md
+++ b/docs/digging-deeper/advanced-customization.md
@@ -106,7 +106,7 @@ You can also set the description, and an optional `then()` method to run after t
 
 namespace App\Actions;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 
 class ExampleTask extends AbstractBuildTask
 {
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
index ddc3483ff7f..6d0f0a6db4b 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
 use Hyde\Framework\Concerns\HydePage;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 use Hyde\Framework\Services\ChecksumService;
 use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
index 746643b37ad..6235e2f9f8b 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 use Hyde\Framework\Services\RssFeedService;
 use Hyde\Hyde;
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
index ac765aea533..c21aba1493d 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Framework\Services\DocumentationSearchService;
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
index 54ce9bbd704..98096a1512c 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 use Hyde\Framework\Services\SitemapService;
 use Hyde\Hyde;
 
diff --git a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php b/packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php
similarity index 97%
rename from packages/framework/src/Framework/Concerns/AbstractBuildTask.php
rename to packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php
index cda8977f02e..0bec5fc2a35 100644
--- a/packages/framework/src/Framework/Concerns/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Concerns;
+namespace Hyde\Framework\Features\BuildTasks;
 
 use Hyde\Framework\Features\BuildTasks\Contracts\BuildTaskContract;
 use Hyde\Hyde;
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index cc17d1c8089..06c944882fa 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -12,7 +12,7 @@
 
 /**
  * @covers \Hyde\Framework\Services\BuildTaskService
- * @covers \Hyde\Framework\Concerns\AbstractBuildTask
+ * @covers \Hyde\Framework\Features\BuildTasks\AbstractBuildTask
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
@@ -196,7 +196,7 @@ public function test_automatically_discovered_tasks_can_be_executed()
 
 namespace App\Actions;
 
-use Hyde\Framework\Concerns\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
 
 class FooBuildTask extends AbstractBuildTask {
     public function run(): void {

From 0bf690306d923e770a0ae747c84179d002814f1a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:09:02 +0200
Subject: [PATCH 098/768] Rename AbstractBuildTask to BuildTask

---
 docs/digging-deeper/advanced-customization.md |  6 ++---
 .../PostBuildTasks/GenerateBuildManifest.php  |  4 ++--
 .../PostBuildTasks/GenerateRssFeed.php        |  4 ++--
 .../Actions/PostBuildTasks/GenerateSearch.php |  4 ++--
 .../PostBuildTasks/GenerateSitemap.php        |  4 ++--
 .../{AbstractBuildTask.php => BuildTask.php}  |  2 +-
 .../Feature/Services/BuildTaskServiceTest.php | 24 +++++++++----------
 7 files changed, 24 insertions(+), 24 deletions(-)
 rename packages/framework/src/Framework/Features/BuildTasks/{AbstractBuildTask.php => BuildTask.php} (97%)

diff --git a/docs/digging-deeper/advanced-customization.md b/docs/digging-deeper/advanced-customization.md
index abb95a4fd25..15b36b6150c 100644
--- a/docs/digging-deeper/advanced-customization.md
+++ b/docs/digging-deeper/advanced-customization.md
@@ -80,7 +80,7 @@ Maybe you want to create your own, to for example upload the site to FTP or copy
 Here is a minimal example to get you started. For all these examples we assume you put the file in the `App/Actions` directory, but you can put them anywhere.
 
 ```php
-class SimpleTask extends AbstractBuildTask
+class SimpleTask extends BuildTask
 {
     public function run(): void
     {
@@ -106,9 +106,9 @@ You can also set the description, and an optional `then()` method to run after t
 
 namespace App\Actions;
 
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 
-class ExampleTask extends AbstractBuildTask
+class ExampleTask extends BuildTask
 {
     public static string $description = 'Say hello';
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
index 6d0f0a6db4b..0399cc08db3 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\ChecksumService;
 use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
@@ -14,7 +14,7 @@
 /**
  * @see \Hyde\Framework\Testing\Unit\GenerateBuildManifestTest
  */
-class GenerateBuildManifest extends AbstractBuildTask
+class GenerateBuildManifest extends BuildTask
 {
     public static string $description = 'Generating build manifest';
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
index 6235e2f9f8b..ce8db8a6ace 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\RssFeedService;
 use Hyde\Hyde;
 
-class GenerateRssFeed extends AbstractBuildTask
+class GenerateRssFeed extends BuildTask
 {
     public static string $description = 'Generating RSS feed';
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
index c21aba1493d..eee0711d7f6 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Framework\Services\DocumentationSearchService;
 
-class GenerateSearch extends AbstractBuildTask
+class GenerateSearch extends BuildTask
 {
     use InteractsWithDirectories;
 
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
index 98096a1512c..c035b05f913 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
+++ b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Actions\PostBuildTasks;
 
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\SitemapService;
 use Hyde\Hyde;
 
-class GenerateSitemap extends AbstractBuildTask
+class GenerateSitemap extends BuildTask
 {
     public static string $description = 'Generating sitemap';
 
diff --git a/packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
similarity index 97%
rename from packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php
rename to packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
index 0bec5fc2a35..a11222f06da 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/AbstractBuildTask.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
@@ -13,7 +13,7 @@
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\BuildTaskServiceTest
  */
-abstract class AbstractBuildTask implements BuildTaskContract
+abstract class BuildTask implements BuildTaskContract
 {
     use InteractsWithIO;
 
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index 06c944882fa..a213f3f2c07 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
@@ -12,7 +12,7 @@
 
 /**
  * @covers \Hyde\Framework\Services\BuildTaskService
- * @covers \Hyde\Framework\Features\BuildTasks\AbstractBuildTask
+ * @covers \Hyde\Framework\Features\BuildTasks\BuildTask
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
@@ -85,7 +85,7 @@ public function test_run_post_build_tasks_runs_configured_tasks()
         $service = $this->makeService();
         $service->runPostBuildTasks();
 
-        $this->expectOutputString('AbstractBuildTask');
+        $this->expectOutputString('BuildTask');
     }
 
     /**
@@ -98,7 +98,7 @@ public function test_run_method_runs_task_by_class_name_input_and_returns_self()
         $service = $this->makeService();
         $return = $service->run(get_class($task));
 
-        $this->expectOutputString('AbstractBuildTask');
+        $this->expectOutputString('BuildTask');
 
         $this->assertSame($service, $return);
     }
@@ -113,7 +113,7 @@ public function test_run_if_runs_task_if_supplied_boolean_is_true()
         $service = $this->makeService();
         $return = $service->runIf(get_class($task), true);
 
-        $this->expectOutputString('AbstractBuildTask');
+        $this->expectOutputString('BuildTask');
 
         $this->assertSame($service, $return);
     }
@@ -145,7 +145,7 @@ public function test_run_if_runs_task_if_supplied_callable_returns_true()
             return true;
         });
 
-        $this->expectOutputString('AbstractBuildTask');
+        $this->expectOutputString('BuildTask');
 
         $this->assertSame($service, $return);
     }
@@ -169,7 +169,7 @@ public function test_run_if_does_not_run_task_if_supplied_callable_returns_false
 
     public function test_exception_handler_shows_error_message_and_exits_with_code_1_without_throwing_exception()
     {
-        $return = (new class extends AbstractBuildTask
+        $return = (new class extends BuildTask
         {
             public function run(): void
             {
@@ -196,9 +196,9 @@ public function test_automatically_discovered_tasks_can_be_executed()
 
 namespace App\Actions;
 
-use Hyde\Framework\Features\BuildTasks\AbstractBuildTask;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 
-class FooBuildTask extends AbstractBuildTask {
+class FooBuildTask extends BuildTask {
     public function run(): void {
         echo "FooBuildTask";
     }
@@ -216,13 +216,13 @@ protected function makeService(): BuildTaskService
         return new BuildTaskService();
     }
 
-    protected function makeTask(): AbstractBuildTask
+    protected function makeTask(): BuildTask
     {
-        return new class extends AbstractBuildTask
+        return new class extends BuildTask
         {
             public function run(): void
             {
-                echo 'AbstractBuildTask';
+                echo 'BuildTask';
             }
         };
     }

From f1e5720141c3071df449b616beaf5243c2e53de4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:11:02 +0200
Subject: [PATCH 099/768] Deprecate BuildTaskContract

---
 .../Features/BuildTasks/Contracts/BuildTaskContract.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php b/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
index 6c724035041..0beb2d868cd 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
@@ -6,6 +6,9 @@
 
 use Illuminate\Console\OutputStyle;
 
+/**
+ * @deprecated
+ */
 interface BuildTaskContract
 {
     public function __construct(?OutputStyle $output = null);

From 4cb39b038d4f9ecc0c3085c53c6e6ff1d84b27fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:11:16 +0200
Subject: [PATCH 100/768] No longer implement BuildTaskContract

---
 .../framework/src/Framework/Features/BuildTasks/BuildTask.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
index a11222f06da..160b97ab3b8 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/BuildTask.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\BuildTasks;
 
-use Hyde\Framework\Features\BuildTasks\Contracts\BuildTaskContract;
 use Hyde\Hyde;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
@@ -13,7 +12,7 @@
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\BuildTaskServiceTest
  */
-abstract class BuildTask implements BuildTaskContract
+abstract class BuildTask
 {
     use InteractsWithIO;
 

From 3f8ffe7f312f91d45d72085b8449b6c61b4fffa3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:12:09 +0200
Subject: [PATCH 101/768] Type hint the base class instead of contract

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

diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index 583a82c4f04..a9a50bc9757 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
-use Hyde\Framework\Features\BuildTasks\Contracts\BuildTaskContract;
+use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
 
@@ -80,7 +80,7 @@ public function runIf(string $task, callable|bool $condition): static
         return $this;
     }
 
-    protected function runTask(BuildTaskContract $task): static
+    protected function runTask(BuildTask $task): static
     {
         $task->handle();
 

From 893d3eaeaac78c39a0a333343255b99fc3066d47 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:12:30 +0200
Subject: [PATCH 102/768] Delete BuildTaskContract.php

---
 .../Contracts/BuildTaskContract.php           | 25 -------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php

diff --git a/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php b/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
deleted file mode 100644
index 0beb2d868cd..00000000000
--- a/packages/framework/src/Framework/Features/BuildTasks/Contracts/BuildTaskContract.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\BuildTasks\Contracts;
-
-use Illuminate\Console\OutputStyle;
-
-/**
- * @deprecated
- */
-interface BuildTaskContract
-{
-    public function __construct(?OutputStyle $output = null);
-
-    public function run(): void;
-
-    public function then(): void;
-
-    public function handle(): ?int;
-
-    public function getDescription(): string;
-
-    public function getExecutionTime(): string;
-}

From 3316bee8ee256a14f9d09f66f66a5e518ed60aac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:13:21 +0200
Subject: [PATCH 103/768] Move PostBuildTasks to BuildTasks namespace

---
 .../framework/src/Console/Commands/BuildRssFeedCommand.php  | 2 +-
 .../framework/src/Console/Commands/BuildSearchCommand.php   | 2 +-
 .../framework/src/Console/Commands/BuildSiteCommand.php     | 6 +++---
 .../framework/src/Console/Commands/BuildSitemapCommand.php  | 2 +-
 .../BuildTasks}/PostBuildTasks/GenerateBuildManifest.php    | 2 +-
 .../BuildTasks}/PostBuildTasks/GenerateRssFeed.php          | 2 +-
 .../BuildTasks}/PostBuildTasks/GenerateSearch.php           | 2 +-
 .../BuildTasks}/PostBuildTasks/GenerateSitemap.php          | 2 +-
 .../framework/src/Framework/Services/BuildTaskService.php   | 2 +-
 .../tests/Feature/Commands/BuildRssFeedCommandTest.php      | 2 +-
 .../tests/Feature/Commands/BuildSearchCommandTest.php       | 4 ++--
 .../tests/Feature/Commands/BuildSitemapCommandTest.php      | 2 +-
 .../tests/Feature/Services/BuildTaskServiceTest.php         | 6 +++---
 packages/framework/tests/Unit/GenerateBuildManifestTest.php | 4 ++--
 14 files changed, 20 insertions(+), 20 deletions(-)
 rename packages/framework/src/Framework/{Actions => Features/BuildTasks}/PostBuildTasks/GenerateBuildManifest.php (96%)
 rename packages/framework/src/Framework/{Actions => Features/BuildTasks}/PostBuildTasks/GenerateRssFeed.php (90%)
 rename packages/framework/src/Framework/{Actions => Features/BuildTasks}/PostBuildTasks/GenerateSearch.php (95%)
 rename packages/framework/src/Framework/{Actions => Features/BuildTasks}/PostBuildTasks/GenerateSitemap.php (89%)

diff --git a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
index c7d905dba55..b8d84ed4c1d 100644
--- a/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
+++ b/packages/framework/src/Console/Commands/BuildRssFeedCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 42fcd21344c..7c53e0a60e3 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 1d2c2286649..54bf82b3c99 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
diff --git a/packages/framework/src/Console/Commands/BuildSitemapCommand.php b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
index 9724b11386f..02d64e516d4 100644
--- a/packages/framework/src/Console/Commands/BuildSitemapCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSitemapCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
similarity index 96%
rename from packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
rename to packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
index 0399cc08db3..114a3d1eff9 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions\PostBuildTasks;
+namespace Hyde\Framework\Features\BuildTasks\PostBuildTasks;
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateRssFeed.php
similarity index 90%
rename from packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
rename to packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateRssFeed.php
index ce8db8a6ace..92d5af570a1 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateRssFeed.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateRssFeed.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions\PostBuildTasks;
+namespace Hyde\Framework\Features\BuildTasks\PostBuildTasks;
 
 use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\RssFeedService;
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSearch.php
similarity index 95%
rename from packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
rename to packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSearch.php
index eee0711d7f6..00c7a1b86a7 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSearch.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions\PostBuildTasks;
+namespace Hyde\Framework\Features\BuildTasks\PostBuildTasks;
 
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSitemap.php
similarity index 89%
rename from packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
rename to packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSitemap.php
index c035b05f913..85798b4ea5b 100644
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSitemap.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateSitemap.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions\PostBuildTasks;
+namespace Hyde\Framework\Features\BuildTasks\PostBuildTasks;
 
 use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\SitemapService;
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index a9a50bc9757..1b860143d0c 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Hyde;
 use Illuminate\Console\OutputStyle;
 
diff --git a/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
index 19567251b09..d1e62477473 100644
--- a/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
@@ -9,7 +9,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\BuildRssFeedCommand
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed
  */
 class BuildRssFeedCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index 3dcb0d093fb..b63e5f536cf 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Support\Site;
@@ -12,7 +12,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch
  */
 class BuildSearchCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index c2a85a0625c..c9052feaf0d 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -9,7 +9,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\BuildSitemapCommand
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap
  */
 class BuildSitemapCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index a213f3f2c07..1066f375110 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -13,9 +13,9 @@
 /**
  * @covers \Hyde\Framework\Services\BuildTaskService
  * @covers \Hyde\Framework\Features\BuildTasks\BuildTask
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch
  *
  * @backupStaticAttributes enabled
  */
diff --git a/packages/framework/tests/Unit/GenerateBuildManifestTest.php b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
index 8834e8b28d1..ff45cb5cf93 100644
--- a/packages/framework/tests/Unit/GenerateBuildManifestTest.php
+++ b/packages/framework/tests/Unit/GenerateBuildManifestTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
+use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Services\ChecksumService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest
+ * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateBuildManifest
  */
 class GenerateBuildManifestTest extends TestCase
 {

From 43643cd732123182f09e7bb36ff14d7581fe4de8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:21:10 +0200
Subject: [PATCH 104/768] Fix namespace

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

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index ca06d459696..d14d4dd29e7 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -32,7 +32,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?PostAuthor $author = null;
     public ?FeaturedImage $image = null;
 
-    /** @return \Hyde\Foundation\PageCollection<\Hyde\Framework\Models\Pages\MarkdownPost> */
+    /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
     {
         return static::all()->sortByDesc('matter.date');

From 51c94a3422feb558399bf542d3cd1a1a2e9a5c09 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:44:55 +0200
Subject: [PATCH 105/768] Remove unnecessary property override

---
 packages/framework/src/Pages/MarkdownPost.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index d14d4dd29e7..1c777ecd78b 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -25,7 +25,6 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public static string $outputDirectory = 'posts';
     public static string $template = 'hyde::layouts/post';
 
-    public string $title;
     public ?string $description = null;
     public ?string $category = null;
     public ?DateString $date = null;

From 75735b01666a9f09f1b697565e9140926f114a92 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:49:41 +0200
Subject: [PATCH 106/768] Construct blog post data using method

---
 .../Internal/ConstructsPageSchemas.php        | 12 +++++++-----
 packages/framework/src/Pages/MarkdownPost.php | 19 ++++++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index d743b5ee9b0..3d95bca1d12 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -47,11 +47,13 @@ protected function makeCanonicalUrl(): ?string
     protected function constructBlogPostSchema(): void
     {
         if ($this instanceof MarkdownPost) {
-            $this->category = $this->matter('category');
-            $this->description = $this->matter('description', $this->makeDescription((string) $this->markdown));
-            $this->date = $this->matter('date') !== null ? new DateString($this->matter('date')) : null;
-            $this->author = $this->getAuthor();
-            $this->image = $this->getImage();
+            $this->constructBlogPostData(
+                description: $this->matter('description', $this->makeDescription((string) $this->markdown)),
+                category: $this->matter('category'),
+                date: $this->matter('date') !== null ? new DateString($this->matter('date')) : null,
+                author: $this->getAuthor(),
+                image: $this->getImage(),
+            );
         }
     }
 
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 1c777ecd78b..a8d4769f61b 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -25,11 +25,20 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public static string $outputDirectory = 'posts';
     public static string $template = 'hyde::layouts/post';
 
-    public ?string $description = null;
-    public ?string $category = null;
-    public ?DateString $date = null;
-    public ?PostAuthor $author = null;
-    public ?FeaturedImage $image = null;
+    public ?string $description;
+    public ?string $category;
+    public ?DateString $date;
+    public ?PostAuthor $author;
+    public ?FeaturedImage $image;
+
+    public function constructBlogPostData(?string $description, ?string $category, ?DateString $date, ?PostAuthor $author, ?FeaturedImage $image)
+    {
+        $this->description = $description;
+        $this->category = $category;
+        $this->date = $date;
+        $this->author = $author;
+        $this->image = $image;
+    }
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection

From 460ad38495827d69ecfc4d828fbe49d5c72384cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:51:18 +0200
Subject: [PATCH 107/768] Experiment with making properties readonly

---
 packages/framework/src/Pages/MarkdownPost.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index a8d4769f61b..2e5c872bc18 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -25,11 +25,11 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public static string $outputDirectory = 'posts';
     public static string $template = 'hyde::layouts/post';
 
-    public ?string $description;
-    public ?string $category;
-    public ?DateString $date;
-    public ?PostAuthor $author;
-    public ?FeaturedImage $image;
+    public readonly ?string $description;
+    public readonly ?string $category;
+    public readonly ?DateString $date;
+    public readonly ?PostAuthor $author;
+    public readonly ?FeaturedImage $image;
 
     public function constructBlogPostData(?string $description, ?string $category, ?DateString $date, ?PostAuthor $author, ?FeaturedImage $image)
     {

From 13d531300ee71ff0399764643bc3992fcc7d7db9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 15:53:17 +0200
Subject: [PATCH 108/768] Create MarkdownPostConstructor.php

---
 .../src/Pages/Factories/MarkdownPostConstructor.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Pages/Factories/MarkdownPostConstructor.php

diff --git a/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php b/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php
new file mode 100644
index 00000000000..93c1038d943
--- /dev/null
+++ b/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Pages\Factories;
+
+class MarkdownPostConstructor
+{
+    //
+}

From 8bb10f398c53aa577237bb8932b55506c46c3c7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:26:24 +0200
Subject: [PATCH 109/768] Extract front matter logic to trait

---
 .../src/Framework/Concerns/HasFrontMatter.php | 47 +++++++++++++++++++
 .../src/Framework/Concerns/HydePage.php       | 34 +-------------
 2 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 packages/framework/src/Framework/Concerns/HasFrontMatter.php

diff --git a/packages/framework/src/Framework/Concerns/HasFrontMatter.php b/packages/framework/src/Framework/Concerns/HasFrontMatter.php
new file mode 100644
index 00000000000..d8a10a6870d
--- /dev/null
+++ b/packages/framework/src/Framework/Concerns/HasFrontMatter.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Concerns;
+
+use Illuminate\Support\Arr;
+use function array_filter;
+use function array_merge;
+use function blank;
+
+/**
+ * Adds methods to a class to allow it to fluently interact with the front matter.
+ */
+trait HasFrontMatter
+{
+    /**
+     * Get a value from the computed page data, or fallback to the page's front matter, then to the default value.
+     *
+     * @return \Hyde\Markdown\Models\FrontMatter|mixed
+     */
+    public function get(string $key = null, mixed $default = null): mixed
+    {
+        return Arr::get(array_filter(array_merge(
+            $this->matter->toArray(),
+            (array) $this,
+        )), $key, $default);
+    }
+
+    /**
+     * Get the front matter object, or a value from within.
+     *
+     * @return \Hyde\Markdown\Models\FrontMatter|mixed
+     */
+    public function matter(string $key = null, mixed $default = null): mixed
+    {
+        return $this->matter->get($key, $default);
+    }
+
+    /**
+     * See if a value exists in the computed page data or the front matter.
+     */
+    public function has(string $key): bool
+    {
+        return ! blank($this->get($key));
+    }
+}
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 0bdb60fac84..b7b8ab9787b 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -37,6 +37,7 @@
 abstract class HydePage implements CompilableContract, PageSchema
 {
     use ConstructsPageSchemas;
+    use HasFrontMatter;
 
     public static string $sourceDirectory;
     public static string $outputDirectory;
@@ -226,39 +227,6 @@ public function getBladeView(): string
         return static::$template;
     }
 
-    // Section: Front Matter
-
-    /**
-     * Get a value from the computed page data, or fallback to the page's front matter, then to the default value.
-     *
-     * @return \Hyde\Markdown\Models\FrontMatter|mixed
-     */
-    public function get(string $key = null, mixed $default = null): mixed
-    {
-        return Arr::get(array_filter(array_merge(
-            $this->matter->toArray(),
-            (array) $this,
-        )), $key, $default);
-    }
-
-    /**
-     * Get the front matter object, or a value from within.
-     *
-     * @return \Hyde\Markdown\Models\FrontMatter|mixed
-     */
-    public function matter(string $key = null, mixed $default = null): mixed
-    {
-        return $this->matter->get($key, $default);
-    }
-
-    /**
-     * See if a value exists in the computed page data or the front matter.
-     */
-    public function has(string $key): bool
-    {
-        return ! blank($this->get($key));
-    }
-
     // Section: Accessors
 
     /**

From bc576d01fd1cf88db6fa264915d196f9dc220b0a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:29:20 +0200
Subject: [PATCH 110/768] Revert "Create MarkdownPostConstructor.php"

This reverts commit 13d531300ee71ff0399764643bc3992fcc7d7db9.
---
 .../src/Pages/Factories/MarkdownPostConstructor.php    | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 packages/framework/src/Pages/Factories/MarkdownPostConstructor.php

diff --git a/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php b/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php
deleted file mode 100644
index 93c1038d943..00000000000
--- a/packages/framework/src/Pages/Factories/MarkdownPostConstructor.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Pages\Factories;
-
-class MarkdownPostConstructor
-{
-    //
-}

From cae7d259628fa1d4eb8b152cb450f27e144dd9fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:30:50 +0200
Subject: [PATCH 111/768] Create BlogPostData.php

---
 .../src/Pages/DataObjects/BlogPostData.php    | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 packages/framework/src/Pages/DataObjects/BlogPostData.php

diff --git a/packages/framework/src/Pages/DataObjects/BlogPostData.php b/packages/framework/src/Pages/DataObjects/BlogPostData.php
new file mode 100644
index 00000000000..f612db991c3
--- /dev/null
+++ b/packages/framework/src/Pages/DataObjects/BlogPostData.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Pages\DataObjects;
+
+use Hyde\Framework\Concerns\HasFrontMatter;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
+use Hyde\Support\DateString;
+use Illuminate\Contracts\Support\Arrayable;
+use function strlen;
+use function substr;
+
+class BlogPostData implements Arrayable
+{
+    use HasFrontMatter;
+
+    private FrontMatter $matter;
+    private Markdown $markdown;
+
+    protected readonly ?string $description;
+    protected readonly ?string $category;
+    protected readonly ?DateString $date;
+    protected readonly ?PostAuthor $author;
+    protected readonly ?FeaturedImage $image;
+
+    public function __construct(FrontMatter $matter, Markdown $markdown)
+    {
+        $this->matter = $matter;
+        $this->markdown = $markdown;
+
+        $this->description = $this->makeDescription();
+        $this->category = $this->makeCategory();
+        $this->date = $this->makeDate();
+        $this->author = $this->makeAuthor();
+        $this->image = $this->makeImage();
+    }
+
+    public function toArray(): array
+    {
+        return [
+            'description' => $this->description,
+            'category' => $this->category,
+            'date' => $this->date,
+            'author' => $this->author,
+            'image' => $this->image,
+        ];
+    }
+
+    protected function makeDescription(): string
+    {
+        return $this->matter('description') ?? $this->getTruncatedMarkdown($this->markdown->body());
+    }
+
+    protected function makeCategory(): ?string
+    {
+        return $this->matter('category');
+    }
+
+    protected function makeDate(): ?DateString
+    {
+        if ($this->matter('date')) {
+            return new DateString($this->matter('date'));
+        }
+
+        return null;
+    }
+
+    protected function makeAuthor(): ?PostAuthor
+    {
+        if ($this->matter('author')) {
+            return PostAuthor::make($this->matter('author'));
+        }
+
+        return null;
+    }
+
+    protected function makeImage(): ?FeaturedImage
+    {
+        if ($this->matter('image')) {
+            return FeaturedImage::make($this->matter('image'));
+        }
+
+        return null;
+    }
+
+    private function getTruncatedMarkdown(string $markdown): string
+    {
+        if (strlen($markdown) >= 128) {
+            return substr($markdown, 0, 125).'...';
+        }
+
+        return $markdown;
+    }
+}

From ca309ab06c6cfbba7ba93997e7989a9a99c59dfd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:31:41 +0200
Subject: [PATCH 112/768] Update constructors

---
 packages/framework/src/Pages/MarkdownPost.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2e5c872bc18..7049526cfbf 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -9,6 +9,9 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
+use Hyde\Pages\DataObjects\BlogPostData;
 use Hyde\Support\DateString;
 
 /**
@@ -31,13 +34,16 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public readonly ?PostAuthor $author;
     public readonly ?FeaturedImage $image;
 
-    public function constructBlogPostData(?string $description, ?string $category, ?DateString $date, ?PostAuthor $author, ?FeaturedImage $image)
+    public function __construct(string $identifier = '', ?FrontMatter $matter = null, ?Markdown $markdown = null)
     {
-        $this->description = $description;
-        $this->category = $category;
-        $this->date = $date;
-        $this->author = $author;
-        $this->image = $image;
+        parent::__construct($identifier, $matter, $markdown);
+    }
+
+    public function constructBlogPostData(BlogPostData $data): void
+    {
+        foreach ($data->toArray() as $key => $value) {
+            $this->{$key} = $value;
+        }
     }
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */

From ac314ce47b8864661d098bc2a6e6e36afa6f7538 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:31:50 +0200
Subject: [PATCH 113/768] Remove moved logic

---
 .../Internal/ConstructsPageSchemas.php        | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 3d95bca1d12..2a9c27290f1 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -10,6 +10,7 @@
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Pages\DataObjects\BlogPostData;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Support\DateString;
 
@@ -47,40 +48,7 @@ protected function makeCanonicalUrl(): ?string
     protected function constructBlogPostSchema(): void
     {
         if ($this instanceof MarkdownPost) {
-            $this->constructBlogPostData(
-                description: $this->matter('description', $this->makeDescription((string) $this->markdown)),
-                category: $this->matter('category'),
-                date: $this->matter('date') !== null ? new DateString($this->matter('date')) : null,
-                author: $this->getAuthor(),
-                image: $this->getImage(),
-            );
+            $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
         }
     }
-
-    protected function makeDescription(string $markdown): string
-    {
-        if (strlen($markdown) >= 128) {
-            return substr($markdown, 0, 125).'...';
-        }
-
-        return $markdown;
-    }
-
-    protected function getAuthor(): ?PostAuthor
-    {
-        if ($this->matter('author')) {
-            return PostAuthor::make($this->matter('author'));
-        }
-
-        return null;
-    }
-
-    protected function getImage(): ?FeaturedImage
-    {
-        if ($this->matter('image')) {
-            return FeaturedImage::make($this->matter('image'));
-        }
-
-        return null;
-    }
 }

From 184e10005913b7edbfe12ec97e837aa8100b4eeb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:32:12 +0200
Subject: [PATCH 114/768] Inline method

---
 .../Concerns/Internal/ConstructsPageSchemas.php       | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 2a9c27290f1..b13acaff650 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -21,7 +21,9 @@ protected function constructPageSchemas(): void
         $this->constructPageSchema();
 
         if ($this instanceof BlogPostSchema) {
-            $this->constructBlogPostSchema();
+            if ($this instanceof MarkdownPost) {
+                $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
+            }
         }
     }
 
@@ -44,11 +46,4 @@ protected function makeCanonicalUrl(): ?string
 
         return null;
     }
-
-    protected function constructBlogPostSchema(): void
-    {
-        if ($this instanceof MarkdownPost) {
-            $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
-        }
-    }
 }

From 859abafda5bde28fe34555d2de1ab112dccfd2ae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:32:25 +0200
Subject: [PATCH 115/768] Unwrap if

---
 .../Framework/Concerns/Internal/ConstructsPageSchemas.php   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index b13acaff650..5024f93a1f3 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -20,10 +20,8 @@ protected function constructPageSchemas(): void
     {
         $this->constructPageSchema();
 
-        if ($this instanceof BlogPostSchema) {
-            if ($this instanceof MarkdownPost) {
-                $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
-            }
+        if ($this instanceof MarkdownPost) {
+            $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
         }
     }
 

From bf978464db4c68603988308e4320925b6f43d8ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:33:20 +0200
Subject: [PATCH 116/768] Add class PHPDoc

---
 packages/framework/src/Pages/DataObjects/BlogPostData.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Pages/DataObjects/BlogPostData.php b/packages/framework/src/Pages/DataObjects/BlogPostData.php
index f612db991c3..0450ca904fb 100644
--- a/packages/framework/src/Pages/DataObjects/BlogPostData.php
+++ b/packages/framework/src/Pages/DataObjects/BlogPostData.php
@@ -14,6 +14,11 @@
 use function strlen;
 use function substr;
 
+/**
+ * Streamlines the data specific to a blog post.
+ *
+ * Simply pass along the data the class needs to run, then access the data using the toArray() method.
+ */
 class BlogPostData implements Arrayable
 {
     use HasFrontMatter;

From 1fd622f7b50fd8a67945cf8d1fe8896761fb353f Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 14:33:34 +0000
Subject: [PATCH 117/768] Apply fixes from StyleCI

---
 packages/framework/src/Framework/Concerns/HasFrontMatter.php  | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php        | 1 -
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/HasFrontMatter.php b/packages/framework/src/Framework/Concerns/HasFrontMatter.php
index d8a10a6870d..f126f8f4900 100644
--- a/packages/framework/src/Framework/Concerns/HasFrontMatter.php
+++ b/packages/framework/src/Framework/Concerns/HasFrontMatter.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Illuminate\Support\Arr;
 use function array_filter;
 use function array_merge;
 use function blank;
+use Illuminate\Support\Arr;
 
 /**
  * Adds methods to a class to allow it to fluently interact with the front matter.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index b7b8ab9787b..2a8762273df 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -15,7 +15,6 @@
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Contracts\CompilableContract;
 use Hyde\Support\Route;
-use Illuminate\Support\Arr;
 
 /**
  * The base class for all Hyde pages.
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 5024f93a1f3..6ad0c78dd6b 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -6,13 +6,9 @@
 
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Hyde;
-use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Pages\DataObjects\BlogPostData;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\DateString;
 
 trait ConstructsPageSchemas
 {

From 77915f33c0c5da57bab12563c50989e088b70770 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:34:55 +0200
Subject: [PATCH 118/768] Update PHPDoc

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

diff --git a/packages/framework/src/Pages/DataObjects/BlogPostData.php b/packages/framework/src/Pages/DataObjects/BlogPostData.php
index 0450ca904fb..65c0e962739 100644
--- a/packages/framework/src/Pages/DataObjects/BlogPostData.php
+++ b/packages/framework/src/Pages/DataObjects/BlogPostData.php
@@ -15,7 +15,7 @@
 use function substr;
 
 /**
- * Streamlines the data specific to a blog post.
+ * Streamlines the data construction specific to a blog post.
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
  */

From d85bc398818bcbe97b3cebb2cf1baa0e757e40a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:35:14 +0200
Subject: [PATCH 119/768] Rename class to BlogPostFactory

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 4 ++--
 .../DataObjects/{BlogPostData.php => BlogPostFactory.php}     | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                 | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/framework/src/Pages/DataObjects/{BlogPostData.php => BlogPostFactory.php} (98%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 6ad0c78dd6b..a4d1e102cf5 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Hyde;
-use Hyde\Pages\DataObjects\BlogPostData;
+use Hyde\Pages\DataObjects\BlogPostFactory;
 use Hyde\Pages\MarkdownPost;
 
 trait ConstructsPageSchemas
@@ -17,7 +17,7 @@ protected function constructPageSchemas(): void
         $this->constructPageSchema();
 
         if ($this instanceof MarkdownPost) {
-            $this->constructBlogPostData(new BlogPostData($this->matter, $this->markdown));
+            $this->constructBlogPostData(new BlogPostFactory($this->matter, $this->markdown));
         }
     }
 
diff --git a/packages/framework/src/Pages/DataObjects/BlogPostData.php b/packages/framework/src/Pages/DataObjects/BlogPostFactory.php
similarity index 98%
rename from packages/framework/src/Pages/DataObjects/BlogPostData.php
rename to packages/framework/src/Pages/DataObjects/BlogPostFactory.php
index 65c0e962739..8d833fb9c8b 100644
--- a/packages/framework/src/Pages/DataObjects/BlogPostData.php
+++ b/packages/framework/src/Pages/DataObjects/BlogPostFactory.php
@@ -19,7 +19,7 @@
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
  */
-class BlogPostData implements Arrayable
+class BlogPostFactory implements Arrayable
 {
     use HasFrontMatter;
 
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 7049526cfbf..2d89e6a6486 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -11,7 +11,7 @@
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\DataObjects\BlogPostData;
+use Hyde\Pages\DataObjects\BlogPostFactory;
 use Hyde\Support\DateString;
 
 /**
@@ -39,7 +39,7 @@ public function __construct(string $identifier = '', ?FrontMatter $matter = null
         parent::__construct($identifier, $matter, $markdown);
     }
 
-    public function constructBlogPostData(BlogPostData $data): void
+    public function constructBlogPostData(BlogPostFactory $data): void
     {
         foreach ($data->toArray() as $key => $value) {
             $this->{$key} = $value;

From 2067fefc25306ee2a50a2b1debd06d0055e9eac4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:35:30 +0200
Subject: [PATCH 120/768] Update factory namespace

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 .../src/Pages/{DataObjects => Factories}/BlogPostFactory.php    | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/Pages/{DataObjects => Factories}/BlogPostFactory.php (98%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index a4d1e102cf5..f4f98d8f072 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Hyde;
-use Hyde\Pages\DataObjects\BlogPostFactory;
+use Hyde\Pages\Factories\BlogPostFactory;
 use Hyde\Pages\MarkdownPost;
 
 trait ConstructsPageSchemas
diff --git a/packages/framework/src/Pages/DataObjects/BlogPostFactory.php b/packages/framework/src/Pages/Factories/BlogPostFactory.php
similarity index 98%
rename from packages/framework/src/Pages/DataObjects/BlogPostFactory.php
rename to packages/framework/src/Pages/Factories/BlogPostFactory.php
index 8d833fb9c8b..1b5f61909d4 100644
--- a/packages/framework/src/Pages/DataObjects/BlogPostFactory.php
+++ b/packages/framework/src/Pages/Factories/BlogPostFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Pages\DataObjects;
+namespace Hyde\Pages\Factories;
 
 use Hyde\Framework\Concerns\HasFrontMatter;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2d89e6a6486..301fabc1524 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -11,7 +11,7 @@
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\DataObjects\BlogPostFactory;
+use Hyde\Pages\Factories\BlogPostFactory;
 use Hyde\Support\DateString;
 
 /**

From 4fd2a4fdef0acc19c69528e9f3a5de24bfb367f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:36:05 +0200
Subject: [PATCH 121/768] Move Factory namespace

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 .../src/{Pages => Framework}/Factories/BlogPostFactory.php      | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/{Pages => Framework}/Factories/BlogPostFactory.php (98%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index f4f98d8f072..ce96d4c8605 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -6,8 +6,8 @@
 
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
+use Hyde\Framework\Factories\BlogPostFactory;
 use Hyde\Hyde;
-use Hyde\Pages\Factories\BlogPostFactory;
 use Hyde\Pages\MarkdownPost;
 
 trait ConstructsPageSchemas
diff --git a/packages/framework/src/Pages/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostFactory.php
similarity index 98%
rename from packages/framework/src/Pages/Factories/BlogPostFactory.php
rename to packages/framework/src/Framework/Factories/BlogPostFactory.php
index 1b5f61909d4..c3074ebaffe 100644
--- a/packages/framework/src/Pages/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Pages\Factories;
+namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\HasFrontMatter;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 301fabc1524..2f543950fd2 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -6,12 +6,12 @@
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
+use Hyde\Framework\Factories\BlogPostFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\Factories\BlogPostFactory;
 use Hyde\Support\DateString;
 
 /**

From cddd6122c407abfb0b7b228579fedb1ef43019f9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:48:56 +0200
Subject: [PATCH 122/768] Create Factory.php

---
 .../src/Framework/Factories/Concerns/Factory.php       | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Factories/Concerns/Factory.php

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

From 4351a3308b649aa69d8c8a95b862a25ab9829d34 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:49:06 +0200
Subject: [PATCH 123/768] Implement Arrayable

---
 .../framework/src/Framework/Factories/Concerns/Factory.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/Factory.php b/packages/framework/src/Framework/Factories/Concerns/Factory.php
index a0e9ed53dcf..9952873d2a9 100644
--- a/packages/framework/src/Framework/Factories/Concerns/Factory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/Factory.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Factories\Concerns;
 
-abstract class Factory
+use Illuminate\Contracts\Support\Arrayable;
+
+abstract class Factory implements Arrayable
 {
     //
 }

From 548093b10ddbb931cdeb3a14287444c930ead3ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:49:26 +0200
Subject: [PATCH 124/768] Extend factory

---
 packages/framework/src/Framework/Factories/BlogPostFactory.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostFactory.php
index c3074ebaffe..3c0ae0a56d5 100644
--- a/packages/framework/src/Framework/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostFactory.php
@@ -10,7 +10,6 @@
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Support\DateString;
-use Illuminate\Contracts\Support\Arrayable;
 use function strlen;
 use function substr;
 
@@ -19,7 +18,7 @@
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
  */
-class BlogPostFactory implements Arrayable
+class BlogPostFactory extends Concerns\Factory
 {
     use HasFrontMatter;
 

From 35461b107a891c9928e15d4b965354366f5771f1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:49:59 +0200
Subject: [PATCH 125/768] Declare abstract method stub

---
 packages/framework/src/Framework/Factories/Concerns/Factory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/Factory.php b/packages/framework/src/Framework/Factories/Concerns/Factory.php
index 9952873d2a9..c61334cff88 100644
--- a/packages/framework/src/Framework/Factories/Concerns/Factory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/Factory.php
@@ -8,5 +8,5 @@
 
 abstract class Factory implements Arrayable
 {
-    //
+    abstract public function toArray(): array;
 }

From d81a05083cc9fd305a6d829b66011f7671803cc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:50:25 +0200
Subject: [PATCH 126/768] Rename to more generic factory constructor

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index ce96d4c8605..0dc0fa73793 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -17,7 +17,7 @@ protected function constructPageSchemas(): void
         $this->constructPageSchema();
 
         if ($this instanceof MarkdownPost) {
-            $this->constructBlogPostData(new BlogPostFactory($this->matter, $this->markdown));
+            $this->constructFactoryData(new BlogPostFactory($this->matter, $this->markdown));
         }
     }
 
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2f543950fd2..2ff44894c00 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -39,7 +39,7 @@ public function __construct(string $identifier = '', ?FrontMatter $matter = null
         parent::__construct($identifier, $matter, $markdown);
     }
 
-    public function constructBlogPostData(BlogPostFactory $data): void
+    public function constructFactoryData(BlogPostFactory $data): void
     {
         foreach ($data->toArray() as $key => $value) {
             $this->{$key} = $value;

From fe72955d57df35c2eeddd8a9ee56ab8b1584e640 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:50:40 +0200
Subject: [PATCH 127/768] Type hint against the base class

---
 packages/framework/src/Pages/MarkdownPost.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2ff44894c00..2bb8deb270e 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -7,6 +7,7 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Factories\BlogPostFactory;
+use Hyde\Framework\Factories\Concerns\Factory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
@@ -39,7 +40,7 @@ public function __construct(string $identifier = '', ?FrontMatter $matter = null
         parent::__construct($identifier, $matter, $markdown);
     }
 
-    public function constructFactoryData(BlogPostFactory $data): void
+    public function constructFactoryData(Factory $data): void
     {
         foreach ($data->toArray() as $key => $value) {
             $this->{$key} = $value;

From 2988491f0a613cabe5eca5f2458ff38af98b7e96 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:51:11 +0200
Subject: [PATCH 128/768] Rename base class

---
 .../framework/src/Framework/Factories/BlogPostFactory.php     | 2 +-
 .../Factories/Concerns/{Factory.php => PageFactory.php}       | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/framework/src/Framework/Factories/Concerns/{Factory.php => PageFactory.php} (78%)

diff --git a/packages/framework/src/Framework/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostFactory.php
index 3c0ae0a56d5..61ea366c4d9 100644
--- a/packages/framework/src/Framework/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostFactory.php
@@ -18,7 +18,7 @@
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
  */
-class BlogPostFactory extends Concerns\Factory
+class BlogPostFactory extends Concerns\PageFactory
 {
     use HasFrontMatter;
 
diff --git a/packages/framework/src/Framework/Factories/Concerns/Factory.php b/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
similarity index 78%
rename from packages/framework/src/Framework/Factories/Concerns/Factory.php
rename to packages/framework/src/Framework/Factories/Concerns/PageFactory.php
index c61334cff88..602413eebd0 100644
--- a/packages/framework/src/Framework/Factories/Concerns/Factory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 
-abstract class Factory implements Arrayable
+abstract class PageFactory implements Arrayable
 {
     abstract public function toArray(): array;
 }
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2bb8deb270e..ef07a0dc2ad 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -7,7 +7,7 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Factories\BlogPostFactory;
-use Hyde\Framework\Factories\Concerns\Factory;
+use Hyde\Framework\Factories\Concerns\PageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
@@ -40,7 +40,7 @@ public function __construct(string $identifier = '', ?FrontMatter $matter = null
         parent::__construct($identifier, $matter, $markdown);
     }
 
-    public function constructFactoryData(Factory $data): void
+    public function constructFactoryData(PageFactory $data): void
     {
         foreach ($data->toArray() as $key => $value) {
             $this->{$key} = $value;

From 4f82cdc67f06cf83c2984ebffa7406a91df4e3eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:52:16 +0200
Subject: [PATCH 129/768] Rename base class

---
 .../src/Framework/Factories/Concerns/HasFactory.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/framework/src/Framework/Factories/Concerns/HasFactory.php

diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
new file mode 100644
index 00000000000..063ae31c0d1
--- /dev/null
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Factories\Concerns;
+
+trait HasFactory
+{
+    //
+}

From ce3e316c0f8941232b4fa76edbfb297a40038779 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:52:22 +0200
Subject: [PATCH 130/768] Use HasFactory

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

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 2a8762273df..e36672cc988 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -7,6 +7,7 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
+use Hyde\Framework\Factories\Concerns\HasFactory;
 use Hyde\Framework\Features\Metadata\PageMetadataBag;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Framework\Services\DiscoveryService;
@@ -37,6 +38,7 @@ abstract class HydePage implements CompilableContract, PageSchema
 {
     use ConstructsPageSchemas;
     use HasFrontMatter;
+    use HasFactory;
 
     public static string $sourceDirectory;
     public static string $outputDirectory;

From b8f6131b06075060b4eb1b81912da5f4493fdc03 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:52:31 +0200
Subject: [PATCH 131/768] Move factory helper to trait

---
 .../src/Framework/Factories/Concerns/HasFactory.php        | 7 ++++++-
 packages/framework/src/Pages/MarkdownPost.php              | 7 -------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 063ae31c0d1..54adca3edb8 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -6,5 +6,10 @@
 
 trait HasFactory
 {
-    //
+    public function constructFactoryData(PageFactory $data): void
+    {
+        foreach ($data->toArray() as $key => $value) {
+            $this->{$key} = $value;
+        }
+    }
 }
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index ef07a0dc2ad..f563115b0b9 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -40,13 +40,6 @@ public function __construct(string $identifier = '', ?FrontMatter $matter = null
         parent::__construct($identifier, $matter, $markdown);
     }
 
-    public function constructFactoryData(PageFactory $data): void
-    {
-        foreach ($data->toArray() as $key => $value) {
-            $this->{$key} = $value;
-        }
-    }
-
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
     {

From 0cc8a5f4cb54904c4645202a042440a9680cc628 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 14:53:22 +0000
Subject: [PATCH 132/768] Apply fixes from StyleCI

---
 packages/framework/src/Pages/MarkdownPost.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index f563115b0b9..2e80235d2d7 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -6,8 +6,6 @@
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Factories\BlogPostFactory;
-use Hyde\Framework\Factories\Concerns\PageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;

From 980998926123d624ef0ee4875edc1e9a39b8f569 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 16:55:41 +0200
Subject: [PATCH 133/768] Revert "Experiment with making properties readonly"

This reverts commit 460ad38495827d69ecfc4d828fbe49d5c72384cb.
---
 packages/framework/src/Pages/MarkdownPost.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 2e80235d2d7..57eff8177c7 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -27,11 +27,11 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public static string $outputDirectory = 'posts';
     public static string $template = 'hyde::layouts/post';
 
-    public readonly ?string $description;
-    public readonly ?string $category;
-    public readonly ?DateString $date;
-    public readonly ?PostAuthor $author;
-    public readonly ?FeaturedImage $image;
+    public ?string $description;
+    public ?string $category;
+    public ?DateString $date;
+    public ?PostAuthor $author;
+    public ?FeaturedImage $image;
 
     public function __construct(string $identifier = '', ?FrontMatter $matter = null, ?Markdown $markdown = null)
     {

From 59b543150eedf0bae6eec67d6d2fcc76b67771a6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:11:25 +0200
Subject: [PATCH 134/768] Normalize page constructors

---
 .../Framework/Concerns/BaseMarkdownPage.php   | 35 +++----------------
 .../src/Framework/Concerns/HydePage.php       |  5 +++
 packages/framework/src/Pages/MarkdownPost.php |  7 ----
 3 files changed, 10 insertions(+), 37 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index a043ff6656d..ec23df57a80 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -25,41 +25,16 @@ abstract class BaseMarkdownPage extends HydePage implements MarkdownDocumentCont
 
     public static string $fileExtension = '.md';
 
-    /**
-     * Alternative to constructor, using primitive data types.
-     * This method will construct then return a new instance of the class.
-     *
-     * @param  string  $identifier
-     * @param  array  $matter
-     * @param  string  $body
-     * @return \Hyde\Framework\Concerns\BaseMarkdownPage
-     */
-    public static function make(string $identifier = '', array $matter = [], string $body = ''): static
+    public static function make(string $identifier = '', FrontMatter|array $matter = [], Markdown|string $body = ''): static
     {
-        return new static($identifier, new FrontMatter($matter), new Markdown($body));
+        return new static($identifier, $matter, $body);
     }
 
-    /**
-     * Construct a new MarkdownPage object from constructed data types.
-     * Normally, this is done by the SourceFileParser.
-     *
-     * @param  string  $identifier
-     * @param  \Hyde\Markdown\Models\FrontMatter|null  $matter
-     * @param  \Hyde\Markdown\Models\Markdown|null  $markdown
-     *
-     * @see \Hyde\Framework\Actions\SourceFileParser
-     *
-     * @phpstan-consistent-constructor
-     *
-     * The types are strictly enforced to ensure a predictable behavior and constant access interface.
-     */
-    public function __construct(string $identifier = '', ?FrontMatter $matter = null, ?Markdown $markdown = null)
+    public function __construct(string $identifier = '', FrontMatter|array $matter = [], Markdown|string $markdown = '')
     {
-        $this->identifier = $identifier;
-        $this->matter = $matter ?? new FrontMatter();
-        $this->markdown = $markdown ?? new Markdown();
+        $this->markdown = $markdown instanceof Markdown ? $markdown : new Markdown($markdown);
 
-        parent::__construct($this->identifier, $this->matter);
+        parent::__construct($identifier, $matter);
     }
 
     /** @inheritDoc */
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index e36672cc988..bb6c698e630 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -55,6 +55,11 @@ abstract class HydePage implements CompilableContract, PageSchema
     public ?string $canonicalUrl = null;
     public ?NavigationData $navigation = null;
 
+    public static function make(string $identifier = '', FrontMatter|array $matter = []): static
+    {
+        return new static($identifier, $matter);
+    }
+
     public function __construct(string $identifier = '', FrontMatter|array $matter = [])
     {
         $this->identifier = $identifier;
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 57eff8177c7..cb968ac72fb 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -9,8 +9,6 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Markdown\Models\FrontMatter;
-use Hyde\Markdown\Models\Markdown;
 use Hyde\Support\DateString;
 
 /**
@@ -33,11 +31,6 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?PostAuthor $author;
     public ?FeaturedImage $image;
 
-    public function __construct(string $identifier = '', ?FrontMatter $matter = null, ?Markdown $markdown = null)
-    {
-        parent::__construct($identifier, $matter, $markdown);
-    }
-
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
     {

From 152896b05266062e7f682e6ac32f636402010eba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:11:51 +0200
Subject: [PATCH 135/768] Format class properties

---
 packages/framework/src/Pages/BladePage.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Pages/BladePage.php b/packages/framework/src/Pages/BladePage.php
index 361ecd1a50b..55bb4871984 100644
--- a/packages/framework/src/Pages/BladePage.php
+++ b/packages/framework/src/Pages/BladePage.php
@@ -18,6 +18,10 @@
  */
 class BladePage extends HydePage
 {
+    public static string $sourceDirectory = '_pages';
+    public static string $outputDirectory = '';
+    public static string $fileExtension = '.blade.php';
+
     /**
      * The name of the Blade View to compile. Commonly stored in _pages/{$identifier}.blade.php.
      *
@@ -35,10 +39,6 @@ public function __construct(string $view = '', FrontMatter|array $matter = [])
         $this->view = $view;
     }
 
-    public static string $sourceDirectory = '_pages';
-    public static string $outputDirectory = '';
-    public static string $fileExtension = '.blade.php';
-
     /** @inheritDoc */
     public function getBladeView(): string
     {

From 8523a6a953c6c663393c0c71dd6cf3c736c0129b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:16:34 +0200
Subject: [PATCH 136/768] Move support models into models subnamespace

---
 config/app.php                                              | 4 ++--
 .../framework/src/Console/Commands/RouteListCommand.php     | 2 +-
 .../framework/src/Foundation/Concerns/ManagesViewData.php   | 4 ++--
 packages/framework/src/Foundation/FileCollection.php        | 2 +-
 packages/framework/src/Foundation/Filesystem.php            | 2 +-
 packages/framework/src/Foundation/RouteCollection.php       | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php      | 4 ++--
 .../src/Framework/Concerns/RegistersFileLocations.php       | 2 +-
 .../framework/src/Framework/Factories/BlogPostFactory.php   | 2 +-
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 ++--
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 2 +-
 packages/framework/src/Framework/Services/BuildService.php  | 6 +++---
 .../framework/src/Framework/Services/DiscoveryService.php   | 2 +-
 .../framework/src/Framework/Services/SitemapService.php     | 2 +-
 .../framework/src/Framework/Services/ValidationService.php  | 2 +-
 packages/framework/src/Hyde.php                             | 2 +-
 packages/framework/src/Pages/DocumentationPage.php          | 2 +-
 packages/framework/src/Pages/MarkdownPost.php               | 2 +-
 packages/framework/src/Support/{ => Models}/DateString.php  | 2 +-
 packages/framework/src/Support/{ => Models}/File.php        | 2 +-
 packages/framework/src/Support/{ => Models}/Route.php       | 2 +-
 packages/framework/src/Support/{ => Models}/Site.php        | 2 +-
 .../framework/src/Support/{ => Models}/ValidationResult.php | 2 +-
 .../tests/Feature/BuildOutputDirectoryCanBeChangedTest.php  | 2 +-
 .../tests/Feature/Commands/BuildSearchCommandTest.php       | 2 +-
 .../tests/Feature/Commands/ValidateCommandTest.php          | 2 +-
 packages/framework/tests/Feature/FileCollectionTest.php     | 2 +-
 packages/framework/tests/Feature/FileTest.php               | 4 ++--
 packages/framework/tests/Feature/HydeKernelTest.php         | 2 +-
 packages/framework/tests/Feature/HydePageTest.php           | 2 +-
 packages/framework/tests/Feature/MarkdownPostTest.php       | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php     | 2 +-
 packages/framework/tests/Feature/RouteCollectionTest.php    | 2 +-
 packages/framework/tests/Feature/RouteTest.php              | 4 ++--
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 2 +-
 .../tests/Feature/Services/ValidationServiceTest.php        | 4 ++--
 packages/framework/tests/Feature/SiteTest.php               | 4 ++--
 packages/framework/tests/Feature/StaticPageBuilderTest.php  | 2 +-
 packages/framework/tests/Feature/StaticSiteServiceTest.php  | 2 +-
 packages/framework/tests/Unit/DateStringTest.php            | 4 ++--
 packages/framework/tests/Unit/DocumentationPageTest.php     | 2 +-
 packages/framework/tests/Unit/HydeFileHelpersTest.php       | 2 +-
 packages/framework/tests/Unit/HydeServiceProviderTest.php   | 2 +-
 packages/framework/tests/Unit/NavItemTest.php               | 2 +-
 .../tests/Unit/Views/Components/LinkComponentTest.php       | 4 ++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 +-
 packages/realtime-compiler/src/Routing/PageRouter.php       | 2 +-
 packages/testing/src/TestCase.php                           | 2 +-
 49 files changed, 61 insertions(+), 61 deletions(-)
 rename packages/framework/src/Support/{ => Models}/DateString.php (97%)
 rename packages/framework/src/Support/{ => Models}/File.php (99%)
 rename packages/framework/src/Support/{ => Models}/Route.php (99%)
 rename packages/framework/src/Support/{ => Models}/Site.php (96%)
 rename packages/framework/src/Support/{ => Models}/ValidationResult.php (99%)

diff --git a/config/app.php b/config/app.php
index e8dca5050ab..a8002b575ad 100644
--- a/config/app.php
+++ b/config/app.php
@@ -95,8 +95,8 @@
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
         'Asset' => \Hyde\Helpers\Asset::class,
-        'Site' => \Hyde\Support\Site::class,
-        'Route' => \Hyde\Support\Route::class,
+        'Site' => \Hyde\Support\Models\Site::class,
+        'Route' => \Hyde\Support\Models\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index 0105af7f6a8..a8bfa33d844 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -36,7 +36,7 @@ public function handle(): int
     protected function getRoutes(): array
     {
         $routes = [];
-        /** @var \Hyde\Support\Route $route */
+        /** @var \Hyde\Support\Models\Route $route */
         foreach (Hyde::routes() as $route) {
             $routes[] = [
                 $this->formatPageType($route->getPageType()),
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 88682e979c4..9df079e91b8 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\View;
 
 /**
@@ -40,7 +40,7 @@ public function currentPage(): ?string
     /**
      * Get the route for the page being rendered.
      *
-     * @return \Hyde\Support\Route|null
+     * @return \Hyde\Support\Models\Route|null
      */
     public function currentRoute(): ?Route
     {
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index df7b092ccef..17f6feceb5f 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -13,7 +13,7 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\File;
+use Hyde\Support\Models\File;
 
 /**
  * @see \Hyde\Framework\Foundation\FileCollection
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
index de799453dec..4d28fee4236 100644
--- a/packages/framework/src/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -10,7 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 
 /**
  * File helper methods, bound to the HydeKernel instance, and is an integral part of the framework.
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index d2332e9041f..278e3c27676 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Pseudo-Router for Hyde.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index bb6c698e630..784bbfcaf7e 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -15,7 +15,7 @@
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Contracts\CompilableContract;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * The base class for all Hyde pages.
@@ -192,7 +192,7 @@ public function getRouteKey(): string
     /**
      * Get the route for the page.
      *
-     * @return \Hyde\Support\Route The page's route.
+     * @return \Hyde\Support\Models\Route The page's route.
      */
     public function getRoute(): Route
     {
diff --git a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
index 018f2e027a9..ae93b8f40a8 100644
--- a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
+++ b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 
 /**
  * This trait registers the file paths for important Hyde locations.
diff --git a/packages/framework/src/Framework/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostFactory.php
index 61ea366c4d9..0cb13194371 100644
--- a/packages/framework/src/Framework/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostFactory.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Support\DateString;
+use Hyde\Support\Models\DateString;
 use function strlen;
 use function substr;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index e4fcaff6389..5053b230ce6 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 45844cab676..42218b3a2a3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
 
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  \Hyde\Support\Route|null  $route
+     * @param  \Hyde\Support\Models\Route|null  $route
      * @param  string  $label
      * @param  int  $priority
      * @param  bool  $hidden
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 0ad8c5bf4d9..ecb55f9b1e3 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 8c6d393d719..7d0d336406f 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -9,8 +9,8 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
-use Hyde\Support\Route;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Route;
+use Hyde\Support\Models\Site;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Facades\File;
@@ -96,7 +96,7 @@ protected function compilePagesForClass(string $pageClass): void
         $this->newLine(2);
     }
 
-    /** @psalm-return \Closure(\Hyde\Support\Route):string */
+    /** @psalm-return \Closure(\Hyde\Support\Models\Route):string */
     protected function compileRoute(): Closure
     {
         return function (Route $route) {
diff --git a/packages/framework/src/Framework/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
index e10d4753e98..3c2125337be 100644
--- a/packages/framework/src/Framework/Services/DiscoveryService.php
+++ b/packages/framework/src/Framework/Services/DiscoveryService.php
@@ -11,7 +11,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\File;
+use Hyde\Support\Models\File;
 
 /**
  * The core service that powers all HydePHP file auto-discovery.
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 91098743faa..383380ea9ca 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index f2704b38848..ac97bda4409 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -6,7 +6,7 @@
 
 use Hyde\Helpers\Features;
 use Hyde\Hyde;
-use Hyde\Support\ValidationResult as Result;
+use Hyde\Support\Models\ValidationResult as Result;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 6b178253c2b..d985ce0c4ee 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -10,7 +10,7 @@
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Helpers\Features;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\Facade;
 
 /**
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 727c2c83a6e..f321b3c416c 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Page class for documentation pages.
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index cb968ac72fb..058668b18c4 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
-use Hyde\Support\DateString;
+use Hyde\Support\Models\DateString;
 
 /**
  * Page class for Markdown posts.
diff --git a/packages/framework/src/Support/DateString.php b/packages/framework/src/Support/Models/DateString.php
similarity index 97%
rename from packages/framework/src/Support/DateString.php
rename to packages/framework/src/Support/Models/DateString.php
index 37cd9d97209..8f08712905e 100644
--- a/packages/framework/src/Support/DateString.php
+++ b/packages/framework/src/Support/Models/DateString.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support;
+namespace Hyde\Support\Models;
 
 use DateTime;
 use Stringable;
diff --git a/packages/framework/src/Support/File.php b/packages/framework/src/Support/Models/File.php
similarity index 99%
rename from packages/framework/src/Support/File.php
rename to packages/framework/src/Support/Models/File.php
index d5e834cd73b..59f33b3b39a 100644
--- a/packages/framework/src/Support/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support;
+namespace Hyde\Support\Models;
 
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
diff --git a/packages/framework/src/Support/Route.php b/packages/framework/src/Support/Models/Route.php
similarity index 99%
rename from packages/framework/src/Support/Route.php
rename to packages/framework/src/Support/Models/Route.php
index 32d9530b195..8b411a4d1b4 100644
--- a/packages/framework/src/Support/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support;
+namespace Hyde\Support\Models;
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
diff --git a/packages/framework/src/Support/Site.php b/packages/framework/src/Support/Models/Site.php
similarity index 96%
rename from packages/framework/src/Support/Site.php
rename to packages/framework/src/Support/Models/Site.php
index 3a9369a4f40..99ba508fbb3 100644
--- a/packages/framework/src/Support/Site.php
+++ b/packages/framework/src/Support/Models/Site.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support;
+namespace Hyde\Support\Models;
 
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 
diff --git a/packages/framework/src/Support/ValidationResult.php b/packages/framework/src/Support/Models/ValidationResult.php
similarity index 99%
rename from packages/framework/src/Support/ValidationResult.php
rename to packages/framework/src/Support/Models/ValidationResult.php
index b7a11e1ce7b..edfa034a143 100644
--- a/packages/framework/src/Support/ValidationResult.php
+++ b/packages/framework/src/Support/Models/ValidationResult.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support;
+namespace Hyde\Support\Models;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
index 5b7fea9e727..afa270cd197 100644
--- a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Services\RebuildService;
 use Hyde\Hyde;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index b63e5f536cf..a49040f22b8 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 2c88dac4042..7e2be55cc1c 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Support\ValidationResult
+ * @covers \Hyde\Support\Models\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
diff --git a/packages/framework/tests/Feature/FileCollectionTest.php b/packages/framework/tests/Feature/FileCollectionTest.php
index 0e00bcd3b79..4e095870857 100644
--- a/packages/framework/tests/Feature/FileCollectionTest.php
+++ b/packages/framework/tests/Feature/FileCollectionTest.php
@@ -10,7 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\File;
+use Hyde\Support\Models\File;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 09727cfba24..6942a33d073 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -6,11 +6,11 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Support\File;
+use Hyde\Support\Models\File;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\File
+ * @covers \Hyde\Support\Models\File
  */
 class FileTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index ed27866ed2b..d193f190d05 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 70fde5dd9ad..c5122af81b6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index f3d456b03f2..9f032d005a9 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\DateString;
+use Hyde\Support\Models\DateString;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 3ccd95f8c58..88d26fa6f1e 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index cb6de428368..97cf8942efc 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -10,7 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index cf55d8e96e6..6fe59fcda0c 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -11,11 +11,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Route
+ * @covers \Hyde\Support\Models\Route
  */
 class RouteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 7a1579a1a99..80077c5a9d8 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index ff967641a5e..28e437d49ee 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -6,14 +6,14 @@
 
 use Hyde\Framework\Services\ValidationService;
 use Hyde\Hyde;
-use Hyde\Support\ValidationResult;
+use Hyde\Support\Models\ValidationResult;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Support\ValidationResult
+ * @covers \Hyde\Support\Models\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index 68366cfb6dc..474e8c34151 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Site
+ * @covers \Hyde\Support\Models\Site
  */
 class SiteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php
index 3cd519504cd..03ef7fdc9b1 100644
--- a/packages/framework/tests/Feature/StaticPageBuilderTest.php
+++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 9579d59e9c9..4b6b4c445da 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Hyde;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/DateStringTest.php b/packages/framework/tests/Unit/DateStringTest.php
index b7e0eb314cd..3957b9ce911 100644
--- a/packages/framework/tests/Unit/DateStringTest.php
+++ b/packages/framework/tests/Unit/DateStringTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use DateTime;
-use Hyde\Support\DateString;
+use Hyde\Support\Models\DateString;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers \Hyde\Support\DateString
+ * @covers \Hyde\Support\Models\DateString
  */
 class DateStringTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 483bc4a7620..d92df155128 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index c904a6559fa..e9be2c88ca9 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Hyde;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 1dba541c211..a4c63c449be 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Site;
+use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 3002d056005..2c0fb7a21aa 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
index 9e1459bb477..29bdc4f6c83 100644
--- a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
+++ b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
@@ -20,7 +20,7 @@ public function test_link_component_can_be_rendered()
 
     public function test_link_component_can_be_rendered_with_route()
     {
-        $route = \Hyde\Support\Route::get('index');
+        $route = \Hyde\Support\Models\Route::get('index');
         $this->assertEquals('<a href="index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
@@ -28,7 +28,7 @@ public function test_link_component_can_be_rendered_with_route()
     public function test_link_component_can_be_rendered_with_route_for_nested_pages()
     {
         View::share('currentPage', 'foo/bar');
-        $route = \Hyde\Support\Route::get('index');
+        $route = \Hyde\Support\Models\Route::get('index');
         $this->assertEquals('<a href="../index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 498824661c6..984f9b6b4e3 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 6b8fb934cf0..77596c5bf41 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Handle routing for a web page request.
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 1341cf0c5bd..81262745fdf 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -6,7 +6,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Support\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 

From de5b4db31abf205165fc2aa8c265107ed8622b32 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:17:33 +0200
Subject: [PATCH 137/768] Create RouteKey.php

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

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

From 59f7406850b98b1186221df4ab2c34759b8b87bd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:18:10 +0200
Subject: [PATCH 138/768] Create RouteKeyTest.php

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

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

From e60706bbac8b4867b0ab0569cb3a48909452c92b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:20:03 +0200
Subject: [PATCH 139/768] Implement the type class

---
 .../framework/src/Support/Models/RouteKey.php   | 17 ++++++++++++++++-
 .../framework/tests/Feature/RouteKeyTest.php    | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 6ae93b13e38..83823da854d 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -6,5 +6,20 @@
 
 class RouteKey
 {
-    //
+    protected readonly string $key;
+
+    public function __construct(string $key)
+    {
+        $this->key = $key;
+    }
+
+    public function __toString(): string
+    {
+        return $this->key;
+    }
+
+    public function get(): string
+    {
+        return $this->key;
+    }
 }
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 798cb656d9a..fd6f0ae2fcb 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Support\Models\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**
@@ -11,5 +12,18 @@
  */
 class RouteKeyTest extends TestCase
 {
-    //
+    public function test__construct()
+    {
+        $this->assertInstanceOf(RouteKey::class, new RouteKey('test'));
+    }
+
+    public function test__toString()
+    {
+        $this->assertSame('foo', (string) new RouteKey('foo'));
+    }
+
+    public function testGet()
+    {
+        $this->assertSame('foo', (new RouteKey('foo'))->get());
+    }
 }

From fa5083254d441d72400812ccd93696cede6f4194 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:20:51 +0200
Subject: [PATCH 140/768] Add static make method

---
 packages/framework/src/Support/Models/RouteKey.php | 5 +++++
 packages/framework/tests/Feature/RouteKeyTest.php  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 83823da854d..f2af08e7d7d 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -8,6 +8,11 @@ class RouteKey
 {
     protected readonly string $key;
 
+    public static function make(string $key): self
+    {
+        return new static($key);
+    }
+
     public function __construct(string $key)
     {
         $this->key = $key;
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index fd6f0ae2fcb..63939ebf1ae 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -12,6 +12,11 @@
  */
 class RouteKeyTest extends TestCase
 {
+    public function testMake()
+    {
+        $this->assertEquals(RouteKey::make('foo'), new RouteKey('foo'));
+    }
+
     public function test__construct()
     {
         $this->assertInstanceOf(RouteKey::class, new RouteKey('test'));

From 9bccd82b4bb713780fc7a66b2308def6ce5b4ff8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:21:05 +0200
Subject: [PATCH 141/768] Make class final

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

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index f2af08e7d7d..5e93b076184 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Support\Models;
 
-class RouteKey
+final class RouteKey
 {
     protected readonly string $key;
 
     public static function make(string $key): self
     {
-        return new static($key);
+        return new RouteKey($key);
     }
 
     public function __construct(string $key)

From 77dbc6728056f541039e40c5051ee6700d5f8521 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:21:58 +0200
Subject: [PATCH 142/768] Implement Stringable

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

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 5e93b076184..5a0d9cee3ef 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Support\Models;
 
-final class RouteKey
+use Stringable;
+
+final class RouteKey implements Stringable
 {
     protected readonly string $key;
 

From 83ee8a19750e5623217f52c8bbd9693410d6ed5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:24:52 +0200
Subject: [PATCH 143/768] Add class documentation

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

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index 5a0d9cee3ef..a5220b1424b 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -6,6 +6,14 @@
 
 use Stringable;
 
+/**
+ * Route keys are the core of Hyde's routing system.
+ *
+ * In short, the route key is the URL path relative to the site root.
+ *
+ * For example, `_pages/index.blade.php` would be compiled to `_site/index.html` and thus has the route key of `index`.
+ * As another example, `_posts/welcome.md` would be compiled to `_site/posts/welcome.html` and thus has the route key of `posts/welcome`.
+ */
 final class RouteKey implements Stringable
 {
     protected readonly string $key;

From 7d9cdc45067804a09c931418912e0d893771e38a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:37:53 +0200
Subject: [PATCH 144/768] Add fromPage method

---
 packages/framework/src/Support/Models/RouteKey.php |  7 +++++++
 packages/framework/tests/Feature/RouteKeyTest.php  | 12 ++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index a5220b1424b..d8981817a36 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 function unslash;
 
 /**
  * Route keys are the core of Hyde's routing system.
@@ -37,4 +38,10 @@ public function get(): string
     {
         return $this->key;
     }
+
+    public static function fromPage(string $pageClass, string $identifier): string
+    {
+        /** @var \Hyde\Framework\Concerns\HydePage $pageClass */
+        return unslash($pageClass::outputDirectory().'/'.$identifier);
+    }
 }
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 63939ebf1ae..a8413ae5326 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -4,6 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Support\Models\RouteKey;
 use Hyde\Testing\TestCase;
 
@@ -31,4 +35,12 @@ public function testGet()
     {
         $this->assertSame('foo', (new RouteKey('foo'))->get());
     }
+
+    public function testFromPage()
+    {
+        $this->assertSame('foo', RouteKey::fromPage(BladePage::class, 'foo'));
+        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, 'foo'));
+        $this->assertSame('posts/foo', RouteKey::fromPage(MarkdownPost::class, 'foo'));
+        $this->assertSame('docs/foo', RouteKey::fromPage(DocumentationPage::class, 'foo'));
+    }
 }

From dc3de50b9a3416aab5194783b0670b3e06f640ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:38:00 +0200
Subject: [PATCH 145/768] Test with nested identifier

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

diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index a8413ae5326..3abe9d15bfc 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -43,4 +43,12 @@ public function testFromPage()
         $this->assertSame('posts/foo', RouteKey::fromPage(MarkdownPost::class, 'foo'));
         $this->assertSame('docs/foo', RouteKey::fromPage(DocumentationPage::class, 'foo'));
     }
+
+    public function testFromPageWithNestedIdentifier()
+    {
+        $this->assertSame('foo/bar', RouteKey::fromPage(BladePage::class, 'foo/bar'));
+        $this->assertSame('foo/bar', RouteKey::fromPage(MarkdownPage::class, 'foo/bar'));
+        $this->assertSame('posts/foo/bar', RouteKey::fromPage(MarkdownPost::class, 'foo/bar'));
+        $this->assertSame('docs/foo/bar', RouteKey::fromPage(DocumentationPage::class, 'foo/bar'));
+    }
 }

From 35f421ce683fd8b5f018dfe83a4653d125c90887 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:38:17 +0200
Subject: [PATCH 146/768] Construct route key using the new type class

---
 packages/framework/src/Framework/Concerns/HydePage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 784bbfcaf7e..37219d68f8e 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -16,6 +16,7 @@
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Support\Contracts\CompilableContract;
 use Hyde\Support\Models\Route;
+use Hyde\Support\Models\RouteKey;
 
 /**
  * The base class for all Hyde pages.
@@ -170,7 +171,7 @@ public function getOutputPath(): string
      */
     public static function routeKey(string $identifier): string
     {
-        return unslash(static::outputDirectory().'/'.$identifier);
+        return RouteKey::fromPage(static::class, $identifier);
     }
 
     /**

From 0a9858b3d7fe4110a7e4049c198cdcdb5ae16297 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:39:08 +0200
Subject: [PATCH 147/768] Inline routeKey method

---
 .../framework/src/Framework/Concerns/HydePage.php    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 37219d68f8e..2d1345d609a 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -64,7 +64,7 @@ public static function make(string $identifier = '', FrontMatter|array $matter =
     public function __construct(string $identifier = '', FrontMatter|array $matter = [])
     {
         $this->identifier = $identifier;
-        $this->routeKey = static::routeKey($identifier);
+        $this->routeKey = RouteKey::fromPage(static::class, $identifier);
 
         $this->matter = $matter instanceof FrontMatter ? $matter : new FrontMatter($matter);
         $this->constructPageSchemas();
@@ -145,7 +145,7 @@ public static function sourcePath(string $identifier): string
      */
     public static function outputPath(string $identifier): string
     {
-        return static::routeKey($identifier).'.html';
+        return RouteKey::fromPage(static::class, $identifier) .'.html';
     }
 
     /**
@@ -166,14 +166,6 @@ public function getOutputPath(): string
 
     // Section: Routing
 
-    /**
-     * Format a page identifier to a route key.
-     */
-    public static function routeKey(string $identifier): string
-    {
-        return RouteKey::fromPage(static::class, $identifier);
-    }
-
     /**
      * Get the route key for the page.
      *

From e9bffac154b8da9631d917a0acc7b3457838899e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 15:42:27 +0000
Subject: [PATCH 148/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 2d1345d609a..c5daa2b5009 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -145,7 +145,7 @@ public static function sourcePath(string $identifier): string
      */
     public static function outputPath(string $identifier): string
     {
-        return RouteKey::fromPage(static::class, $identifier) .'.html';
+        return RouteKey::fromPage(static::class, $identifier).'.html';
     }
 
     /**

From b96278872f6e870267582b17404425513cdc6b0b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:45:29 +0200
Subject: [PATCH 149/768] Must return self

---
 .../src/Framework/Concerns/HydePage.php          |  2 +-
 .../framework/src/Support/Models/RouteKey.php    |  4 ++--
 .../framework/tests/Feature/RouteKeyTest.php     | 16 ++++++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 2d1345d609a..1d1efaddf3a 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -64,7 +64,7 @@ public static function make(string $identifier = '', FrontMatter|array $matter =
     public function __construct(string $identifier = '', FrontMatter|array $matter = [])
     {
         $this->identifier = $identifier;
-        $this->routeKey = RouteKey::fromPage(static::class, $identifier);
+        $this->routeKey = RouteKey::fromPage(static::class, $identifier)->get();
 
         $this->matter = $matter instanceof FrontMatter ? $matter : new FrontMatter($matter);
         $this->constructPageSchemas();
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index d8981817a36..be2c99109ca 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -39,9 +39,9 @@ public function get(): string
         return $this->key;
     }
 
-    public static function fromPage(string $pageClass, string $identifier): string
+    public static function fromPage(string $pageClass, string $identifier): self
     {
         /** @var \Hyde\Framework\Concerns\HydePage $pageClass */
-        return unslash($pageClass::outputDirectory().'/'.$identifier);
+        return new self(unslash($pageClass::outputDirectory().'/'.$identifier));
     }
 }
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 3abe9d15bfc..2057cac67c4 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -38,17 +38,17 @@ public function testGet()
 
     public function testFromPage()
     {
-        $this->assertSame('foo', RouteKey::fromPage(BladePage::class, 'foo'));
-        $this->assertSame('foo', RouteKey::fromPage(MarkdownPage::class, 'foo'));
-        $this->assertSame('posts/foo', RouteKey::fromPage(MarkdownPost::class, 'foo'));
-        $this->assertSame('docs/foo', RouteKey::fromPage(DocumentationPage::class, 'foo'));
+        $this->assertSame(new RouteKey('foo'), RouteKey::fromPage(BladePage::class, 'foo'));
+        $this->assertSame(new RouteKey('foo'), RouteKey::fromPage(MarkdownPage::class, 'foo'));
+        $this->assertSame(new RouteKey('posts/foo'), RouteKey::fromPage(MarkdownPost::class, 'foo'));
+        $this->assertSame(new RouteKey('docs/foo'), RouteKey::fromPage(DocumentationPage::class, 'foo'));
     }
 
     public function testFromPageWithNestedIdentifier()
     {
-        $this->assertSame('foo/bar', RouteKey::fromPage(BladePage::class, 'foo/bar'));
-        $this->assertSame('foo/bar', RouteKey::fromPage(MarkdownPage::class, 'foo/bar'));
-        $this->assertSame('posts/foo/bar', RouteKey::fromPage(MarkdownPost::class, 'foo/bar'));
-        $this->assertSame('docs/foo/bar', RouteKey::fromPage(DocumentationPage::class, 'foo/bar'));
+        $this->assertSame(new RouteKey('foo/bar'), RouteKey::fromPage(BladePage::class, 'foo/bar'));
+        $this->assertSame(new RouteKey('foo/bar'), RouteKey::fromPage(MarkdownPage::class, 'foo/bar'));
+        $this->assertSame(new RouteKey('posts/foo/bar'), RouteKey::fromPage(MarkdownPost::class, 'foo/bar'));
+        $this->assertSame(new RouteKey('docs/foo/bar'), RouteKey::fromPage(DocumentationPage::class, 'foo/bar'));
     }
 }

From c20270e957cbd45c1d9fad4ab13794bcf064602c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:48:22 +0200
Subject: [PATCH 150/768] Use assertEquals instead of assertSame

---
 .../framework/tests/Feature/RouteKeyTest.php     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 2057cac67c4..17b3e338643 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -38,17 +38,17 @@ public function testGet()
 
     public function testFromPage()
     {
-        $this->assertSame(new RouteKey('foo'), RouteKey::fromPage(BladePage::class, 'foo'));
-        $this->assertSame(new RouteKey('foo'), RouteKey::fromPage(MarkdownPage::class, 'foo'));
-        $this->assertSame(new RouteKey('posts/foo'), RouteKey::fromPage(MarkdownPost::class, 'foo'));
-        $this->assertSame(new RouteKey('docs/foo'), RouteKey::fromPage(DocumentationPage::class, 'foo'));
+        $this->assertEquals(new RouteKey('foo'), RouteKey::fromPage(BladePage::class, 'foo'));
+        $this->assertEquals(new RouteKey('foo'), RouteKey::fromPage(MarkdownPage::class, 'foo'));
+        $this->assertEquals(new RouteKey('posts/foo'), RouteKey::fromPage(MarkdownPost::class, 'foo'));
+        $this->assertEquals(new RouteKey('docs/foo'), RouteKey::fromPage(DocumentationPage::class, 'foo'));
     }
 
     public function testFromPageWithNestedIdentifier()
     {
-        $this->assertSame(new RouteKey('foo/bar'), RouteKey::fromPage(BladePage::class, 'foo/bar'));
-        $this->assertSame(new RouteKey('foo/bar'), RouteKey::fromPage(MarkdownPage::class, 'foo/bar'));
-        $this->assertSame(new RouteKey('posts/foo/bar'), RouteKey::fromPage(MarkdownPost::class, 'foo/bar'));
-        $this->assertSame(new RouteKey('docs/foo/bar'), RouteKey::fromPage(DocumentationPage::class, 'foo/bar'));
+        $this->assertEquals(new RouteKey('foo/bar'), RouteKey::fromPage(BladePage::class, 'foo/bar'));
+        $this->assertEquals(new RouteKey('foo/bar'), RouteKey::fromPage(MarkdownPage::class, 'foo/bar'));
+        $this->assertEquals(new RouteKey('posts/foo/bar'), RouteKey::fromPage(MarkdownPost::class, 'foo/bar'));
+        $this->assertEquals(new RouteKey('docs/foo/bar'), RouteKey::fromPage(DocumentationPage::class, 'foo/bar'));
     }
 }

From 43eb1dcb572146a362cff60aa23083a723881ad5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 17:58:58 +0200
Subject: [PATCH 151/768] Move routing related classes to new Routing namespace

---
 config/app.php                                              | 2 +-
 .../framework/src/Console/Commands/RouteListCommand.php     | 2 +-
 .../framework/src/Foundation/Concerns/ManagesViewData.php   | 4 ++--
 packages/framework/src/Foundation/RouteCollection.php       | 2 +-
 packages/framework/src/Framework/Concerns/HydePage.php      | 6 +++---
 .../Framework/Features/Navigation/DocumentationSidebar.php  | 2 +-
 .../framework/src/Framework/Features/Navigation/NavItem.php | 4 ++--
 .../src/Framework/Features/Navigation/NavigationMenu.php    | 2 +-
 packages/framework/src/Framework/Services/BuildService.php  | 4 ++--
 .../framework/src/Framework/Services/SitemapService.php     | 2 +-
 packages/framework/src/Hyde.php                             | 2 +-
 packages/framework/src/Pages/DocumentationPage.php          | 2 +-
 packages/framework/src/{Helpers => Routing}/Redirect.php    | 2 +-
 .../framework/src/{Support/Models => Routing}/Route.php     | 2 +-
 .../framework/src/{Support/Models => Routing}/RouteKey.php  | 2 +-
 packages/framework/tests/Feature/HydeKernelTest.php         | 2 +-
 packages/framework/tests/Feature/HydePageTest.php           | 2 +-
 packages/framework/tests/Feature/NavigationMenuTest.php     | 2 +-
 packages/framework/tests/Feature/RedirectTest.php           | 4 ++--
 packages/framework/tests/Feature/RouteCollectionTest.php    | 2 +-
 packages/framework/tests/Feature/RouteKeyTest.php           | 4 ++--
 packages/framework/tests/Feature/RouteTest.php              | 4 ++--
 .../tests/Feature/Services/DocumentationSidebarTest.php     | 2 +-
 packages/framework/tests/Unit/DocumentationPageTest.php     | 2 +-
 packages/framework/tests/Unit/HydeFileHelpersTest.php       | 2 +-
 packages/framework/tests/Unit/NavItemTest.php               | 2 +-
 .../tests/Unit/Views/Components/LinkComponentTest.php       | 4 ++--
 .../framework/tests/Unit/Views/NavigationLinkViewTest.php   | 2 +-
 packages/realtime-compiler/src/Routing/PageRouter.php       | 2 +-
 packages/testing/src/TestCase.php                           | 2 +-
 30 files changed, 39 insertions(+), 39 deletions(-)
 rename packages/framework/src/{Helpers => Routing}/Redirect.php (97%)
 rename packages/framework/src/{Support/Models => Routing}/Route.php (99%)
 rename packages/framework/src/{Support/Models => Routing}/RouteKey.php (97%)

diff --git a/config/app.php b/config/app.php
index a8002b575ad..78b9bb4cbb9 100644
--- a/config/app.php
+++ b/config/app.php
@@ -96,7 +96,7 @@
         'Hyde' => Hyde\Hyde::class,
         'Asset' => \Hyde\Helpers\Asset::class,
         'Site' => \Hyde\Support\Models\Site::class,
-        'Route' => \Hyde\Support\Models\Route::class,
+        'Route' => \Hyde\Routing\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,
diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index a8bfa33d844..7e79acf6b7c 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -36,7 +36,7 @@ public function handle(): int
     protected function getRoutes(): array
     {
         $routes = [];
-        /** @var \Hyde\Support\Models\Route $route */
+        /** @var \Hyde\Routing\Route $route */
         foreach (Hyde::routes() as $route) {
             $routes[] = [
                 $this->formatPageType($route->getPageType()),
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 9df079e91b8..9aac00d3127 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\Support\Facades\View;
 
 /**
@@ -40,7 +40,7 @@ public function currentPage(): ?string
     /**
      * Get the route for the page being rendered.
      *
-     * @return \Hyde\Support\Models\Route|null
+     * @return \Hyde\Routing\Route|null
      */
     public function currentRoute(): ?Route
     {
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index 278e3c27676..754a0fd5616 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 
 /**
  * Pseudo-Router for Hyde.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 5313fb6dccc..38f671a4bcc 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -14,9 +14,9 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Routing\Route;
+use Hyde\Routing\RouteKey;
 use Hyde\Support\Contracts\CompilableContract;
-use Hyde\Support\Models\Route;
-use Hyde\Support\Models\RouteKey;
 
 /**
  * The base class for all Hyde pages.
@@ -185,7 +185,7 @@ public function getRouteKey(): string
     /**
      * Get the route for the page.
      *
-     * @return \Hyde\Support\Models\Route The page's route.
+     * @return \Hyde\Routing\Route The page's route.
      */
     public function getRoute(): Route
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 5053b230ce6..46c0922c77f 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 42218b3a2a3..e7b73fb43f9 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\Support\Str;
 use Stringable;
 
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  \Hyde\Support\Models\Route|null  $route
+     * @param  \Hyde\Routing\Route|null  $route
      * @param  string  $label
      * @param  int  $priority
      * @param  bool  $hidden
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index ecb55f9b1e3..4dfd8e4a0bc 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 7d0d336406f..b235b0ce434 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Support\Models\Site;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
@@ -96,7 +96,7 @@ protected function compilePagesForClass(string $pageClass): void
         $this->newLine(2);
     }
 
-    /** @psalm-return \Closure(\Hyde\Support\Models\Route):string */
+    /** @psalm-return \Closure(\Hyde\Routing\Route):string */
     protected function compileRoute(): Closure
     {
         return function (Route $route) {
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 383380ea9ca..9eb226a5876 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index d985ce0c4ee..c3cbb679242 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -10,7 +10,7 @@
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Helpers\Features;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\Support\Facades\Facade;
 
 /**
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index f321b3c416c..8d977ee1545 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 
 /**
  * Page class for documentation pages.
diff --git a/packages/framework/src/Helpers/Redirect.php b/packages/framework/src/Routing/Redirect.php
similarity index 97%
rename from packages/framework/src/Helpers/Redirect.php
rename to packages/framework/src/Routing/Redirect.php
index 9179c898778..7e2e939e025 100644
--- a/packages/framework/src/Helpers/Redirect.php
+++ b/packages/framework/src/Routing/Redirect.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Routing;
 
 use Hyde\Hyde;
 
diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Routing/Route.php
similarity index 99%
rename from packages/framework/src/Support/Models/Route.php
rename to packages/framework/src/Routing/Route.php
index 8b411a4d1b4..4403dd20bae 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Models;
+namespace Hyde\Routing;
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Routing/RouteKey.php
similarity index 97%
rename from packages/framework/src/Support/Models/RouteKey.php
rename to packages/framework/src/Routing/RouteKey.php
index be2c99109ca..d9ab9e28328 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Routing/RouteKey.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Models;
+namespace Hyde\Routing;
 
 use Stringable;
 use function unslash;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index d193f190d05..b9fb5f852ed 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index c5122af81b6..85f91f4f266 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 88d26fa6f1e..cd3381cdde9 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RedirectTest.php b/packages/framework/tests/Feature/RedirectTest.php
index dcee9623b56..5eee7ff2fb7 100644
--- a/packages/framework/tests/Feature/RedirectTest.php
+++ b/packages/framework/tests/Feature/RedirectTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Helpers\Redirect;
 use Hyde\Hyde;
+use Hyde\Routing\Redirect;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Helpers\Redirect
+ * @covers \Hyde\Routing\Redirect
  */
 class RedirectTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 97cf8942efc..7dce4105784 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -10,7 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 17b3e338643..75da944a575 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -8,11 +8,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\RouteKey;
+use Hyde\Routing\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Models\RouteKey
+ * @covers \Hyde\Routing\RouteKey
  */
 class RouteKeyTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 6fe59fcda0c..24081b7c6c4 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -11,11 +11,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Models\Route
+ * @covers \Hyde\Routing\Route
  */
 class RouteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index 80077c5a9d8..e0fd585f282 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index d92df155128..00fd2ac2fd1 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index e9be2c88ca9..fa62e4cce1b 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Hyde;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 2c0fb7a21aa..3d5bf7e2f9a 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
index 29bdc4f6c83..c698f91e52a 100644
--- a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
+++ b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
@@ -20,7 +20,7 @@ public function test_link_component_can_be_rendered()
 
     public function test_link_component_can_be_rendered_with_route()
     {
-        $route = \Hyde\Support\Models\Route::get('index');
+        $route = \Hyde\Routing\Route::get('index');
         $this->assertEquals('<a href="index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
@@ -28,7 +28,7 @@ public function test_link_component_can_be_rendered_with_route()
     public function test_link_component_can_be_rendered_with_route_for_nested_pages()
     {
         View::share('currentPage', 'foo/bar');
-        $route = \Hyde\Support\Models\Route::get('index');
+        $route = \Hyde\Routing\Route::get('index');
         $this->assertEquals('<a href="../index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index 984f9b6b4e3..f8bbe5c53fd 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 77596c5bf41..baa7bd09e70 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 
 /**
  * Handle routing for a web page request.
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 81262745fdf..b5f2189ff33 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -6,7 +6,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Support\Models\Route;
+use Hyde\Routing\Route;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 

From e4346bdfb26904080ba42d02dec75aa612888998 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:06:37 +0200
Subject: [PATCH 152/768] Create Router.php

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

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

From bfa7ba0d8b60f8e3e9f64bb92531fd00b4ab9aa3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:09:17 +0200
Subject: [PATCH 153/768] Move static Route methods to Router class

---
 packages/framework/src/Routing/Route.php  | 92 ---------------------
 packages/framework/src/Routing/Router.php | 98 ++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 93 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 4403dd20bae..2f7dcb666bb 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -167,96 +167,4 @@ public function is(Route|string $route): bool
 
         return $this->getRouteKey() === $route;
     }
-
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * Alias for static::getFromKey().
-     *
-     * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Framework\Models\Support\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
-     */
-    public static function get(string $routeKey): static
-    {
-        return static::getFromKey($routeKey);
-    }
-
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * @param  string  $routeKey  Example: posts/foo, posts.foo
-     * @return \Hyde\Framework\Models\Support\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
-     */
-    public static function getFromKey(string $routeKey): static
-    {
-        return Hyde::routes()->get(str_replace('.', '/', $routeKey))
-            ?? throw new RouteNotFoundException($routeKey);
-    }
-
-    /**
-     * Get a route from the route index for the specified source file path.
-     *
-     * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Framework\Models\Support\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
-     */
-    public static function getFromSource(string $sourceFilePath): static
-    {
-        return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
-            return $route->getSourcePath() === $sourceFilePath;
-        }) ?? throw new RouteNotFoundException($sourceFilePath);
-    }
-
-    /**
-     * Get a route from the route index for the supplied page model.
-     *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     * @return \Hyde\Framework\Models\Support\Route
-     */
-    public static function getFromModel(HydePage $page): Route
-    {
-        return $page->getRoute();
-    }
-
-    /**
-     * Get all routes from the route index.
-     *
-     * @return \Hyde\Foundation\RouteCollection<\Hyde\Framework\Models\Support\Route>
-     */
-    public static function all(): RouteCollection
-    {
-        return Hyde::routes();
-    }
-
-    /**
-     * Get the current route for the page being rendered.
-     */
-    public static function current(): Route
-    {
-        return Hyde::currentRoute() ?? throw new RouteNotFoundException('current');
-    }
-
-    /**
-     * Get the home route, usually the index page route.
-     */
-    public static function home(): Route
-    {
-        return static::getFromKey('index');
-    }
-
-    /**
-     * Determine if the supplied route key exists in the route index.
-     *
-     * @param  string  $routeKey
-     * @return bool
-     */
-    public static function exists(string $routeKey): bool
-    {
-        return Hyde::routes()->has($routeKey);
-    }
 }
diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index ac163b6d7a1..2e8df079cc1 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -4,7 +4,103 @@
 
 namespace Hyde\Routing;
 
+use Hyde\Foundation\RouteCollection;
+use Hyde\Framework\Concerns\HydePage;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
+use Hyde\Hyde;
+use function str_replace;
+
 class Router
 {
-    //
+    /**
+     * Get a route from the route index for the specified route key.
+     *
+     * Alias for static::getFromKey().
+     *
+     * @param  string  $routeKey  Example: posts/foo.md
+     * @return \Hyde\Framework\Models\Support\Route
+     *
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
+    public static function get(string $routeKey): Route
+    {
+        return static::getFromKey($routeKey);
+    }
+
+    /**
+     * Get a route from the route index for the specified route key.
+     *
+     * @param  string  $routeKey  Example: posts/foo, posts.foo
+     * @return \Hyde\Framework\Models\Support\Route
+     *
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
+    public static function getFromKey(string $routeKey): Route
+    {
+        return Hyde::routes()->get(str_replace('.', '/', $routeKey))
+            ?? throw new RouteNotFoundException($routeKey);
+    }
+
+    /**
+     * Get a route from the route index for the specified source file path.
+     *
+     * @param  string  $sourceFilePath  Example: _posts/foo.md
+     * @return \Hyde\Framework\Models\Support\Route
+     *
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
+    public static function getFromSource(string $sourceFilePath): Route
+    {
+        return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
+            return $route->getSourcePath() === $sourceFilePath;
+        }) ?? throw new RouteNotFoundException($sourceFilePath);
+    }
+
+    /**
+     * Get a route from the route index for the supplied page model.
+     *
+     * @param  \Hyde\Framework\Concerns\HydePage  $page
+     * @return \Hyde\Framework\Models\Support\Route
+     */
+    public static function getFromModel(HydePage $page): Route
+    {
+        return $page->getRoute();
+    }
+
+    /**
+     * Get all routes from the route index.
+     *
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Framework\Models\Support\Route>
+     */
+    public static function all(): RouteCollection
+    {
+        return Hyde::routes();
+    }
+
+    /**
+     * Get the current route for the page being rendered.
+     */
+    public static function current(): Route
+    {
+        return Hyde::currentRoute() ?? throw new RouteNotFoundException('current');
+    }
+
+    /**
+     * Get the home route, usually the index page route.
+     */
+    public static function home(): Route
+    {
+        return static::getFromKey('index');
+    }
+
+    /**
+     * Determine if the supplied route key exists in the route index.
+     *
+     * @param  string  $routeKey
+     * @return bool
+     */
+    public static function exists(string $routeKey): bool
+    {
+        return Hyde::routes()->has($routeKey);
+    }
 }

From ee56f5b727c35539300209946d461fd9233bbe37 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:09:35 +0200
Subject: [PATCH 154/768] Add callStatic magic method to preserve existing
 functionality

---
 packages/framework/src/Routing/Route.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 2f7dcb666bb..7a122c912bf 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -167,4 +167,12 @@ public function is(Route|string $route): bool
 
         return $this->getRouteKey() === $route;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public static function __callStatic(string $name, array $arguments)
+    {
+        return Router::$name(...$arguments);
+    }
 }

From 6c360fe80aece0c00f5dd2c49586071ff960b362 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:10:26 +0200
Subject: [PATCH 155/768] Update PHPDoc comments

---
 packages/framework/src/Routing/Route.php  |  2 +-
 packages/framework/src/Routing/Router.php | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 7a122c912bf..1facb601cfe 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -156,7 +156,7 @@ public function getQualifiedUrl(): string
     /**
      * Determine if the route instance matches another route or route key.
      *
-     * @param  \Hyde\Framework\Models\Support\Route|string  $route  A route instance or route key string
+     * @param \Hyde\Routing\Route|string $route A route instance or route key string
      * @return bool
      */
     public function is(Route|string $route): bool
diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 2e8df079cc1..b0698381a2d 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -17,8 +17,8 @@ class Router
      *
      * Alias for static::getFromKey().
      *
-     * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Framework\Models\Support\Route
+     * @param string $routeKey Example: posts/foo.md
+     * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
@@ -30,8 +30,8 @@ public static function get(string $routeKey): Route
     /**
      * Get a route from the route index for the specified route key.
      *
-     * @param  string  $routeKey  Example: posts/foo, posts.foo
-     * @return \Hyde\Framework\Models\Support\Route
+     * @param string $routeKey Example: posts/foo, posts.foo
+     * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
@@ -44,8 +44,8 @@ public static function getFromKey(string $routeKey): Route
     /**
      * Get a route from the route index for the specified source file path.
      *
-     * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Framework\Models\Support\Route
+     * @param string $sourceFilePath Example: _posts/foo.md
+     * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
@@ -59,8 +59,8 @@ public static function getFromSource(string $sourceFilePath): Route
     /**
      * Get a route from the route index for the supplied page model.
      *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     * @return \Hyde\Framework\Models\Support\Route
+     * @param \Hyde\Framework\Concerns\HydePage $page
+     * @return \Hyde\Routing\Route
      */
     public static function getFromModel(HydePage $page): Route
     {

From e50b51e9707c7517a443216366af30ee43a245e4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:10:31 +0200
Subject: [PATCH 156/768] Remove unused imports

---
 packages/framework/src/Routing/Route.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 1facb601cfe..7f12a799579 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -4,9 +4,7 @@
 
 namespace Hyde\Routing;
 
-use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;

From 3533eaa16f44ad81d83769cd27c536c5e5f9eac1 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 16:10:50 +0000
Subject: [PATCH 157/768] Apply fixes from StyleCI

---
 packages/framework/src/Routing/Route.php  | 2 +-
 packages/framework/src/Routing/Router.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 7f12a799579..0c01dec0ab7 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -154,7 +154,7 @@ public function getQualifiedUrl(): string
     /**
      * Determine if the route instance matches another route or route key.
      *
-     * @param \Hyde\Routing\Route|string $route A route instance or route key string
+     * @param  \Hyde\Routing\Route|string  $route  A route instance or route key string
      * @return bool
      */
     public function is(Route|string $route): bool
diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index b0698381a2d..04713da55c3 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -17,7 +17,7 @@ class Router
      *
      * Alias for static::getFromKey().
      *
-     * @param string $routeKey Example: posts/foo.md
+     * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
@@ -30,7 +30,7 @@ public static function get(string $routeKey): Route
     /**
      * Get a route from the route index for the specified route key.
      *
-     * @param string $routeKey Example: posts/foo, posts.foo
+     * @param  string  $routeKey  Example: posts/foo, posts.foo
      * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
@@ -44,7 +44,7 @@ public static function getFromKey(string $routeKey): Route
     /**
      * Get a route from the route index for the specified source file path.
      *
-     * @param string $sourceFilePath Example: _posts/foo.md
+     * @param  string  $sourceFilePath  Example: _posts/foo.md
      * @return \Hyde\Routing\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
@@ -59,7 +59,7 @@ public static function getFromSource(string $sourceFilePath): Route
     /**
      * Get a route from the route index for the supplied page model.
      *
-     * @param \Hyde\Framework\Concerns\HydePage $page
+     * @param  \Hyde\Framework\Concerns\HydePage  $page
      * @return \Hyde\Routing\Route
      */
     public static function getFromModel(HydePage $page): Route

From 04df2283ae7dee3624ef8de49386a5fb275a0f2b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:14:44 +0200
Subject: [PATCH 158/768] Return null instead of exceptions when the route is
 not found

---
 packages/framework/src/Routing/Router.php | 44 ++++++++++-------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 04713da55c3..4f022262224 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -17,12 +17,10 @@ class Router
      *
      * Alias for static::getFromKey().
      *
-     * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Routing\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     * @param string $routeKey Example: posts/foo.md
+     * @return \Hyde\Routing\Route|null
      */
-    public static function get(string $routeKey): Route
+    public static function get(string $routeKey): ?Route
     {
         return static::getFromKey($routeKey);
     }
@@ -30,39 +28,35 @@ public static function get(string $routeKey): Route
     /**
      * Get a route from the route index for the specified route key.
      *
-     * @param  string  $routeKey  Example: posts/foo, posts.foo
-     * @return \Hyde\Routing\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     * @param string $routeKey Example: posts/foo, posts.foo
+     * @return \Hyde\Routing\Route|null
      */
-    public static function getFromKey(string $routeKey): Route
+    public static function getFromKey(string $routeKey): ?Route
     {
         return Hyde::routes()->get(str_replace('.', '/', $routeKey))
-            ?? throw new RouteNotFoundException($routeKey);
+            ?? null;
     }
 
     /**
      * Get a route from the route index for the specified source file path.
      *
-     * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Routing\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     * @param string $sourceFilePath Example: _posts/foo.md
+     * @return \Hyde\Routing\Route|null
      */
-    public static function getFromSource(string $sourceFilePath): Route
+    public static function getFromSource(string $sourceFilePath): ?Route
     {
         return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
             return $route->getSourcePath() === $sourceFilePath;
-        }) ?? throw new RouteNotFoundException($sourceFilePath);
+        }) ?? null;
     }
 
     /**
      * Get a route from the route index for the supplied page model.
      *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     * @return \Hyde\Routing\Route
+     * @param \Hyde\Framework\Concerns\HydePage $page
+     * @return \Hyde\Routing\Route|null
      */
-    public static function getFromModel(HydePage $page): Route
+    public static function getFromModel(HydePage $page): ?Route
     {
         return $page->getRoute();
     }
@@ -70,7 +64,7 @@ public static function getFromModel(HydePage $page): Route
     /**
      * Get all routes from the route index.
      *
-     * @return \Hyde\Foundation\RouteCollection<\Hyde\Framework\Models\Support\Route>
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
      */
     public static function all(): RouteCollection
     {
@@ -80,17 +74,17 @@ public static function all(): RouteCollection
     /**
      * Get the current route for the page being rendered.
      */
-    public static function current(): Route
+    public static function current(): ?Route
     {
-        return Hyde::currentRoute() ?? throw new RouteNotFoundException('current');
+        return Hyde::currentRoute() ?? null;
     }
 
     /**
      * Get the home route, usually the index page route.
      */
-    public static function home(): Route
+    public static function home(): ?Route
     {
-        return static::getFromKey('index');
+        return static::getFromKey('index') ?? null;
     }
 
     /**

From 196be9dde73e4126b20eb1c0a73c9e32b3ddadbd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:15:44 +0200
Subject: [PATCH 159/768] Add getOrFail method

---
 packages/framework/src/Routing/Router.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 4f022262224..0466371f2a8 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -25,6 +25,18 @@ public static function get(string $routeKey): ?Route
         return static::getFromKey($routeKey);
     }
 
+    /**
+     * Get a route from the route index for the specified route key or throw an exception.
+     *
+     * @param string $routeKey
+     * @return \Hyde\Routing\Route
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
+    public static function getOrFail(string $routeKey): Route
+    {
+        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
+    }
+
     /**
      * Get a route from the route index for the specified route key.
      *

From cd25e2148e1acdb64dba0043506b8e36061e2086 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:17:21 +0200
Subject: [PATCH 160/768] Update RELEASE_NOTES.md

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

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2392b06d200..123f3a37d78 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -36,6 +36,10 @@ If you however have written custom code that explicitly references the old names
   * Large changes to the Meta.php helper/facade; most of its business logic has been moved to the GlobalMetadataBag class.
   * This might affect you if you relied on any of the helper methods that were removed from Meta.php.
   * See https://github.com/hydephp/develop/pull/584 for more details.
+- The Route helpers no longer throw exceptions when attempting to access a non-existent route.
+  * Instead, they return `null` if the route does not exist.
+  * This is to allow for more flexibility in the way routes are used.
+  * You can use Route::getOrFail() to get the same behavior as before, or null coalesce the result of Route::get().
 
 ### Other changes
 

From 3e2d78ecca7336ebd6780fff1d58a9646c5ff686 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:18:58 +0200
Subject: [PATCH 161/768] Update RouteTest.php

---
 .../framework/tests/Feature/RouteTest.php     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 24081b7c6c4..c24c520d4ca 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -73,16 +73,21 @@ public function test_get_is_alias_for_get_from_key()
         $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
     }
 
+    public function test_get_or_fail_throws_exception_if_route_is_not_found()
+    {
+        $this->expectException(RouteNotFoundException::class);
+        Route::getOrFail('not-found');
+    }
+
     public function test_get_from_key_returns_route_from_router_index()
     {
         $this->assertEquals(new Route(BladePage::parse('index')), Route::get('index'));
         $this->assertInstanceOf(Route::class, Route::get('index'));
     }
 
-    public function test_get_from_key_throws_exception_if_route_is_not_found()
+    public function test_get_from_returns_null_if_route_is_not_found()
     {
-        $this->expectException(RouteNotFoundException::class);
-        Route::get('not-found');
+        $this->assertNull(Route::get('not-found'));
     }
 
     public function test_get_from_source_returns_route_from_router_index()
@@ -93,8 +98,7 @@ public function test_get_from_source_returns_route_from_router_index()
 
     public function test_get_from_source_returns_null_if_route_is_not_found()
     {
-        $this->expectException(RouteNotFoundException::class);
-        Route::getFromSource('not-found');
+        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
     }
 
     public function test_get_from_source_can_find_blade_pages()
@@ -212,10 +216,9 @@ public function test_current_returns_current_route()
         $this->assertEquals($route, Route::current());
     }
 
-    public function test_current_throws_exception_if_route_is_not_found()
+    public function test_current_returns_null_if_route_is_not_found()
     {
-        $this->expectException(RouteNotFoundException::class);
-        Route::current();
+        $this->assertNull(Route::current());
     }
 
     public function test_home_helper_returns_index_route()

From 4ebd0e8faac360f19ba19fbb00837e4a9fde9674 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 16:19:43 +0000
Subject: [PATCH 162/768] Apply fixes from StyleCI

---
 packages/framework/src/Routing/Router.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 0466371f2a8..b5ccb22fe8a 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -17,7 +17,7 @@ class Router
      *
      * Alias for static::getFromKey().
      *
-     * @param string $routeKey Example: posts/foo.md
+     * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
     public static function get(string $routeKey): ?Route
@@ -28,8 +28,9 @@ public static function get(string $routeKey): ?Route
     /**
      * Get a route from the route index for the specified route key or throw an exception.
      *
-     * @param string $routeKey
+     * @param  string  $routeKey
      * @return \Hyde\Routing\Route
+     *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
     public static function getOrFail(string $routeKey): Route
@@ -40,7 +41,7 @@ public static function getOrFail(string $routeKey): Route
     /**
      * Get a route from the route index for the specified route key.
      *
-     * @param string $routeKey Example: posts/foo, posts.foo
+     * @param  string  $routeKey  Example: posts/foo, posts.foo
      * @return \Hyde\Routing\Route|null
      */
     public static function getFromKey(string $routeKey): ?Route
@@ -52,7 +53,7 @@ public static function getFromKey(string $routeKey): ?Route
     /**
      * Get a route from the route index for the specified source file path.
      *
-     * @param string $sourceFilePath Example: _posts/foo.md
+     * @param  string  $sourceFilePath  Example: _posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
     public static function getFromSource(string $sourceFilePath): ?Route
@@ -65,7 +66,7 @@ public static function getFromSource(string $sourceFilePath): ?Route
     /**
      * Get a route from the route index for the supplied page model.
      *
-     * @param \Hyde\Framework\Concerns\HydePage $page
+     * @param  \Hyde\Framework\Concerns\HydePage  $page
      * @return \Hyde\Routing\Route|null
      */
     public static function getFromModel(HydePage $page): ?Route

From 55ed42513034c6609a91e0f7beb20acea7790d53 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:23:13 +0200
Subject: [PATCH 163/768] Move Asset facade class into new Facades namespace

---
 config/app.php                                                | 2 +-
 packages/framework/src/{Helpers => Facades}/Asset.php         | 2 +-
 packages/framework/src/Framework/Services/AssetService.php    | 2 +-
 packages/framework/tests/Unit/AssetFacadeTest.php             | 4 ++--
 .../framework/tests/Unit/Views/StylesComponentViewTest.php    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/framework/src/{Helpers => Facades}/Asset.php (96%)

diff --git a/config/app.php b/config/app.php
index 78b9bb4cbb9..0eec5fbf0af 100644
--- a/config/app.php
+++ b/config/app.php
@@ -94,7 +94,7 @@
 
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
-        'Asset' => \Hyde\Helpers\Asset::class,
+        'Asset' => \Hyde\Facades\Asset::class,
         'Site' => \Hyde\Support\Models\Site::class,
         'Route' => \Hyde\Routing\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
diff --git a/packages/framework/src/Helpers/Asset.php b/packages/framework/src/Facades/Asset.php
similarity index 96%
rename from packages/framework/src/Helpers/Asset.php
rename to packages/framework/src/Facades/Asset.php
index c9187bc68ad..fb5da46e601 100644
--- a/packages/framework/src/Helpers/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Facades;
 
 use Hyde\Framework\Services\AssetService;
 use Illuminate\Support\Facades\Facade;
diff --git a/packages/framework/src/Framework/Services/AssetService.php b/packages/framework/src/Framework/Services/AssetService.php
index e8ac60fa8ba..b8e5ee4f92a 100644
--- a/packages/framework/src/Framework/Services/AssetService.php
+++ b/packages/framework/src/Framework/Services/AssetService.php
@@ -11,7 +11,7 @@
  *
  * This class is loaded into the service container, making it easy to access and modify.
  *
- * @see \Hyde\Helpers\Asset
+ * @see \Hyde\Facades\Asset
  */
 class AssetService
 {
diff --git a/packages/framework/tests/Unit/AssetFacadeTest.php b/packages/framework/tests/Unit/AssetFacadeTest.php
index bd08a0903f0..b73db63122a 100644
--- a/packages/framework/tests/Unit/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/AssetFacadeTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Facades\Asset;
 use Hyde\Framework\Services\AssetService;
-use Hyde\Helpers\Asset;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Helpers\Asset
+ * @covers \Hyde\Facades\Asset
  */
 class AssetFacadeTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
index 1933499d579..7d3db097891 100644
--- a/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
+++ b/packages/framework/tests/Unit/Views/StylesComponentViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Helpers\Asset;
+use Hyde\Facades\Asset;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Blade;

From 4688780a6cd28275b50144eaf5bbdce1d21eed7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:24:07 +0200
Subject: [PATCH 164/768] Add PHPDoc

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

diff --git a/packages/framework/src/Facades/Asset.php b/packages/framework/src/Facades/Asset.php
index fb5da46e601..5a2e5b3028f 100644
--- a/packages/framework/src/Facades/Asset.php
+++ b/packages/framework/src/Facades/Asset.php
@@ -8,6 +8,8 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
+ * Handles the retrieval of core asset files, either from the HydeFront CDN or from the local media folder.
+ *
  * @see \Hyde\Framework\Services\AssetService
  *
  * @method static string version()

From cab5797119f53b83f7d687b5c7dad37543d947ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:27:11 +0200
Subject: [PATCH 165/768] Update AssetFacadeTest.php

---
 .../tests/{Unit => Feature/Facades}/AssetFacadeTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/{Unit => Feature/Facades}/AssetFacadeTest.php (93%)

diff --git a/packages/framework/tests/Unit/AssetFacadeTest.php b/packages/framework/tests/Feature/Facades/AssetFacadeTest.php
similarity index 93%
rename from packages/framework/tests/Unit/AssetFacadeTest.php
rename to packages/framework/tests/Feature/Facades/AssetFacadeTest.php
index b73db63122a..8f979f6f560 100644
--- a/packages/framework/tests/Unit/AssetFacadeTest.php
+++ b/packages/framework/tests/Feature/Facades/AssetFacadeTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Unit;
+namespace Hyde\Framework\Testing\Feature\Facades;
 
 use Hyde\Facades\Asset;
 use Hyde\Framework\Services\AssetService;

From d884d3d80d81945b566bfc740827b7968b8b4756 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:27:35 +0200
Subject: [PATCH 166/768] Update AssetFacadeTest.php

---
 .../tests/{Feature => Unit}/Facades/AssetFacadeTest.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/{Feature => Unit}/Facades/AssetFacadeTest.php (93%)

diff --git a/packages/framework/tests/Feature/Facades/AssetFacadeTest.php b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
similarity index 93%
rename from packages/framework/tests/Feature/Facades/AssetFacadeTest.php
rename to packages/framework/tests/Unit/Facades/AssetFacadeTest.php
index 8f979f6f560..0dbd09e7ef8 100644
--- a/packages/framework/tests/Feature/Facades/AssetFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/AssetFacadeTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Testing\Feature\Facades;
+namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Asset;
 use Hyde\Framework\Services\AssetService;

From 7634f5247d4d148bf0d2801d52484128a8280c0f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:29:58 +0200
Subject: [PATCH 167/768] Create Route.php

---
 packages/framework/src/Facades/Route.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/framework/src/Facades/Route.php

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
new file mode 100644
index 00000000000..394d1041339
--- /dev/null
+++ b/packages/framework/src/Facades/Route.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Facades;
+
+use Hyde\Routing\Router;
+use Illuminate\Support\Facades\Facade;
+
+class Route extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return Router::class;
+    }
+}

From 8997b0da5db0618006ffa9528aff96201ce8cd22 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:29:59 +0200
Subject: [PATCH 168/768] Create RouteFacadeTest.php

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

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
new file mode 100644
index 00000000000..adcc965fe5d
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Facades\Route;
+use Hyde\Routing\Router;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Facades\Route
+ */
+class RouteFacadeTest extends TestCase
+{
+    public function test_route_facade_returns_the_router()
+    {
+        $this->assertInstanceOf(Router::class, Route::getFacadeRoot());
+    }
+
+    public function test_route_facade_can_call_methods_on_the_router()
+    {
+        $this->assertEquals(Router::all(), Route::all());
+    }
+}

From efdc0ad11e4b89108e07886b7495c53dd2750528 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:31:00 +0200
Subject: [PATCH 169/768] Add PHPDoc

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

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 394d1041339..5ebfe10e01a 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -7,6 +7,11 @@
 use Hyde\Routing\Router;
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * Provides an easy way to access the Hyde pseudo-router.
+ *
+ * @see \Hyde\Routing\Router
+ */
 class Route extends Facade
 {
     protected static function getFacadeAccessor(): string

From 5de846a370aded47b502e8d62e9f22a1f0df0d02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:34:09 +0200
Subject: [PATCH 170/768] Add method tags

---
 packages/framework/src/Facades/Route.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 5ebfe10e01a..26de44f447a 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Facades;
 
+use Hyde\Foundation\RouteCollection;
 use Hyde\Routing\Router;
 use Illuminate\Support\Facades\Facade;
 
@@ -11,6 +12,16 @@
  * Provides an easy way to access the Hyde pseudo-router.
  *
  * @see \Hyde\Routing\Router
+ *
+ * @method static ?Route get(string $routeKey)
+ * @method static ?Route getFromKey(string $routeKey)
+ * @method static ?Route getFromSource(string $sourceFilePath)
+ * @method static ?Route getFromModel(HydePage $page)
+ * @method static Route getOrFail(string $routeKey)
+ * @method static RouteCollection all()
+ * @method static bool exists(string $routeKey)
+ * @method static ?Route current()
+ * @method static ?Route home()
  */
 class Route extends Facade
 {

From e2b13579b620e1e7d58ae4d44cafb3e120724ccd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:35:48 +0200
Subject: [PATCH 171/768] Router methods no longer need to be static

---
 packages/framework/src/Routing/Router.php     | 26 +++++++++----------
 .../tests/Unit/Facades/RouteFacadeTest.php    |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index b5ccb22fe8a..3fb2da0502b 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -15,14 +15,14 @@ class Router
     /**
      * Get a route from the route index for the specified route key.
      *
-     * Alias for static::getFromKey().
+     * Alias for $this->>getFromKey().
      *
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
-    public static function get(string $routeKey): ?Route
+    public function get(string $routeKey): ?Route
     {
-        return static::getFromKey($routeKey);
+        return $this->getFromKey($routeKey);
     }
 
     /**
@@ -33,9 +33,9 @@ public static function get(string $routeKey): ?Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
-    public static function getOrFail(string $routeKey): Route
+    public function getOrFail(string $routeKey): Route
     {
-        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
+        return $this->getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
     /**
@@ -44,7 +44,7 @@ public static function getOrFail(string $routeKey): Route
      * @param  string  $routeKey  Example: posts/foo, posts.foo
      * @return \Hyde\Routing\Route|null
      */
-    public static function getFromKey(string $routeKey): ?Route
+    public function getFromKey(string $routeKey): ?Route
     {
         return Hyde::routes()->get(str_replace('.', '/', $routeKey))
             ?? null;
@@ -56,7 +56,7 @@ public static function getFromKey(string $routeKey): ?Route
      * @param  string  $sourceFilePath  Example: _posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
-    public static function getFromSource(string $sourceFilePath): ?Route
+    public function getFromSource(string $sourceFilePath): ?Route
     {
         return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
             return $route->getSourcePath() === $sourceFilePath;
@@ -69,7 +69,7 @@ public static function getFromSource(string $sourceFilePath): ?Route
      * @param  \Hyde\Framework\Concerns\HydePage  $page
      * @return \Hyde\Routing\Route|null
      */
-    public static function getFromModel(HydePage $page): ?Route
+    public function getFromModel(HydePage $page): ?Route
     {
         return $page->getRoute();
     }
@@ -79,7 +79,7 @@ public static function getFromModel(HydePage $page): ?Route
      *
      * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
      */
-    public static function all(): RouteCollection
+    public function all(): RouteCollection
     {
         return Hyde::routes();
     }
@@ -87,7 +87,7 @@ public static function all(): RouteCollection
     /**
      * Get the current route for the page being rendered.
      */
-    public static function current(): ?Route
+    public function current(): ?Route
     {
         return Hyde::currentRoute() ?? null;
     }
@@ -95,9 +95,9 @@ public static function current(): ?Route
     /**
      * Get the home route, usually the index page route.
      */
-    public static function home(): ?Route
+    public function home(): ?Route
     {
-        return static::getFromKey('index') ?? null;
+        return $this->getFromKey('index') ?? null;
     }
 
     /**
@@ -106,7 +106,7 @@ public static function home(): ?Route
      * @param  string  $routeKey
      * @return bool
      */
-    public static function exists(string $routeKey): bool
+    public function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);
     }
diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index adcc965fe5d..f0631d2385f 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -20,6 +20,6 @@ public function test_route_facade_returns_the_router()
 
     public function test_route_facade_can_call_methods_on_the_router()
     {
-        $this->assertEquals(Router::all(), Route::all());
+        $this->assertEquals((new Router())->all(), Route::all());
     }
 }

From eb3dc5ee99d9ff90b11c68cc78293f43c8d3562b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:38:16 +0200
Subject: [PATCH 172/768] Add PHPDoc

---
 packages/framework/src/Routing/Router.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 3fb2da0502b..bdae7e1a044 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -10,6 +10,9 @@
 use Hyde\Hyde;
 use function str_replace;
 
+/**
+ * Provides helper methods for accessing the Hyde pseudo-router.
+ */
 class Router
 {
     /**

From 67c7ce84e40c4d84ac4422e54c29ea2a8090da61 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:38:21 +0200
Subject: [PATCH 173/768] Link to the facade

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

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index bdae7e1a044..c34e76c353e 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -12,6 +12,8 @@
 
 /**
  * Provides helper methods for accessing the Hyde pseudo-router.
+ *
+ * @see \Hyde\Facades\Route for the facade that provides access to this class.
  */
 class Router
 {

From 4d8e37c15062e360109134640efac60cb80064c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:38:46 +0200
Subject: [PATCH 174/768] Create RouterTest.php

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

diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
new file mode 100644
index 00000000000..1400d1a4ecc
--- /dev/null
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Routing\Router;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Routing\Router
+ */
+class RouterTest extends TestCase
+{
+    //
+}

From 8267bf09db86d7c4a721129fb57066ded2a2b4fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:39:56 +0200
Subject: [PATCH 175/768] Move tests for moved methods

---
 .../framework/tests/Feature/RouteTest.php     |  95 ----------------
 .../framework/tests/Feature/RouterTest.php    | 105 +++++++++++++++++-
 2 files changed, 104 insertions(+), 96 deletions(-)

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index c24c520d4ca..db809988df1 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -68,84 +68,6 @@ public function test_get_output_file_path_returns_page_output_path()
         $this->assertEquals($page->getOutputPath(), $route->getOutputPath());
     }
 
-    public function test_get_is_alias_for_get_from_key()
-    {
-        $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
-    }
-
-    public function test_get_or_fail_throws_exception_if_route_is_not_found()
-    {
-        $this->expectException(RouteNotFoundException::class);
-        Route::getOrFail('not-found');
-    }
-
-    public function test_get_from_key_returns_route_from_router_index()
-    {
-        $this->assertEquals(new Route(BladePage::parse('index')), Route::get('index'));
-        $this->assertInstanceOf(Route::class, Route::get('index'));
-    }
-
-    public function test_get_from_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::get('not-found'));
-    }
-
-    public function test_get_from_source_returns_route_from_router_index()
-    {
-        $this->assertEquals(new Route(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
-        $this->assertInstanceOf(Route::class, Route::getFromSource('_pages/index.blade.php'));
-    }
-
-    public function test_get_from_source_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_blade_pages()
-    {
-        Hyde::touch(('_pages/foo.blade.php'));
-        $this->assertEquals(new Route(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
-        unlink(Hyde::path('_pages/foo.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_markdown_pages()
-    {
-        Hyde::touch(('_pages/foo.md'));
-        $this->assertEquals(new Route(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
-        unlink(Hyde::path('_pages/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_markdown_posts()
-    {
-        Hyde::touch(('_posts/foo.md'));
-        $this->assertEquals(new Route(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
-        unlink(Hyde::path('_posts/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_documentation_pages()
-    {
-        Hyde::touch(('_docs/foo.md'));
-        $this->assertEquals(new Route(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
-        unlink(Hyde::path('_docs/foo.md'));
-    }
-
-    public function test_get_from_model_returns_the_models_route()
-    {
-        $page = new BladePage('index');
-        $this->assertEquals(new Route($page), Route::getFromModel($page));
-    }
-
-    public function test_get_supports_dot_notation()
-    {
-        $this->file('_posts/foo.md');
-        $this->assertSame(Route::get('posts/foo'), Route::get('posts.foo'));
-    }
-
-    public function test_route_facade_all_method_returns_all_routes()
-    {
-        $this->assertEquals(Hyde::routes(), Route::all());
-    }
-
     public function test_get_link_returns_correct_path_for_root_pages()
     {
         $route = new Route(new MarkdownPage(identifier: 'foo'));
@@ -209,23 +131,6 @@ public function test_get_qualified_url_throws_exception_when_a_base_url_is_not_s
         $route->getQualifiedUrl();
     }
 
-    public function test_current_returns_current_route()
-    {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
-        view()->share('currentRoute', $route);
-        $this->assertEquals($route, Route::current());
-    }
-
-    public function test_current_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::current());
-    }
-
-    public function test_home_helper_returns_index_route()
-    {
-        $this->assertEquals(Route::get('index'), Route::home());
-    }
-
     public function test_to_array_method()
     {
         $this->assertEquals([
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index 1400d1a4ecc..caab0ef1dc2 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -4,13 +4,116 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Exceptions\RouteNotFoundException;
+use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
+use Hyde\Routing\Route;
 use Hyde\Routing\Router;
 use Hyde\Testing\TestCase;
+use function unlink;
+use function view;
 
 /**
  * @covers \Hyde\Routing\Router
  */
 class RouterTest extends TestCase
 {
-    //
+    public function test_get_is_alias_for_get_from_key()
+    {
+        $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
+    }
+
+    public function test_get_or_fail_throws_exception_if_route_is_not_found()
+    {
+        $this->expectException(RouteNotFoundException::class);
+        Route::getOrFail('not-found');
+    }
+
+    public function test_get_from_key_returns_route_from_router_index()
+    {
+        $this->assertEquals(new Route(BladePage::parse('index')), Route::get('index'));
+        $this->assertInstanceOf(Route::class, Route::get('index'));
+    }
+
+    public function test_get_from_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::get('not-found'));
+    }
+
+    public function test_get_from_source_returns_route_from_router_index()
+    {
+        $this->assertEquals(new Route(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
+        $this->assertInstanceOf(Route::class, Route::getFromSource('_pages/index.blade.php'));
+    }
+
+    public function test_get_from_source_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
+    }
+
+    public function test_get_from_source_can_find_blade_pages()
+    {
+        Hyde::touch(('_pages/foo.blade.php'));
+        $this->assertEquals(new Route(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
+        unlink(Hyde::path('_pages/foo.blade.php'));
+    }
+
+    public function test_get_from_source_can_find_markdown_pages()
+    {
+        Hyde::touch(('_pages/foo.md'));
+        $this->assertEquals(new Route(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
+        unlink(Hyde::path('_pages/foo.md'));
+    }
+
+    public function test_get_from_source_can_find_markdown_posts()
+    {
+        Hyde::touch(('_posts/foo.md'));
+        $this->assertEquals(new Route(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
+        unlink(Hyde::path('_posts/foo.md'));
+    }
+
+    public function test_get_from_source_can_find_documentation_pages()
+    {
+        Hyde::touch(('_docs/foo.md'));
+        $this->assertEquals(new Route(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
+        unlink(Hyde::path('_docs/foo.md'));
+    }
+
+    public function test_get_from_model_returns_the_models_route()
+    {
+        $page = new BladePage('index');
+        $this->assertEquals(new Route($page), Route::getFromModel($page));
+    }
+
+    public function test_get_supports_dot_notation()
+    {
+        $this->file('_posts/foo.md');
+        $this->assertSame(Route::get('posts/foo'), Route::get('posts.foo'));
+    }
+
+    public function test_route_facade_all_method_returns_all_routes()
+    {
+        $this->assertEquals(Hyde::routes(), Route::all());
+    }
+
+
+    public function test_current_returns_current_route()
+    {
+        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        view()->share('currentRoute', $route);
+        $this->assertEquals($route, Route::current());
+    }
+
+    public function test_current_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::current());
+    }
+
+    public function test_home_helper_returns_index_route()
+    {
+        $this->assertEquals(Route::get('index'), Route::home());
+    }
 }

From b22a5e2a46525f94ed5a25db62a9ac419f1c3d5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:42:11 +0200
Subject: [PATCH 176/768] Fix property annotations

---
 packages/framework/src/Facades/Route.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 26de44f447a..ea111077c76 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -13,15 +13,15 @@
  *
  * @see \Hyde\Routing\Router
  *
- * @method static ?Route get(string $routeKey)
- * @method static ?Route getFromKey(string $routeKey)
- * @method static ?Route getFromSource(string $sourceFilePath)
- * @method static ?Route getFromModel(HydePage $page)
+ * @method static Route|null get(string $routeKey)
+ * @method static Route|null getFromKey(string $routeKey)
+ * @method static Route|null getFromSource(string $sourceFilePath)
+ * @method static Route|null getFromModel(HydePage $page)
  * @method static Route getOrFail(string $routeKey)
  * @method static RouteCollection all()
  * @method static bool exists(string $routeKey)
- * @method static ?Route current()
- * @method static ?Route home()
+ * @method static Route|null current()
+ * @method static Route|null home()
  */
 class Route extends Facade
 {

From 7fe0cea2fe6b33cabf8838836108b87cbf3f7b3b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:43:06 +0200
Subject: [PATCH 177/768] Sort method annotations

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

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index ea111077c76..fdc84d5dc44 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Foundation\RouteCollection;
+use Hyde\Framework\Concerns\HydePage;
 use Hyde\Routing\Router;
 use Illuminate\Support\Facades\Facade;
 
@@ -13,15 +14,15 @@
  *
  * @see \Hyde\Routing\Router
  *
+ * @method static Route|null home()
+ * @method static Route|null current()
  * @method static Route|null get(string $routeKey)
  * @method static Route|null getFromKey(string $routeKey)
  * @method static Route|null getFromSource(string $sourceFilePath)
  * @method static Route|null getFromModel(HydePage $page)
  * @method static Route getOrFail(string $routeKey)
- * @method static RouteCollection all()
  * @method static bool exists(string $routeKey)
- * @method static Route|null current()
- * @method static Route|null home()
+ * @method static RouteCollection all()
  */
 class Route extends Facade
 {

From d58a3b2ee6755a44be58dec6db99e836808ca093 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:43:55 +0200
Subject: [PATCH 178/768] Update test to use the new Router class

---
 .../framework/tests/Feature/RouterTest.php    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index caab0ef1dc2..193642661f6 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -10,14 +10,15 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route;
-use Hyde\Routing\Router;
+use Hyde\Facades\Route;
+use Hyde\Routing\Route as RouteModel;
 use Hyde\Testing\TestCase;
 use function unlink;
 use function view;
 
 /**
  * @covers \Hyde\Routing\Router
+ * @see \Hyde\Framework\Testing\Unit\Facades\RouteFacadeTest
  */
 class RouterTest extends TestCase
 {
@@ -34,8 +35,8 @@ public function test_get_or_fail_throws_exception_if_route_is_not_found()
 
     public function test_get_from_key_returns_route_from_router_index()
     {
-        $this->assertEquals(new Route(BladePage::parse('index')), Route::get('index'));
-        $this->assertInstanceOf(Route::class, Route::get('index'));
+        $this->assertEquals(new RouteModel(BladePage::parse('index')), Route::get('index'));
+        $this->assertInstanceOf(RouteModel::class, Route::get('index'));
     }
 
     public function test_get_from_returns_null_if_route_is_not_found()
@@ -45,8 +46,8 @@ public function test_get_from_returns_null_if_route_is_not_found()
 
     public function test_get_from_source_returns_route_from_router_index()
     {
-        $this->assertEquals(new Route(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
-        $this->assertInstanceOf(Route::class, Route::getFromSource('_pages/index.blade.php'));
+        $this->assertEquals(new RouteModel(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
+        $this->assertInstanceOf(RouteModel::class, Route::getFromSource('_pages/index.blade.php'));
     }
 
     public function test_get_from_source_returns_null_if_route_is_not_found()
@@ -57,35 +58,35 @@ public function test_get_from_source_returns_null_if_route_is_not_found()
     public function test_get_from_source_can_find_blade_pages()
     {
         Hyde::touch(('_pages/foo.blade.php'));
-        $this->assertEquals(new Route(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
+        $this->assertEquals(new RouteModel(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
         unlink(Hyde::path('_pages/foo.blade.php'));
     }
 
     public function test_get_from_source_can_find_markdown_pages()
     {
         Hyde::touch(('_pages/foo.md'));
-        $this->assertEquals(new Route(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
+        $this->assertEquals(new RouteModel(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
         unlink(Hyde::path('_pages/foo.md'));
     }
 
     public function test_get_from_source_can_find_markdown_posts()
     {
         Hyde::touch(('_posts/foo.md'));
-        $this->assertEquals(new Route(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
+        $this->assertEquals(new RouteModel(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
         unlink(Hyde::path('_posts/foo.md'));
     }
 
     public function test_get_from_source_can_find_documentation_pages()
     {
         Hyde::touch(('_docs/foo.md'));
-        $this->assertEquals(new Route(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
+        $this->assertEquals(new RouteModel(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
         unlink(Hyde::path('_docs/foo.md'));
     }
 
     public function test_get_from_model_returns_the_models_route()
     {
         $page = new BladePage('index');
-        $this->assertEquals(new Route($page), Route::getFromModel($page));
+        $this->assertEquals(new RouteModel($page), Route::getFromModel($page));
     }
 
     public function test_get_supports_dot_notation()
@@ -99,10 +100,9 @@ public function test_route_facade_all_method_returns_all_routes()
         $this->assertEquals(Hyde::routes(), Route::all());
     }
 
-
     public function test_current_returns_current_route()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new RouteModel(new MarkdownPage(identifier: 'foo'));
         view()->share('currentRoute', $route);
         $this->assertEquals($route, Route::current());
     }

From 050f18271351ddf1a8d9ae926b695c5b9b188daa Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 16:44:16 +0000
Subject: [PATCH 179/768] Apply fixes from StyleCI

---
 packages/framework/tests/Feature/RouteTest.php  | 4 ----
 packages/framework/tests/Feature/RouterTest.php | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index db809988df1..eae993aa421 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -5,12 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
-use Hyde\Pages\BladePage;
-use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
 use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index 193642661f6..ced41c06495 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Route;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Facades\Route;
 use Hyde\Routing\Route as RouteModel;
 use Hyde\Testing\TestCase;
 use function unlink;
@@ -18,6 +18,7 @@
 
 /**
  * @covers \Hyde\Routing\Router
+ *
  * @see \Hyde\Framework\Testing\Unit\Facades\RouteFacadeTest
  */
 class RouterTest extends TestCase

From 039f9621bfd3d0b5a634f373c7cf5617645e01fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:44:17 +0200
Subject: [PATCH 180/768] Revert "Add callStatic magic method to preserve
 existing functionality"

This reverts commit ee56f5b727c35539300209946d461fd9233bbe37.
---
 packages/framework/src/Routing/Route.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 0c01dec0ab7..4037fbcf9d6 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -165,12 +165,4 @@ public function is(Route|string $route): bool
 
         return $this->getRouteKey() === $route;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public static function __callStatic(string $name, array $arguments)
-    {
-        return Router::$name(...$arguments);
-    }
 }

From e1ad54b54bbaaab8009c5c9e39401438deb6b1ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:46:14 +0200
Subject: [PATCH 181/768] Update route alias to use the facade

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

diff --git a/config/app.php b/config/app.php
index 0eec5fbf0af..b845264787a 100644
--- a/config/app.php
+++ b/config/app.php
@@ -96,7 +96,7 @@
         'Hyde' => Hyde\Hyde::class,
         'Asset' => \Hyde\Facades\Asset::class,
         'Site' => \Hyde\Support\Models\Site::class,
-        'Route' => \Hyde\Routing\Route::class,
+        'Route' => \Hyde\Facades\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,

From 7f7f0d8f0b5ca624a0e50b865cfce65d5a974912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:50:29 +0200
Subject: [PATCH 182/768] Use the Route facade

---
 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 8d977ee1545..ff89ea01b0a 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Routing\Route;
+use Hyde\Facades\Route;
 
 /**
  * Page class for documentation pages.

From 3ba74102a7e464d3f1aa030bd7fcddc6b5fe7169 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 16:50:39 +0000
Subject: [PATCH 183/768] Apply fixes from StyleCI

---
 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 ff89ea01b0a..16165123e3b 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Pages;
 
+use Hyde\Facades\Route;
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Facades\Route;
 
 /**
  * Page class for documentation pages.

From 6c75a762e8662c3eeda21855a3bfa250b3bf7dc5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:51:13 +0200
Subject: [PATCH 184/768] Format PHPDoc

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

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index c34e76c353e..6f96506940d 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -20,7 +20,7 @@ class Router
     /**
      * Get a route from the route index for the specified route key.
      *
-     * Alias for $this->>getFromKey().
+     * Alias for $this->getFromKey().
      *
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null

From f86a6b2247e25b69652f9e0844960453f926e605 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:52:25 +0200
Subject: [PATCH 185/768] Update Route.php

---
 packages/framework/src/Facades/Route.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index fdc84d5dc44..86d60af87c0 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -14,13 +14,13 @@
  *
  * @see \Hyde\Routing\Router
  *
- * @method static Route|null home()
- * @method static Route|null current()
- * @method static Route|null get(string $routeKey)
- * @method static Route|null getFromKey(string $routeKey)
- * @method static Route|null getFromSource(string $sourceFilePath)
- * @method static Route|null getFromModel(HydePage $page)
- * @method static Route getOrFail(string $routeKey)
+ * @method static \Hyde\Routing\Route|null home()
+ * @method static \Hyde\Routing\Route|null current()
+ * @method static \Hyde\Routing\Route|null get(string $routeKey)
+ * @method static \Hyde\Routing\Route|null getFromKey(string $routeKey)
+ * @method static \Hyde\Routing\Route|null getFromSource(string $sourceFilePath)
+ * @method static \Hyde\Routing\Route|null getFromModel(HydePage $page)
+ * @method static \Hyde\Routing\Route getOrFail(string $routeKey)
  * @method static bool exists(string $routeKey)
  * @method static RouteCollection all()
  */

From 3b58180c88768589553c82e866c318d125a78278 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:55:15 +0200
Subject: [PATCH 186/768] Update SitemapService.php

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

diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 9eb226a5876..280233b2e10 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -39,7 +39,7 @@ public function __construct()
 
     public function generate(): static
     {
-        Route::all()->each(function ($route) {
+        \Hyde\Facades\Route::all()->each(function ($route) {
             $this->addRoute($route);
         });
 

From 81120944e3080c579c63b69eaddc4519deec318b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:58:19 +0200
Subject: [PATCH 187/768] Revert "Router methods no longer need to be static"

This reverts commit e2b13579b620e1e7d58ae4d44cafb3e120724ccd.
---
 packages/framework/src/Routing/Router.php     | 26 +++++++++----------
 .../tests/Unit/Facades/RouteFacadeTest.php    |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
index 6f96506940d..34f1261db61 100644
--- a/packages/framework/src/Routing/Router.php
+++ b/packages/framework/src/Routing/Router.php
@@ -20,14 +20,14 @@ class Router
     /**
      * Get a route from the route index for the specified route key.
      *
-     * Alias for $this->getFromKey().
+     * Alias for static::getFromKey().
      *
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
-    public function get(string $routeKey): ?Route
+    public static function get(string $routeKey): ?Route
     {
-        return $this->getFromKey($routeKey);
+        return static::getFromKey($routeKey);
     }
 
     /**
@@ -38,9 +38,9 @@ public function get(string $routeKey): ?Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
-    public function getOrFail(string $routeKey): Route
+    public static function getOrFail(string $routeKey): Route
     {
-        return $this->getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
+        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
     /**
@@ -49,7 +49,7 @@ public function getOrFail(string $routeKey): Route
      * @param  string  $routeKey  Example: posts/foo, posts.foo
      * @return \Hyde\Routing\Route|null
      */
-    public function getFromKey(string $routeKey): ?Route
+    public static function getFromKey(string $routeKey): ?Route
     {
         return Hyde::routes()->get(str_replace('.', '/', $routeKey))
             ?? null;
@@ -61,7 +61,7 @@ public function getFromKey(string $routeKey): ?Route
      * @param  string  $sourceFilePath  Example: _posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
-    public function getFromSource(string $sourceFilePath): ?Route
+    public static function getFromSource(string $sourceFilePath): ?Route
     {
         return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
             return $route->getSourcePath() === $sourceFilePath;
@@ -74,7 +74,7 @@ public function getFromSource(string $sourceFilePath): ?Route
      * @param  \Hyde\Framework\Concerns\HydePage  $page
      * @return \Hyde\Routing\Route|null
      */
-    public function getFromModel(HydePage $page): ?Route
+    public static function getFromModel(HydePage $page): ?Route
     {
         return $page->getRoute();
     }
@@ -84,7 +84,7 @@ public function getFromModel(HydePage $page): ?Route
      *
      * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
      */
-    public function all(): RouteCollection
+    public static function all(): RouteCollection
     {
         return Hyde::routes();
     }
@@ -92,7 +92,7 @@ public function all(): RouteCollection
     /**
      * Get the current route for the page being rendered.
      */
-    public function current(): ?Route
+    public static function current(): ?Route
     {
         return Hyde::currentRoute() ?? null;
     }
@@ -100,9 +100,9 @@ public function current(): ?Route
     /**
      * Get the home route, usually the index page route.
      */
-    public function home(): ?Route
+    public static function home(): ?Route
     {
-        return $this->getFromKey('index') ?? null;
+        return static::getFromKey('index') ?? null;
     }
 
     /**
@@ -111,7 +111,7 @@ public function home(): ?Route
      * @param  string  $routeKey
      * @return bool
      */
-    public function exists(string $routeKey): bool
+    public static function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);
     }
diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index f0631d2385f..adcc965fe5d 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -20,6 +20,6 @@ public function test_route_facade_returns_the_router()
 
     public function test_route_facade_can_call_methods_on_the_router()
     {
-        $this->assertEquals((new Router())->all(), Route::all());
+        $this->assertEquals(Router::all(), Route::all());
     }
 }

From c31fe204e2ba9458d1509b2a32437bf5093a9c49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:59:23 +0200
Subject: [PATCH 188/768] Revert "Move tests for moved methods"

This reverts commit 8267bf09db86d7c4a721129fb57066ded2a2b4fb.
---
 .../framework/tests/Feature/RouteTest.php     |  95 ++++++++++++++++
 .../framework/tests/Feature/RouterTest.php    | 105 +-----------------
 2 files changed, 96 insertions(+), 104 deletions(-)

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index eae993aa421..80d70396a52 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -64,6 +64,84 @@ public function test_get_output_file_path_returns_page_output_path()
         $this->assertEquals($page->getOutputPath(), $route->getOutputPath());
     }
 
+    public function test_get_is_alias_for_get_from_key()
+    {
+        $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
+    }
+
+    public function test_get_or_fail_throws_exception_if_route_is_not_found()
+    {
+        $this->expectException(RouteNotFoundException::class);
+        Route::getOrFail('not-found');
+    }
+
+    public function test_get_from_key_returns_route_from_router_index()
+    {
+        $this->assertEquals(new Route(BladePage::parse('index')), Route::get('index'));
+        $this->assertInstanceOf(Route::class, Route::get('index'));
+    }
+
+    public function test_get_from_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::get('not-found'));
+    }
+
+    public function test_get_from_source_returns_route_from_router_index()
+    {
+        $this->assertEquals(new Route(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
+        $this->assertInstanceOf(Route::class, Route::getFromSource('_pages/index.blade.php'));
+    }
+
+    public function test_get_from_source_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
+    }
+
+    public function test_get_from_source_can_find_blade_pages()
+    {
+        Hyde::touch(('_pages/foo.blade.php'));
+        $this->assertEquals(new Route(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
+        unlink(Hyde::path('_pages/foo.blade.php'));
+    }
+
+    public function test_get_from_source_can_find_markdown_pages()
+    {
+        Hyde::touch(('_pages/foo.md'));
+        $this->assertEquals(new Route(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
+        unlink(Hyde::path('_pages/foo.md'));
+    }
+
+    public function test_get_from_source_can_find_markdown_posts()
+    {
+        Hyde::touch(('_posts/foo.md'));
+        $this->assertEquals(new Route(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
+        unlink(Hyde::path('_posts/foo.md'));
+    }
+
+    public function test_get_from_source_can_find_documentation_pages()
+    {
+        Hyde::touch(('_docs/foo.md'));
+        $this->assertEquals(new Route(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
+        unlink(Hyde::path('_docs/foo.md'));
+    }
+
+    public function test_get_from_model_returns_the_models_route()
+    {
+        $page = new BladePage('index');
+        $this->assertEquals(new Route($page), Route::getFromModel($page));
+    }
+
+    public function test_get_supports_dot_notation()
+    {
+        $this->file('_posts/foo.md');
+        $this->assertSame(Route::get('posts/foo'), Route::get('posts.foo'));
+    }
+
+    public function test_route_facade_all_method_returns_all_routes()
+    {
+        $this->assertEquals(Hyde::routes(), Route::all());
+    }
+
     public function test_get_link_returns_correct_path_for_root_pages()
     {
         $route = new Route(new MarkdownPage(identifier: 'foo'));
@@ -127,6 +205,23 @@ public function test_get_qualified_url_throws_exception_when_a_base_url_is_not_s
         $route->getQualifiedUrl();
     }
 
+    public function test_current_returns_current_route()
+    {
+        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        view()->share('currentRoute', $route);
+        $this->assertEquals($route, Route::current());
+    }
+
+    public function test_current_returns_null_if_route_is_not_found()
+    {
+        $this->assertNull(Route::current());
+    }
+
+    public function test_home_helper_returns_index_route()
+    {
+        $this->assertEquals(Route::get('index'), Route::home());
+    }
+
     public function test_to_array_method()
     {
         $this->assertEquals([
diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
index ced41c06495..744544c4cbf 100644
--- a/packages/framework/tests/Feature/RouterTest.php
+++ b/packages/framework/tests/Feature/RouterTest.php
@@ -4,17 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Facades\Route;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Hyde;
-use Hyde\Pages\BladePage;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route as RouteModel;
 use Hyde\Testing\TestCase;
-use function unlink;
-use function view;
 
 /**
  * @covers \Hyde\Routing\Router
@@ -23,98 +13,5 @@
  */
 class RouterTest extends TestCase
 {
-    public function test_get_is_alias_for_get_from_key()
-    {
-        $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
-    }
-
-    public function test_get_or_fail_throws_exception_if_route_is_not_found()
-    {
-        $this->expectException(RouteNotFoundException::class);
-        Route::getOrFail('not-found');
-    }
-
-    public function test_get_from_key_returns_route_from_router_index()
-    {
-        $this->assertEquals(new RouteModel(BladePage::parse('index')), Route::get('index'));
-        $this->assertInstanceOf(RouteModel::class, Route::get('index'));
-    }
-
-    public function test_get_from_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::get('not-found'));
-    }
-
-    public function test_get_from_source_returns_route_from_router_index()
-    {
-        $this->assertEquals(new RouteModel(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
-        $this->assertInstanceOf(RouteModel::class, Route::getFromSource('_pages/index.blade.php'));
-    }
-
-    public function test_get_from_source_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_blade_pages()
-    {
-        Hyde::touch(('_pages/foo.blade.php'));
-        $this->assertEquals(new RouteModel(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
-        unlink(Hyde::path('_pages/foo.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_markdown_pages()
-    {
-        Hyde::touch(('_pages/foo.md'));
-        $this->assertEquals(new RouteModel(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
-        unlink(Hyde::path('_pages/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_markdown_posts()
-    {
-        Hyde::touch(('_posts/foo.md'));
-        $this->assertEquals(new RouteModel(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
-        unlink(Hyde::path('_posts/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_documentation_pages()
-    {
-        Hyde::touch(('_docs/foo.md'));
-        $this->assertEquals(new RouteModel(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
-        unlink(Hyde::path('_docs/foo.md'));
-    }
-
-    public function test_get_from_model_returns_the_models_route()
-    {
-        $page = new BladePage('index');
-        $this->assertEquals(new RouteModel($page), Route::getFromModel($page));
-    }
-
-    public function test_get_supports_dot_notation()
-    {
-        $this->file('_posts/foo.md');
-        $this->assertSame(Route::get('posts/foo'), Route::get('posts.foo'));
-    }
-
-    public function test_route_facade_all_method_returns_all_routes()
-    {
-        $this->assertEquals(Hyde::routes(), Route::all());
-    }
-
-    public function test_current_returns_current_route()
-    {
-        $route = new RouteModel(new MarkdownPage(identifier: 'foo'));
-        view()->share('currentRoute', $route);
-        $this->assertEquals($route, Route::current());
-    }
-
-    public function test_current_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::current());
-    }
-
-    public function test_home_helper_returns_index_route()
-    {
-        $this->assertEquals(Route::get('index'), Route::home());
-    }
+    //
 }

From 648d8d2da1e07ef9e25935532c9b20ce0272142d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 18:59:40 +0200
Subject: [PATCH 189/768] Revert "Create RouterTest.php"

This reverts commit 4d8e37c15062e360109134640efac60cb80064c9.
---
 packages/framework/tests/Feature/RouterTest.php | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/RouterTest.php

diff --git a/packages/framework/tests/Feature/RouterTest.php b/packages/framework/tests/Feature/RouterTest.php
deleted file mode 100644
index 744544c4cbf..00000000000
--- a/packages/framework/tests/Feature/RouterTest.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Testing\TestCase;
-
-/**
- * @covers \Hyde\Routing\Router
- *
- * @see \Hyde\Framework\Testing\Unit\Facades\RouteFacadeTest
- */
-class RouterTest extends TestCase
-{
-    //
-}

From 1d498d110e07a8deb8712d22971ca39053772931 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:00:38 +0200
Subject: [PATCH 190/768] Revert "Create Router.php"

This reverts commit e4346bdfb26904080ba42d02dec75aa612888998.
---
 packages/framework/src/Routing/Router.php | 118 ----------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 packages/framework/src/Routing/Router.php

diff --git a/packages/framework/src/Routing/Router.php b/packages/framework/src/Routing/Router.php
deleted file mode 100644
index 34f1261db61..00000000000
--- a/packages/framework/src/Routing/Router.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Routing;
-
-use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Concerns\HydePage;
-use Hyde\Framework\Exceptions\RouteNotFoundException;
-use Hyde\Hyde;
-use function str_replace;
-
-/**
- * Provides helper methods for accessing the Hyde pseudo-router.
- *
- * @see \Hyde\Facades\Route for the facade that provides access to this class.
- */
-class Router
-{
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * Alias for static::getFromKey().
-     *
-     * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function get(string $routeKey): ?Route
-    {
-        return static::getFromKey($routeKey);
-    }
-
-    /**
-     * Get a route from the route index for the specified route key or throw an exception.
-     *
-     * @param  string  $routeKey
-     * @return \Hyde\Routing\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
-     */
-    public static function getOrFail(string $routeKey): Route
-    {
-        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
-    }
-
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * @param  string  $routeKey  Example: posts/foo, posts.foo
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromKey(string $routeKey): ?Route
-    {
-        return Hyde::routes()->get(str_replace('.', '/', $routeKey))
-            ?? null;
-    }
-
-    /**
-     * Get a route from the route index for the specified source file path.
-     *
-     * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromSource(string $sourceFilePath): ?Route
-    {
-        return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
-            return $route->getSourcePath() === $sourceFilePath;
-        }) ?? null;
-    }
-
-    /**
-     * Get a route from the route index for the supplied page model.
-     *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromModel(HydePage $page): ?Route
-    {
-        return $page->getRoute();
-    }
-
-    /**
-     * Get all routes from the route index.
-     *
-     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
-     */
-    public static function all(): RouteCollection
-    {
-        return Hyde::routes();
-    }
-
-    /**
-     * Get the current route for the page being rendered.
-     */
-    public static function current(): ?Route
-    {
-        return Hyde::currentRoute() ?? null;
-    }
-
-    /**
-     * Get the home route, usually the index page route.
-     */
-    public static function home(): ?Route
-    {
-        return static::getFromKey('index') ?? null;
-    }
-
-    /**
-     * Determine if the supplied route key exists in the route index.
-     *
-     * @param  string  $routeKey
-     * @return bool
-     */
-    public static function exists(string $routeKey): bool
-    {
-        return Hyde::routes()->has($routeKey);
-    }
-}

From 7c8a9a98ddce918999347e4aa1cfc407d8c8750b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:02:36 +0200
Subject: [PATCH 191/768] Import namespaces

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

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 80d70396a52..c24c520d4ca 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -5,8 +5,12 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Exceptions\BaseUrlNotSetException;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
+use Hyde\Pages\BladePage;
+use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 

From 734fdcd2c56160436ac272aa56907d710ece7375 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:02:48 +0200
Subject: [PATCH 192/768] Add back route facade methods

---
 packages/framework/src/Routing/Route.php | 93 ++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 4037fbcf9d6..ad70be57b0d 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Routing;
 
+use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
+use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
@@ -165,4 +167,95 @@ public function is(Route|string $route): bool
 
         return $this->getRouteKey() === $route;
     }
+
+    /**
+     * Get a route from the route index for the specified route key.
+     *
+     * Alias for static::getFromKey().
+     *
+     * @param  string  $routeKey  Example: posts/foo.md
+     * @return \Hyde\Routing\Route|null
+     */
+    public static function get(string $routeKey): ?Route
+    {
+        return static::getFromKey($routeKey);
+    }
+    /**
+     * Get a route from the route index for the specified route key or throw an exception.
+     *
+     * @param  string  $routeKey
+     * @return \Hyde\Routing\Route
+     *
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
+    public static function getOrFail(string $routeKey): Route
+    {
+        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
+    }
+    /**
+     * Get a route from the route index for the specified route key.
+     *
+     * @param  string  $routeKey  Example: posts/foo, posts.foo
+     * @return \Hyde\Routing\Route|null
+     */
+    public static function getFromKey(string $routeKey): ?Route
+    {
+        return Hyde::routes()->get(str_replace('.', '/', $routeKey))
+            ?? null;
+    }
+    /**
+     * Get a route from the route index for the specified source file path.
+     *
+     * @param  string  $sourceFilePath  Example: _posts/foo.md
+     * @return \Hyde\Routing\Route|null
+     */
+    public static function getFromSource(string $sourceFilePath): ?Route
+    {
+        return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
+            return $route->getSourcePath() === $sourceFilePath;
+        }) ?? null;
+    }
+    /**
+     * Get a route from the route index for the supplied page model.
+     *
+     * @param  \Hyde\Framework\Concerns\HydePage  $page
+     * @return \Hyde\Routing\Route|null
+     */
+    public static function getFromModel(HydePage $page): ?Route
+    {
+        return $page->getRoute();
+    }
+    /**
+     * Get all routes from the route index.
+     *
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
+     */
+    public static function all(): RouteCollection
+    {
+        return Hyde::routes();
+    }
+    /**
+     * Get the current route for the page being rendered.
+     */
+    public static function current(): ?Route
+    {
+        return Hyde::currentRoute() ?? null;
+    }
+    /**
+     * Get the home route, usually the index page route.
+     */
+    public static function home(): ?Route
+    {
+        return static::getFromKey('index') ?? null;
+    }
+    /**
+     * Determine if the supplied route key exists in the route index.
+     *
+     * @param  string  $routeKey
+     * @return bool
+     */
+    public static function exists(string $routeKey): bool
+    {
+        return Hyde::routes()->has($routeKey);
+    }
 }

From ddf456af0315f8cd8ada28d42682b20fc0bc821d Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 17:02:58 +0000
Subject: [PATCH 193/768] Apply fixes from StyleCI

---
 packages/framework/src/Routing/Route.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index ad70be57b0d..398d8cf5ec8 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -180,6 +180,7 @@ public static function get(string $routeKey): ?Route
     {
         return static::getFromKey($routeKey);
     }
+
     /**
      * Get a route from the route index for the specified route key or throw an exception.
      *
@@ -192,6 +193,7 @@ public static function getOrFail(string $routeKey): Route
     {
         return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
+
     /**
      * Get a route from the route index for the specified route key.
      *
@@ -203,6 +205,7 @@ public static function getFromKey(string $routeKey): ?Route
         return Hyde::routes()->get(str_replace('.', '/', $routeKey))
             ?? null;
     }
+
     /**
      * Get a route from the route index for the specified source file path.
      *
@@ -215,6 +218,7 @@ public static function getFromSource(string $sourceFilePath): ?Route
             return $route->getSourcePath() === $sourceFilePath;
         }) ?? null;
     }
+
     /**
      * Get a route from the route index for the supplied page model.
      *
@@ -225,6 +229,7 @@ public static function getFromModel(HydePage $page): ?Route
     {
         return $page->getRoute();
     }
+
     /**
      * Get all routes from the route index.
      *
@@ -234,6 +239,7 @@ public static function all(): RouteCollection
     {
         return Hyde::routes();
     }
+
     /**
      * Get the current route for the page being rendered.
      */
@@ -241,6 +247,7 @@ public static function current(): ?Route
     {
         return Hyde::currentRoute() ?? null;
     }
+
     /**
      * Get the home route, usually the index page route.
      */
@@ -248,6 +255,7 @@ public static function home(): ?Route
     {
         return static::getFromKey('index') ?? null;
     }
+
     /**
      * Determine if the supplied route key exists in the route index.
      *

From c148ef90e4dcdae96f3c95098f4a6b50e88cd16e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:09:32 +0200
Subject: [PATCH 194/768] Proxy facade methods directly

---
 packages/framework/src/Facades/Route.php      | 61 +++++++++++++------
 .../tests/Unit/Facades/RouteFacadeTest.php    | 10 +--
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 86d60af87c0..b310e747c78 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -6,28 +6,55 @@
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Routing\Router;
-use Illuminate\Support\Facades\Facade;
+use Hyde\Routing\Route as RouteModel;
 
 /**
  * Provides an easy way to access the Hyde pseudo-router.
- *
- * @see \Hyde\Routing\Router
- *
- * @method static \Hyde\Routing\Route|null home()
- * @method static \Hyde\Routing\Route|null current()
- * @method static \Hyde\Routing\Route|null get(string $routeKey)
- * @method static \Hyde\Routing\Route|null getFromKey(string $routeKey)
- * @method static \Hyde\Routing\Route|null getFromSource(string $sourceFilePath)
- * @method static \Hyde\Routing\Route|null getFromModel(HydePage $page)
- * @method static \Hyde\Routing\Route getOrFail(string $routeKey)
- * @method static bool exists(string $routeKey)
- * @method static RouteCollection all()
  */
-class Route extends Facade
+class Route
 {
-    protected static function getFacadeAccessor(): string
+    public static function get(string $routeKey): ?RouteModel
     {
-        return Router::class;
+        return RouteModel::get($routeKey);
+    }
+
+    public static function getOrFail(string $routeKey): RouteModel
+    {
+        return RouteModel::getOrFail($routeKey);
+    }
+
+    public static function getFromKey(string $routeKey): ?RouteModel
+    {
+        return RouteModel::getFromKey($routeKey);
+    }
+
+    public static function getFromSource(string $sourceFilePath): ?RouteModel
+    {
+        return RouteModel::getFromSource($sourceFilePath);
+    }
+
+    public static function getFromModel(HydePage $page): ?RouteModel
+    {
+        return RouteModel::getFromModel($page);
+    }
+
+    public static function all(): RouteCollection
+    {
+        return RouteModel::all();
+    }
+
+    public static function current(): ?RouteModel
+    {
+        return RouteModel::current();
+    }
+
+    public static function home(): ?RouteModel
+    {
+        return RouteModel::home();
+    }
+
+    public static function exists(string $routeKey): bool
+    {
+        return RouteModel::exists($routeKey);
     }
 }
diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index adcc965fe5d..f3ad783a869 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Route;
-use Hyde\Routing\Router;
 use Hyde\Testing\TestCase;
 
 /**
@@ -13,13 +12,8 @@
  */
 class RouteFacadeTest extends TestCase
 {
-    public function test_route_facade_returns_the_router()
+    public function test_route_facade_can_call_methods_on_the_route_model()
     {
-        $this->assertInstanceOf(Router::class, Route::getFacadeRoot());
-    }
-
-    public function test_route_facade_can_call_methods_on_the_router()
-    {
-        $this->assertEquals(Router::all(), Route::all());
+        $this->assertEquals(Route::all(), \Hyde\Routing\Route::all());
     }
 }

From 036f1611317c588cf49dacd89af9fbe310578e66 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:11:30 +0200
Subject: [PATCH 195/768] Revert "Use the Route facade"

This reverts commit 7f7f0d8f0b5ca624a0e50b865cfce65d5a974912.
---
 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 16165123e3b..8d977ee1545 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Pages;
 
-use Hyde\Facades\Route;
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Routing\Route;
 
 /**
  * Page class for documentation pages.

From 19492f19299832484c9361448351008a3a417978 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:12:24 +0200
Subject: [PATCH 196/768] Simplify method call

---
 packages/framework/src/Pages/DocumentationPage.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 8d977ee1545..e74a2741ca6 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -41,9 +41,7 @@ public function getOnlineSourcePath(): string|false
 
     public static function home(): ?Route
     {
-        return Route::exists(static::$outputDirectory.'/index')
-            ? Route::get(static::$outputDirectory.'/index')
-            : null;
+        return Route::get(static::$outputDirectory.'/index');
     }
 
     public static function hasTableOfContents(): bool

From dcc30ba76d4e7f0f2661925dfc11461c08a3a912 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:16:07 +0200
Subject: [PATCH 197/768] Extract method

---
 packages/framework/src/Routing/Route.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 398d8cf5ec8..ad54dc022a8 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -12,6 +12,7 @@
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
+use function str_replace;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages
@@ -202,7 +203,7 @@ public static function getOrFail(string $routeKey): Route
      */
     public static function getFromKey(string $routeKey): ?Route
     {
-        return Hyde::routes()->get(str_replace('.', '/', $routeKey))
+        return Hyde::routes()->get(self::normalizeRouteKey($routeKey))
             ?? null;
     }
 
@@ -266,4 +267,15 @@ public static function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);
     }
+
+    /**
+     * Format a route key so both dot and slash notations are supported.
+     *
+     * @param string $routeKey
+     * @return string
+     */
+    protected static function normalizeRouteKey(string $routeKey): string
+    {
+        return str_replace('.', '/', $routeKey);
+    }
 }

From 20a0261e140eab53a7a00e84c2ade58aba0bf093 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:18:18 +0200
Subject: [PATCH 198/768] Remove Route::getFromKey(), use Route::get() instead

---
 packages/framework/src/Facades/Route.php      |  5 -----
 packages/framework/src/Routing/Route.php      | 21 ++++---------------
 .../framework/tests/Feature/RouteTest.php     |  2 +-
 .../src/Routing/PageRouter.php                |  4 +---
 4 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index b310e747c78..a33755e801f 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -23,11 +23,6 @@ public static function getOrFail(string $routeKey): RouteModel
         return RouteModel::getOrFail($routeKey);
     }
 
-    public static function getFromKey(string $routeKey): ?RouteModel
-    {
-        return RouteModel::getFromKey($routeKey);
-    }
-
     public static function getFromSource(string $sourceFilePath): ?RouteModel
     {
         return RouteModel::getFromSource($sourceFilePath);
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index ad54dc022a8..c2d375a0066 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -172,14 +172,13 @@ public function is(Route|string $route): bool
     /**
      * Get a route from the route index for the specified route key.
      *
-     * Alias for static::getFromKey().
-     *
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
     public static function get(string $routeKey): ?Route
     {
-        return static::getFromKey($routeKey);
+        return Hyde::routes()->get(self::normalizeRouteKey($routeKey))
+            ?? null;
     }
 
     /**
@@ -192,19 +191,7 @@ public static function get(string $routeKey): ?Route
      */
     public static function getOrFail(string $routeKey): Route
     {
-        return static::getFromKey($routeKey) ?? throw new RouteNotFoundException($routeKey);
-    }
-
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * @param  string  $routeKey  Example: posts/foo, posts.foo
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromKey(string $routeKey): ?Route
-    {
-        return Hyde::routes()->get(self::normalizeRouteKey($routeKey))
-            ?? null;
+        return Route::get($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
     /**
@@ -254,7 +241,7 @@ public static function current(): ?Route
      */
     public static function home(): ?Route
     {
-        return static::getFromKey('index') ?? null;
+        return Route::get('index') ?? null;
     }
 
     /**
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index c24c520d4ca..48303f5404c 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -70,7 +70,7 @@ public function test_get_output_file_path_returns_page_output_path()
 
     public function test_get_is_alias_for_get_from_key()
     {
-        $this->assertEquals(Route::getFromKey('index'), Route::get('index'));
+        $this->assertEquals(Route::get('index'), Route::get('index'));
     }
 
     public function test_get_or_fail_throws_exception_if_route_is_not_found()
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index baa7bd09e70..b146d3618fc 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -28,9 +28,7 @@ public function __construct(Request $request)
 
     protected function handlePageRequest(): Response
     {
-        $html = $this->getHtml(Route::getFromKey(
-            $this->normalizePath($this->request->path)
-        )->getSourceModel());
+        $html = $this->getHtml(Route::get($this->normalizePath($this->request->path))->getSourceModel());
 
         return (new Response(200, 'OK', [
             'body' => $html,

From 78f8e8f521b908a8924c048c69a46ee0ff9b0e49 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 17:18:30 +0000
Subject: [PATCH 199/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index c2d375a0066..5c50782cd7b 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -11,8 +11,8 @@
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
-use Stringable;
 use function str_replace;
+use Stringable;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages
@@ -258,7 +258,7 @@ public static function exists(string $routeKey): bool
     /**
      * Format a route key so both dot and slash notations are supported.
      *
-     * @param string $routeKey
+     * @param  string  $routeKey
      * @return string
      */
     protected static function normalizeRouteKey(string $routeKey): string

From c756263f1fa41abe04a3d96edda59bd2a78bc607 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:20:27 +0200
Subject: [PATCH 200/768] Remove redundant null coalesce to null

---
 packages/framework/src/Routing/Route.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 5c50782cd7b..b6572b4d3fb 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -177,8 +177,7 @@ public function is(Route|string $route): bool
      */
     public static function get(string $routeKey): ?Route
     {
-        return Hyde::routes()->get(self::normalizeRouteKey($routeKey))
-            ?? null;
+        return Hyde::routes()->get(self::normalizeRouteKey($routeKey));
     }
 
     /**
@@ -204,7 +203,7 @@ public static function getFromSource(string $sourceFilePath): ?Route
     {
         return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
             return $route->getSourcePath() === $sourceFilePath;
-        }) ?? null;
+        });
     }
 
     /**
@@ -233,7 +232,7 @@ public static function all(): RouteCollection
      */
     public static function current(): ?Route
     {
-        return Hyde::currentRoute() ?? null;
+        return Hyde::currentRoute();
     }
 
     /**
@@ -241,7 +240,7 @@ public static function current(): ?Route
      */
     public static function home(): ?Route
     {
-        return Route::get('index') ?? null;
+        return Route::get('index');
     }
 
     /**

From 62a64983967bb674a1ab8ad69271a1599f2f8ad9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:23:21 +0200
Subject: [PATCH 201/768] Remove unused getFromSource to reduce complexity

---
 packages/framework/src/Facades/Route.php      |  5 ---
 packages/framework/src/Routing/Route.php      | 13 -------
 .../framework/tests/Feature/RouteTest.php     | 39 -------------------
 3 files changed, 57 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index a33755e801f..905640b5873 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -23,11 +23,6 @@ public static function getOrFail(string $routeKey): RouteModel
         return RouteModel::getOrFail($routeKey);
     }
 
-    public static function getFromSource(string $sourceFilePath): ?RouteModel
-    {
-        return RouteModel::getFromSource($sourceFilePath);
-    }
-
     public static function getFromModel(HydePage $page): ?RouteModel
     {
         return RouteModel::getFromModel($page);
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index b6572b4d3fb..a7fbf35d886 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -193,19 +193,6 @@ public static function getOrFail(string $routeKey): Route
         return Route::get($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
-    /**
-     * Get a route from the route index for the specified source file path.
-     *
-     * @param  string  $sourceFilePath  Example: _posts/foo.md
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromSource(string $sourceFilePath): ?Route
-    {
-        return Hyde::routes()->first(function (Route $route) use ($sourceFilePath) {
-            return $route->getSourcePath() === $sourceFilePath;
-        });
-    }
-
     /**
      * Get a route from the route index for the supplied page model.
      *
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 48303f5404c..7fe986c301d 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -90,45 +90,6 @@ public function test_get_from_returns_null_if_route_is_not_found()
         $this->assertNull(Route::get('not-found'));
     }
 
-    public function test_get_from_source_returns_route_from_router_index()
-    {
-        $this->assertEquals(new Route(BladePage::parse('index')), Route::getFromSource('_pages/index.blade.php'));
-        $this->assertInstanceOf(Route::class, Route::getFromSource('_pages/index.blade.php'));
-    }
-
-    public function test_get_from_source_returns_null_if_route_is_not_found()
-    {
-        $this->assertNull(Route::getFromSource('_pages/not-found.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_blade_pages()
-    {
-        Hyde::touch(('_pages/foo.blade.php'));
-        $this->assertEquals(new Route(BladePage::parse('foo')), Route::getFromSource('_pages/foo.blade.php'));
-        unlink(Hyde::path('_pages/foo.blade.php'));
-    }
-
-    public function test_get_from_source_can_find_markdown_pages()
-    {
-        Hyde::touch(('_pages/foo.md'));
-        $this->assertEquals(new Route(MarkdownPage::parse('foo')), Route::getFromSource('_pages/foo.md'));
-        unlink(Hyde::path('_pages/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_markdown_posts()
-    {
-        Hyde::touch(('_posts/foo.md'));
-        $this->assertEquals(new Route(MarkdownPost::parse('foo')), Route::getFromSource('_posts/foo.md'));
-        unlink(Hyde::path('_posts/foo.md'));
-    }
-
-    public function test_get_from_source_can_find_documentation_pages()
-    {
-        Hyde::touch(('_docs/foo.md'));
-        $this->assertEquals(new Route(DocumentationPage::parse('foo')), Route::getFromSource('_docs/foo.md'));
-        unlink(Hyde::path('_docs/foo.md'));
-    }
-
     public function test_get_from_model_returns_the_models_route()
     {
         $page = new BladePage('index');

From bb25d3f270abd9a78d7f9408545f5ab272214430 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 17:23:30 +0000
Subject: [PATCH 202/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 7fe986c301d..41694faaa3e 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -8,9 +8,7 @@
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
-use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
 use Hyde\Routing\Route;
 use Hyde\Testing\TestCase;
 

From 94e7ffea4d19d942f8e70013bf21534c12d8062c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:28:09 +0200
Subject: [PATCH 203/768] Remove unused and rather useless method

If you have the page, you also have the route
---
 packages/framework/src/Facades/Route.php       |  5 -----
 packages/framework/src/Routing/Route.php       | 11 -----------
 packages/framework/tests/Feature/RouteTest.php |  6 ------
 3 files changed, 22 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 905640b5873..81e2014eb2a 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -23,11 +23,6 @@ public static function getOrFail(string $routeKey): RouteModel
         return RouteModel::getOrFail($routeKey);
     }
 
-    public static function getFromModel(HydePage $page): ?RouteModel
-    {
-        return RouteModel::getFromModel($page);
-    }
-
     public static function all(): RouteCollection
     {
         return RouteModel::all();
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index a7fbf35d886..796e9387de1 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -193,17 +193,6 @@ public static function getOrFail(string $routeKey): Route
         return Route::get($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
-    /**
-     * Get a route from the route index for the supplied page model.
-     *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     * @return \Hyde\Routing\Route|null
-     */
-    public static function getFromModel(HydePage $page): ?Route
-    {
-        return $page->getRoute();
-    }
-
     /**
      * Get all routes from the route index.
      *
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 41694faaa3e..173ba90245e 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -88,12 +88,6 @@ public function test_get_from_returns_null_if_route_is_not_found()
         $this->assertNull(Route::get('not-found'));
     }
 
-    public function test_get_from_model_returns_the_models_route()
-    {
-        $page = new BladePage('index');
-        $this->assertEquals(new Route($page), Route::getFromModel($page));
-    }
-
     public function test_get_supports_dot_notation()
     {
         $this->file('_posts/foo.md');

From 8637f8720408f78f2cbd242215b819238e30f93e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 17:28:26 +0000
Subject: [PATCH 204/768] Apply fixes from StyleCI

---
 packages/framework/src/Facades/Route.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 81e2014eb2a..2591044b0e9 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -5,7 +5,6 @@
 namespace Hyde\Facades;
 
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Routing\Route as RouteModel;
 
 /**

From b3e0fc6f0792c39d26a82a8d4b4093a5c35c2fed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:31:39 +0200
Subject: [PATCH 205/768] Remove redundant argument names in test

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

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 173ba90245e..e9869bb09ab 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -101,21 +101,21 @@ public function test_route_facade_all_method_returns_all_routes()
 
     public function test_get_link_returns_correct_path_for_root_pages()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals(Hyde::relativeLink($route->getOutputPath()), $route->getLink());
         $this->assertEquals('foo.html', $route->getLink());
     }
 
     public function test_get_link_returns_correct_path_for_nested_pages()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo/bar'));
+        $route = new Route(new MarkdownPage('foo/bar'));
         $this->assertEquals(Hyde::relativeLink($route->getOutputPath()), $route->getLink());
         $this->assertEquals('foo/bar.html', $route->getLink());
     }
 
     public function test_get_link_returns_correct_path_for_nested_current_page()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         view()->share('currentPage', 'foo/bar');
         $this->assertEquals(Hyde::relativeLink($route->getOutputPath()), $route->getLink());
         $this->assertEquals('../foo.html', $route->getLink());
@@ -124,33 +124,33 @@ public function test_get_link_returns_correct_path_for_nested_current_page()
     public function test_get_link_returns_pretty_url_if_enabled()
     {
         config(['site.pretty_urls' => true]);
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals(Hyde::relativeLink($route->getOutputPath()), $route->getLink());
         $this->assertEquals('foo', $route->getLink());
     }
 
     public function test_to_string_is_alias_for_get_link()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals($route->getLink(), (string) $route);
     }
 
     public function test_get_qualified_url_returns_hyde_url_for_output_file_path()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals(Hyde::url('foo.html'), $route->getQualifiedUrl());
     }
 
     public function test_get_qualified_url_returns_hyde_url_for_nested_pages()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo/bar'));
+        $route = new Route(new MarkdownPage('foo/bar'));
         $this->assertEquals(Hyde::url('foo/bar.html'), $route->getQualifiedUrl());
     }
 
     public function test_get_qualified_url_returns_pretty_url_if_enabled()
     {
         config(['site.pretty_urls' => true]);
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals(Hyde::url('foo'), $route->getQualifiedUrl());
     }
 
@@ -158,13 +158,13 @@ public function test_get_qualified_url_throws_exception_when_a_base_url_is_not_s
     {
         config(['site.url' => null]);
         $this->expectException(BaseUrlNotSetException::class);
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         $route->getQualifiedUrl();
     }
 
     public function test_current_returns_current_route()
     {
-        $route = new Route(new MarkdownPage(identifier: 'foo'));
+        $route = new Route(new MarkdownPage('foo'));
         view()->share('currentRoute', $route);
         $this->assertEquals($route, Route::current());
     }

From 481e7ab9eb487d53d5b5973113cf7c87431d3406 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:33:20 +0200
Subject: [PATCH 206/768] Remove misplaced 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 cd3381cdde9..57093bb7542 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -23,11 +23,6 @@ public function test_constructor()
         $this->assertInstanceOf(NavigationMenu::class, $menu);
     }
 
-    public function test_home_route()
-    {
-        $this->assertEquals('index.html', Route::home());
-    }
-
     public function test_generate_method_creates_collection_of_nav_items()
     {
         $menu = new NavigationMenu();

From 866bedb6db7b62db9d59c5bd7d31ba28788fdc1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:36:59 +0200
Subject: [PATCH 207/768] Remove redundant PHPDocs

---
 packages/framework/src/Routing/Route.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 796e9387de1..59f0a6d12c3 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -28,20 +28,9 @@ class Route implements Stringable, JsonSerializable, Arrayable
 {
     use JsonSerializesArrayable;
 
-    /**
-     * The source model for the route.
-     *
-     * @var \Hyde\Framework\Concerns\HydePage
-     */
     protected HydePage $sourceModel;
 
-    /**
-     * The unique route key for the route.
-     *
-     * @var string The route key. Generally <output-directory/slug>.
-     */
     protected string $routeKey;
-
     protected string $sourcePath;
     protected string $outputPath;
     protected string $uriPath;

From 998971502234b5c16ce59309aa0dbf430cb10424 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:37:12 +0200
Subject: [PATCH 208/768] Make properties public

---
 packages/framework/src/Routing/Route.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 59f0a6d12c3..3b7337e4278 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -30,10 +30,10 @@ class Route implements Stringable, JsonSerializable, Arrayable
 
     protected HydePage $sourceModel;
 
-    protected string $routeKey;
-    protected string $sourcePath;
-    protected string $outputPath;
-    protected string $uriPath;
+    public string $routeKey;
+    public string $sourcePath;
+    public string $outputPath;
+    public string $uriPath;
 
     /**
      * Construct a new Route instance for the given page model.

From 48d4dff3f2c20098e44ace7406bb2834431ac200 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:39:53 +0200
Subject: [PATCH 209/768] Rename Route property and accessors 'sourceModel' to
 'Page'

---
 .../framework/src/Foundation/RouteCollection.php     |  2 +-
 .../Features/Navigation/DocumentationSidebar.php     |  4 ++--
 .../src/Framework/Features/Navigation/NavItem.php    | 10 +++++-----
 .../Framework/Features/Navigation/NavigationMenu.php |  2 +-
 .../src/Framework/Services/BuildService.php          |  2 +-
 .../src/Framework/Services/SitemapService.php        |  2 +-
 packages/framework/src/Routing/Route.php             | 12 ++++++------
 packages/framework/tests/Feature/RouteTest.php       |  4 ++--
 packages/framework/tests/Unit/NavItemTest.php        |  6 +++---
 .../realtime-compiler/src/Routing/PageRouter.php     |  2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index 754a0fd5616..e0d37ffe2ef 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -36,7 +36,7 @@ final class RouteCollection extends BaseFoundationCollection
     public function getRoutes(?string $pageClass = null): self
     {
         return ! $pageClass ? $this : $this->filter(function (Route $route) use ($pageClass) {
-            return $route->getSourceModel() instanceof $pageClass;
+            return $route->getPage() instanceof $pageClass;
         });
     }
 
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index 46c0922c77f..a6d7f281a77 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -20,7 +20,7 @@ public function generate(): static
     {
         Hyde::routes()->getRoutes(DocumentationPage::class)->each(function (Route $route) {
             $this->items->push(tap(NavItem::fromRoute($route)->setPriority($this->getPriorityForRoute($route)), function (NavItem $item) {
-                $item->label = $item->route->getSourceModel()->get('navigation.label');
+                $item->label = $item->route->getPage()->get('navigation.label');
             }));
         });
 
@@ -48,7 +48,7 @@ public function getItemsInGroup(?string $group): Collection
 
     protected function getPriorityForRoute(Route $route): int
     {
-        return $route->getSourceModel()->get('navigation.priority');
+        return $route->getPage()->get('navigation.priority');
     }
 
     protected function filterDocumentationPage(NavItem $item): bool
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index e7b73fb43f9..5ccf866b947 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -53,9 +53,9 @@ public static function fromRoute(Route $route): static
     {
         return new self(
             $route,
-            $route->getSourceModel()->navigationMenuLabel(),
-            $route->getSourceModel()->navigationMenuPriority(),
-            ! $route->getSourceModel()->showInNavigation()
+            $route->getPage()->navigationMenuLabel(),
+            $route->getPage()->navigationMenuPriority(),
+            ! $route->getPage()->showInNavigation()
         );
     }
 
@@ -97,7 +97,7 @@ public function __toString(): string
     public function isCurrent(?HydePage $current = null): bool
     {
         if ($current === null) {
-            $current = Hyde::currentRoute()->getSourceModel();
+            $current = Hyde::currentRoute()->getPage();
         }
 
         if (! isset($this->route)) {
@@ -124,7 +124,7 @@ public function setPriority(int $priority): static
 
     public function getGroup(): ?string
     {
-        return $this->normalizeGroupKey($this->route->getSourceModel()->get('navigation.group'));
+        return $this->normalizeGroupKey($this->route->getPage()->get('navigation.group'));
     }
 
     protected function normalizeGroupKey(?string $group): ?string
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index 4dfd8e4a0bc..c05d0230218 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -77,7 +77,7 @@ protected function filterDuplicateItems(): Collection
     protected function filterDocumentationPage(NavItem $item): bool
     {
         return isset($item->route)
-            && $item->route->getSourceModel() instanceof DocumentationPage
+            && $item->route->getPage() instanceof DocumentationPage
             && $item->route->getRouteKey() !== 'docs/index';
     }
 }
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index b235b0ce434..6b636463c1e 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -100,7 +100,7 @@ protected function compilePagesForClass(string $pageClass): void
     protected function compileRoute(): Closure
     {
         return function (Route $route) {
-            return (new StaticPageBuilder($route->getSourceModel()))->__invoke();
+            return (new StaticPageBuilder($route->getPage()))->__invoke();
         };
     }
 
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 280233b2e10..d5d79986d01 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -60,7 +60,7 @@ public function addRoute(Route $route): void
         $urlItem->addChild('lastmod', htmlentities($this->getLastModDate($route->getSourcePath())));
         $urlItem->addChild('changefreq', 'daily');
         if (config('hyde.sitemap.dynamic_priority', true)) {
-            $urlItem->addChild('priority', $this->getPriority($route->getPageType(), $route->getSourceModel()->getIdentifier()));
+            $urlItem->addChild('priority', $this->getPriority($route->getPageType(), $route->getPage()->getIdentifier()));
         }
     }
 
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 3b7337e4278..1d0daba854b 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -28,7 +28,7 @@ class Route implements Stringable, JsonSerializable, Arrayable
 {
     use JsonSerializesArrayable;
 
-    protected HydePage $sourceModel;
+    protected HydePage $page;
 
     public string $routeKey;
     public string $sourcePath;
@@ -42,7 +42,7 @@ class Route implements Stringable, JsonSerializable, Arrayable
      */
     public function __construct(HydePage $page)
     {
-        $this->sourceModel = $page;
+        $this->page = $page;
         $this->routeKey = $page->getRouteKey();
         $this->sourcePath = $page->getSourcePath();
         $this->outputPath = $page->getOutputPath();
@@ -69,7 +69,7 @@ public function toArray(): array
             'routeKey' => $this->routeKey,
             'sourcePath' => $this->sourcePath,
             'outputPath' => $this->outputPath,
-            'sourceModel' => $this->sourceModel::class,
+            'sourceModel' => $this->page::class,
         ];
     }
 
@@ -90,7 +90,7 @@ public function getLink(): string
      */
     public function getPageType(): string
     {
-        return $this->sourceModel::class;
+        return $this->page::class;
     }
 
     /**
@@ -98,9 +98,9 @@ public function getPageType(): string
      *
      * @return \Hyde\Framework\Concerns\HydePage
      */
-    public function getSourceModel(): HydePage
+    public function getPage(): HydePage
     {
-        return $this->sourceModel;
+        return $this->page;
     }
 
     /**
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index e9869bb09ab..d535191334b 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -38,8 +38,8 @@ public function test_get_source_model_returns_page_model()
         $page = new MarkdownPage();
         $route = new Route($page);
 
-        $this->assertInstanceOf(MarkdownPage::class, $route->getSourceModel());
-        $this->assertSame($page, $route->getSourceModel());
+        $this->assertInstanceOf(MarkdownPage::class, $route->getPage());
+        $this->assertSame($page, $route->getPage());
     }
 
     public function test_get_route_key_returns_page_path()
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index 3d5bf7e2f9a..dd4d6f57503 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -20,7 +20,7 @@ class NavItemTest extends TestCase
     public function test__construct()
     {
         $route = $this->createMock(Route::class);
-        $route->method('getSourceModel')->willReturn($this->createMock(HydePage::class));
+        $route->method('getPage')->willReturn($this->createMock(HydePage::class));
         $route->method('getLink')->willReturn('/');
 
         $item = new NavItem($route, 'Test', 500, true);
@@ -84,13 +84,13 @@ public function testIsCurrentRoute()
         $route = Route::get('index');
         $item = NavItem::fromRoute($route);
 
-        $this->assertTrue($item->isCurrent($route->getSourceModel()));
+        $this->assertTrue($item->isCurrent($route->getPage()));
     }
 
     public function testIsCurrentLink()
     {
         $item = NavItem::toLink('index.html', 'Home');
 
-        $this->assertTrue($item->isCurrent(Route::get('index')->getSourceModel()));
+        $this->assertTrue($item->isCurrent(Route::get('index')->getPage()));
     }
 }
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index b146d3618fc..40e28c41fbc 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -28,7 +28,7 @@ public function __construct(Request $request)
 
     protected function handlePageRequest(): Response
     {
-        $html = $this->getHtml(Route::get($this->normalizePath($this->request->path))->getSourceModel());
+        $html = $this->getHtml(Route::get($this->normalizePath($this->request->path))->getPage());
 
         return (new Response(200, 'OK', [
             'body' => $html,

From cfaae5231b6a8b84c2da9ebeb23e8680cc52987d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:48:27 +0200
Subject: [PATCH 210/768] Revert "Make properties public"

This reverts commit 998971502234b5c16ce59309aa0dbf430cb10424.
---
 packages/framework/src/Routing/Route.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 1d0daba854b..16fdc8ade04 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -30,10 +30,10 @@ class Route implements Stringable, JsonSerializable, Arrayable
 
     protected HydePage $page;
 
-    public string $routeKey;
-    public string $sourcePath;
-    public string $outputPath;
-    public string $uriPath;
+    protected string $routeKey;
+    protected string $sourcePath;
+    protected string $outputPath;
+    protected string $uriPath;
 
     /**
      * Construct a new Route instance for the given page model.

From 84951fa538fc87318a4ddd6d05fe4c7217336005 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:48:49 +0200
Subject: [PATCH 211/768] Make properties private

---
 packages/framework/src/Routing/Route.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 16fdc8ade04..0edfa268749 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -30,10 +30,10 @@ class Route implements Stringable, JsonSerializable, Arrayable
 
     protected HydePage $page;
 
-    protected string $routeKey;
-    protected string $sourcePath;
-    protected string $outputPath;
-    protected string $uriPath;
+    private string $routeKey;
+    private string $sourcePath;
+    private string $outputPath;
+    private string $uriPath;
 
     /**
      * Construct a new Route instance for the given page model.

From b851bd39714884abd914abbdffbfeda18138fb78 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:54:03 +0200
Subject: [PATCH 212/768] Use the getters for serialization

---
 packages/framework/src/Routing/Route.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 0edfa268749..4663f02b9ee 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -66,10 +66,10 @@ public function __toString(): string
     public function toArray(): array
     {
         return [
-            'routeKey' => $this->routeKey,
-            'sourcePath' => $this->sourcePath,
-            'outputPath' => $this->outputPath,
-            'sourceModel' => $this->page::class,
+            'routeKey' => $this->getRouteKey(),
+            'sourcePath' => $this->getSourcePath(),
+            'outputPath' => $this->getOutputPath(),
+            'sourceModel' => $this->getPageType(),
         ];
     }
 

From 87be7d61665ea43f1d98844ddc658d810b5c1907 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:56:14 +0200
Subject: [PATCH 213/768] Call methods on the page instead of redundant class
 properties

---
 packages/framework/src/Routing/Route.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 4663f02b9ee..164c87e4e81 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -80,7 +80,7 @@ public function toArray(): array
      */
     public function getLink(): string
     {
-        return Hyde::relativeLink($this->uriPath);
+        return Hyde::relativeLink($this->page->getLink());
     }
 
     /**
@@ -110,7 +110,7 @@ public function getPage(): HydePage
      */
     public function getRouteKey(): string
     {
-        return $this->routeKey;
+        return $this->page->getRouteKey();
     }
 
     /**
@@ -120,7 +120,7 @@ public function getRouteKey(): string
      */
     public function getSourcePath(): string
     {
-        return $this->sourcePath;
+        return $this->page->getSourcePath();
     }
 
     /**
@@ -130,7 +130,7 @@ public function getSourcePath(): string
      */
     public function getOutputPath(): string
     {
-        return $this->outputPath;
+        return $this->page->getOutputPath();
     }
 
     /**
@@ -140,7 +140,7 @@ public function getOutputPath(): string
      */
     public function getQualifiedUrl(): string
     {
-        return Hyde::url($this->outputPath);
+        return Hyde::url($this->getOutputPath());
     }
 
     /**

From 142125196ecac386e168ac99e2b92efff04b55c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:56:45 +0200
Subject: [PATCH 214/768] Remove redundant class properties

---
 packages/framework/src/Routing/Route.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 164c87e4e81..9130eac7f05 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -30,11 +30,6 @@ class Route implements Stringable, JsonSerializable, Arrayable
 
     protected HydePage $page;
 
-    private string $routeKey;
-    private string $sourcePath;
-    private string $outputPath;
-    private string $uriPath;
-
     /**
      * Construct a new Route instance for the given page model.
      *
@@ -43,10 +38,6 @@ class Route implements Stringable, JsonSerializable, Arrayable
     public function __construct(HydePage $page)
     {
         $this->page = $page;
-        $this->routeKey = $page->getRouteKey();
-        $this->sourcePath = $page->getSourcePath();
-        $this->outputPath = $page->getOutputPath();
-        $this->uriPath = $page->getLink();
     }
 
     /**

From 8b58b695cae1a363569e81cb3a32223dcef0973f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:57:43 +0200
Subject: [PATCH 215/768] Rename method getPageClass to getPageType

---
 packages/framework/src/Console/Commands/RouteListCommand.php | 2 +-
 packages/framework/src/Framework/Services/BuildService.php   | 2 +-
 packages/framework/src/Framework/Services/SitemapService.php | 2 +-
 packages/framework/src/Routing/Route.php                     | 4 ++--
 packages/framework/tests/Feature/RouteTest.php               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index 7e79acf6b7c..ad913d10bca 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -39,7 +39,7 @@ protected function getRoutes(): array
         /** @var \Hyde\Routing\Route $route */
         foreach (Hyde::routes() as $route) {
             $routes[] = [
-                $this->formatPageType($route->getPageType()),
+                $this->formatPageType($route->getPageClass()),
                 $this->formatSourcePath($route->getSourcePath()),
                 $this->formatOutputPath($route->getOutputPath()),
                 $route->getRouteKey(),
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 6b636463c1e..011bb3d7e6e 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -78,7 +78,7 @@ function ($filepath) {
     protected function getDiscoveredModels(): RouteCollection
     {
         return $this->router->getRoutes()->map(function (Route $route) {
-            return $route->getPageType();
+            return $route->getPageClass();
         })->unique();
     }
 
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index d5d79986d01..ec6fc5d7f2d 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -60,7 +60,7 @@ public function addRoute(Route $route): void
         $urlItem->addChild('lastmod', htmlentities($this->getLastModDate($route->getSourcePath())));
         $urlItem->addChild('changefreq', 'daily');
         if (config('hyde.sitemap.dynamic_priority', true)) {
-            $urlItem->addChild('priority', $this->getPriority($route->getPageType(), $route->getPage()->getIdentifier()));
+            $urlItem->addChild('priority', $this->getPriority($route->getPageClass(), $route->getPage()->getIdentifier()));
         }
     }
 
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 9130eac7f05..5224b93c0c9 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,7 +60,7 @@ public function toArray(): array
             'routeKey' => $this->getRouteKey(),
             'sourcePath' => $this->getSourcePath(),
             'outputPath' => $this->getOutputPath(),
-            'sourceModel' => $this->getPageType(),
+            'sourceModel' => $this->getPageClass(),
         ];
     }
 
@@ -79,7 +79,7 @@ public function getLink(): string
      *
      * @return class-string<\Hyde\Framework\Concerns\HydePage>
      */
-    public function getPageType(): string
+    public function getPageClass(): string
     {
         return $this->page::class;
     }
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index d535191334b..05734986801 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -30,7 +30,7 @@ public function test_get_page_type_returns_fully_qualified_class_name()
         $page = new MarkdownPage();
         $route = new Route($page);
 
-        $this->assertEquals(MarkdownPage::class, $route->getPageType());
+        $this->assertEquals(MarkdownPage::class, $route->getPageClass());
     }
 
     public function test_get_source_model_returns_page_model()

From 195b195181a44dc7770f800c8b9c6de3684e1a1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 19:58:07 +0200
Subject: [PATCH 216/768] Update serialized key sourceModel to pageClass

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

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 5224b93c0c9..fba526829ce 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,7 +60,7 @@ public function toArray(): array
             'routeKey' => $this->getRouteKey(),
             'sourcePath' => $this->getSourcePath(),
             'outputPath' => $this->getOutputPath(),
-            'sourceModel' => $this->getPageClass(),
+            'pageClass' => $this->getPageClass(),
         ];
     }
 

From 04efc534a20a005ad0a65bc82261b9c0abee3a01 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:02:07 +0200
Subject: [PATCH 217/768] Update toArray to include everything needed to
 reconstruct the page data

---
 packages/framework/src/Routing/Route.php       | 15 ++++++++++++++-
 packages/framework/tests/Feature/RouteTest.php |  5 ++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index fba526829ce..e728162a5fc 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,7 +60,10 @@ public function toArray(): array
             'routeKey' => $this->getRouteKey(),
             'sourcePath' => $this->getSourcePath(),
             'outputPath' => $this->getOutputPath(),
-            'pageClass' => $this->getPageClass(),
+            'page' => [
+                'class' => $this->getPageClass(),
+                'identifier' => $this->getPageIdentifier(),
+            ],
         ];
     }
 
@@ -84,6 +87,16 @@ public function getPageClass(): string
         return $this->page::class;
     }
 
+    /**
+     * Get the page identifier.
+     *
+     * @return string
+     */
+    public function getPageIdentifier(): string
+    {
+        return $this->page->getIdentifier();
+    }
+
     /**
      * Get the source model for the route.
      *
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 05734986801..2b266480fdc 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -185,7 +185,10 @@ public function test_to_array_method()
             'routeKey' => 'foo',
             'sourcePath' => '_pages/foo.md',
             'outputPath' => 'foo.html',
-            'sourceModel' => MarkdownPage::class,
+            'page' => [
+                'class' => MarkdownPage::class,
+                'identifier' => 'foo',
+            ],
         ], (new MarkdownPage('foo'))->getRoute()->toArray());
     }
 

From c67b8d56f1d331a392cff91b8ae8d0e1215f8b2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:03:16 +0200
Subject: [PATCH 218/768] Remove unnecessary PHPDocs

---
 packages/framework/src/Routing/Route.php | 38 ------------------------
 1 file changed, 38 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index e728162a5fc..588d84eaa21 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -30,11 +30,6 @@ class Route implements Stringable, JsonSerializable, Arrayable
 
     protected HydePage $page;
 
-    /**
-     * Construct a new Route instance for the given page model.
-     *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
-     */
     public function __construct(HydePage $page)
     {
         $this->page = $page;
@@ -42,7 +37,6 @@ public function __construct(HydePage $page)
 
     /**
      * Cast a route object into a string that can be used in a href attribute.
-     * Should be the same as getLink().
      */
     public function __toString(): string
     {
@@ -50,8 +44,6 @@ public function __toString(): string
     }
 
     /**
-     * Get the instance as an array.
-     *
      * @return array<string, string>
      */
     public function toArray(): array
@@ -77,61 +69,31 @@ public function getLink(): string
         return Hyde::relativeLink($this->page->getLink());
     }
 
-    /**
-     * Get the page type for the route.
-     *
-     * @return class-string<\Hyde\Framework\Concerns\HydePage>
-     */
     public function getPageClass(): string
     {
         return $this->page::class;
     }
 
-    /**
-     * Get the page identifier.
-     *
-     * @return string
-     */
     public function getPageIdentifier(): string
     {
         return $this->page->getIdentifier();
     }
 
-    /**
-     * Get the source model for the route.
-     *
-     * @return \Hyde\Framework\Concerns\HydePage
-     */
     public function getPage(): HydePage
     {
         return $this->page;
     }
 
-    /**
-     * Get the unique route key for the route.
-     *
-     * @return string The route key. Generally <output-directory/slug>.
-     */
     public function getRouteKey(): string
     {
         return $this->page->getRouteKey();
     }
 
-    /**
-     * Get the path to the source file.
-     *
-     * @return string Path relative to the root of the project.
-     */
     public function getSourcePath(): string
     {
         return $this->page->getSourcePath();
     }
 
-    /**
-     * Get the path to the output file.
-     *
-     * @return string Path relative to the site output directory.
-     */
     public function getOutputPath(): string
     {
         return $this->page->getOutputPath();

From fa5f5a4e2989074acc9c70f2b431fa0dbda85d84 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:04:51 +0200
Subject: [PATCH 219/768] Update PHPDoc

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

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 588d84eaa21..e59653530d7 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,9 +60,9 @@ public function toArray(): array
     }
 
     /**
-     * Resolve a site web link to the file, using pretty URLs if enabled.
+     * Resolve a relative site web link to the file, using pretty URLs if enabled.
      *
-     * @return string Relative URL path to the route site file.
+     * @return string URL path to the route site file, relative to the current page being rendered.
      */
     public function getLink(): string
     {

From 2218e475a1d87f354dc3c81aabddd8cf3555d61c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:06:36 +0200
Subject: [PATCH 220/768] Allow RouteKey objects to be passed to is() method

---
 packages/framework/src/Routing/Route.php       | 6 +++---
 packages/framework/tests/Feature/RouteTest.php | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index e59653530d7..4e66d503e6d 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -112,16 +112,16 @@ public function getQualifiedUrl(): string
     /**
      * Determine if the route instance matches another route or route key.
      *
-     * @param  \Hyde\Routing\Route|string  $route  A route instance or route key string
+     * @param \Hyde\Routing\Route|\Hyde\Routing\RouteKey|string $route A route instance or route key string
      * @return bool
      */
-    public function is(Route|string $route): bool
+    public function is(Route|RouteKey|string $route): bool
     {
         if ($route instanceof Route) {
             return $this->getRouteKey() === $route->getRouteKey();
         }
 
-        return $this->getRouteKey() === $route;
+        return $this->getRouteKey() === (string) $route;
     }
 
     /**
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 2b266480fdc..3ad6706512e 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Routing\Route;
+use Hyde\Routing\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**
@@ -207,4 +208,11 @@ public function testIsWithRouteKey()
         $this->assertTrue($route->is('foo'));
         $this->assertFalse($route->is('bar'));
     }
+
+    public function testIsWithRouteKeyObject()
+    {
+        $route = new Route(new MarkdownPage('foo'));
+        $this->assertTrue($route->is(new RouteKey('foo')));
+        $this->assertFalse($route->is(new RouteKey('bar')));
+    }
 }

From f08704976f557eab8a1b46e0c366113c732c5d76 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 18:08:14 +0000
Subject: [PATCH 221/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 4e66d503e6d..06dcd7d0769 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -112,7 +112,7 @@ public function getQualifiedUrl(): string
     /**
      * Determine if the route instance matches another route or route key.
      *
-     * @param \Hyde\Routing\Route|\Hyde\Routing\RouteKey|string $route A route instance or route key string
+     * @param  \Hyde\Routing\Route|\Hyde\Routing\RouteKey|string  $route  A route instance or route key string
      * @return bool
      */
     public function is(Route|RouteKey|string $route): bool

From c1269719229a133fe548f5eb01878613e402abbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:09:06 +0200
Subject: [PATCH 222/768] Move PHPDocs to the route facade

---
 packages/framework/src/Facades/Route.php | 31 ++++++++++++++++++++++++
 packages/framework/src/Routing/Route.php | 31 ------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 2591044b0e9..ee98d1f2e65 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -12,31 +12,62 @@
  */
 class Route
 {
+    /**
+     * Get a route from the route index for the specified route key.
+     *
+     * @param  string  $routeKey  Example: posts/foo.md
+     * @return \Hyde\Routing\Route|null
+     */
     public static function get(string $routeKey): ?RouteModel
     {
         return RouteModel::get($routeKey);
     }
 
+    /**
+     * Get a route from the route index for the specified route key or throw an exception.
+     *
+     * @param  string  $routeKey
+     * @return \Hyde\Routing\Route
+     *
+     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
+     */
     public static function getOrFail(string $routeKey): RouteModel
     {
         return RouteModel::getOrFail($routeKey);
     }
 
+    /**
+     * Get all routes from the route index.
+     *
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
+     */
     public static function all(): RouteCollection
     {
         return RouteModel::all();
     }
 
+    /**
+     * Get the current route for the page being rendered.
+     */
     public static function current(): ?RouteModel
     {
         return RouteModel::current();
     }
 
+    /**
+     * Get the home route, usually the index page route.
+     */
     public static function home(): ?RouteModel
     {
         return RouteModel::home();
     }
 
+    /**
+     * Determine if the supplied route key exists in the route index.
+     *
+     * @param  string  $routeKey
+     * @return bool
+     */
     public static function exists(string $routeKey): bool
     {
         return RouteModel::exists($routeKey);
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 4e66d503e6d..0887e12da21 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -124,62 +124,31 @@ public function is(Route|RouteKey|string $route): bool
         return $this->getRouteKey() === (string) $route;
     }
 
-    /**
-     * Get a route from the route index for the specified route key.
-     *
-     * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Routing\Route|null
-     */
     public static function get(string $routeKey): ?Route
     {
         return Hyde::routes()->get(self::normalizeRouteKey($routeKey));
     }
 
-    /**
-     * Get a route from the route index for the specified route key or throw an exception.
-     *
-     * @param  string  $routeKey
-     * @return \Hyde\Routing\Route
-     *
-     * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
-     */
     public static function getOrFail(string $routeKey): Route
     {
         return Route::get($routeKey) ?? throw new RouteNotFoundException($routeKey);
     }
 
-    /**
-     * Get all routes from the route index.
-     *
-     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
-     */
     public static function all(): RouteCollection
     {
         return Hyde::routes();
     }
 
-    /**
-     * Get the current route for the page being rendered.
-     */
     public static function current(): ?Route
     {
         return Hyde::currentRoute();
     }
 
-    /**
-     * Get the home route, usually the index page route.
-     */
     public static function home(): ?Route
     {
         return Route::get('index');
     }
 
-    /**
-     * Determine if the supplied route key exists in the route index.
-     *
-     * @param  string  $routeKey
-     * @return bool
-     */
     public static function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);

From 0b1c8563aca33f4d8daaa6b7d128e006b12330b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:10:22 +0200
Subject: [PATCH 223/768] Remove redundant information from PHPDocs

---
 packages/framework/src/Routing/Route.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 24095eec84d..5638de21a48 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,9 +60,7 @@ public function toArray(): array
     }
 
     /**
-     * Resolve a relative site web link to the file, using pretty URLs if enabled.
-     *
-     * @return string URL path to the route site file, relative to the current page being rendered.
+     * Resolve a site web link to the compiled page, relative to the current page being rendered, using pretty URLs if enabled.
      */
     public function getLink(): string
     {
@@ -111,9 +109,6 @@ public function getQualifiedUrl(): string
 
     /**
      * Determine if the route instance matches another route or route key.
-     *
-     * @param  \Hyde\Routing\Route|\Hyde\Routing\RouteKey|string  $route  A route instance or route key string
-     * @return bool
      */
     public function is(Route|RouteKey|string $route): bool
     {
@@ -156,9 +151,6 @@ public static function exists(string $routeKey): bool
 
     /**
      * Format a route key so both dot and slash notations are supported.
-     *
-     * @param  string  $routeKey
-     * @return string
      */
     protected static function normalizeRouteKey(string $routeKey): string
     {

From eac914e44d60c0cebcf03a0f0605f9bf0f73bdcc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:12:28 +0200
Subject: [PATCH 224/768] Format PHPDoc

---
 packages/framework/src/Routing/Route.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 5638de21a48..631f8b07152 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -60,7 +60,8 @@ public function toArray(): array
     }
 
     /**
-     * Resolve a site web link to the compiled page, relative to the current page being rendered, using pretty URLs if enabled.
+     * Resolve a site web link to the compiled page.
+     * The path is relative to the current page being rendered, and uses pretty URLs if enabled.
      */
     public function getLink(): string
     {

From 32c3435fad9ebfa7aa9c658c63ccfb0d144fd161 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:13:16 +0200
Subject: [PATCH 225/768] Inline helper method

---
 packages/framework/src/Routing/Route.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 631f8b07152..1725dc980cf 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -122,7 +122,7 @@ public function is(Route|RouteKey|string $route): bool
 
     public static function get(string $routeKey): ?Route
     {
-        return Hyde::routes()->get(self::normalizeRouteKey($routeKey));
+        return Hyde::routes()->get(str_replace('.', '/', $routeKey));
     }
 
     public static function getOrFail(string $routeKey): Route
@@ -149,12 +149,4 @@ public static function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);
     }
-
-    /**
-     * Format a route key so both dot and slash notations are supported.
-     */
-    protected static function normalizeRouteKey(string $routeKey): string
-    {
-        return str_replace('.', '/', $routeKey);
-    }
 }

From 980918e64f6599c83c4f7e0e5e5189b19c6af643 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:15:14 +0200
Subject: [PATCH 226/768] Link to the forwarding concerns

---
 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 c3cbb679242..8759d9d02cf 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -54,6 +54,9 @@
  * @method static void shareViewData(HydePage $page)
  * @method static array toArray()
  * @method static void boot()
+ *
+ * @see \Hyde\Foundation\Concerns\ForwardsFilesystem
+ * @see \Hyde\Foundation\Concerns\ForwardsHyperlinks
  */
 class Hyde extends Facade
 {

From a99dc1435b25213af7fc9417121588fd39253290 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:18:30 +0200
Subject: [PATCH 227/768] Inline Route::getQualifiedUrl()

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 packages/framework/src/Framework/Services/SitemapService.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 0dc0fa73793..af239bbb3c7 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -35,7 +35,7 @@ protected function makeCanonicalUrl(): ?string
         }
 
         if (Hyde::hasSiteUrl() && ! empty($this->identifier)) {
-            return $this->getRoute()->getQualifiedUrl();
+            return Hyde::url($this->getRoute()->getOutputPath());
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index ec6fc5d7f2d..03bdc1079db 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -56,7 +56,7 @@ public function getXML(): string
     public function addRoute(Route $route): void
     {
         $urlItem = $this->xmlElement->addChild('url');
-        $urlItem->addChild('loc', htmlentities($route->getQualifiedUrl()));
+        $urlItem->addChild('loc', htmlentities(Hyde::url($route->getOutputPath())));
         $urlItem->addChild('lastmod', htmlentities($this->getLastModDate($route->getSourcePath())));
         $urlItem->addChild('changefreq', 'daily');
         if (config('hyde.sitemap.dynamic_priority', true)) {

From ad4eea35c13097c9d74b02b89c5a4a632fc0bedc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:18:35 +0200
Subject: [PATCH 228/768] Remove Route::getQualifiedUrl()

---
 packages/framework/src/Routing/Route.php      | 10 -------
 .../framework/tests/Feature/RouteTest.php     | 27 -------------------
 2 files changed, 37 deletions(-)

diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 1725dc980cf..42290826619 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -98,16 +98,6 @@ public function getOutputPath(): string
         return $this->page->getOutputPath();
     }
 
-    /**
-     * Get the qualified URL for the route, using pretty URLs if enabled.
-     *
-     * @return string Fully qualified URL using the configured base URL.
-     */
-    public function getQualifiedUrl(): string
-    {
-        return Hyde::url($this->getOutputPath());
-    }
-
     /**
      * Determine if the route instance matches another route or route key.
      */
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 3ad6706512e..fb616a4722f 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -136,33 +136,6 @@ public function test_to_string_is_alias_for_get_link()
         $this->assertEquals($route->getLink(), (string) $route);
     }
 
-    public function test_get_qualified_url_returns_hyde_url_for_output_file_path()
-    {
-        $route = new Route(new MarkdownPage('foo'));
-        $this->assertEquals(Hyde::url('foo.html'), $route->getQualifiedUrl());
-    }
-
-    public function test_get_qualified_url_returns_hyde_url_for_nested_pages()
-    {
-        $route = new Route(new MarkdownPage('foo/bar'));
-        $this->assertEquals(Hyde::url('foo/bar.html'), $route->getQualifiedUrl());
-    }
-
-    public function test_get_qualified_url_returns_pretty_url_if_enabled()
-    {
-        config(['site.pretty_urls' => true]);
-        $route = new Route(new MarkdownPage('foo'));
-        $this->assertEquals(Hyde::url('foo'), $route->getQualifiedUrl());
-    }
-
-    public function test_get_qualified_url_throws_exception_when_a_base_url_is_not_set()
-    {
-        config(['site.url' => null]);
-        $this->expectException(BaseUrlNotSetException::class);
-        $route = new Route(new MarkdownPage('foo'));
-        $route->getQualifiedUrl();
-    }
-
     public function test_current_returns_current_route()
     {
         $route = new Route(new MarkdownPage('foo'));

From 8dff9c009d3d98cc9e0e50fefddff14ed3d2b307 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 18:18:45 +0000
Subject: [PATCH 229/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index fb616a4722f..30944c9324c 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Exceptions\BaseUrlNotSetException;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;

From 0222df5f11fb0e54ddf0e01d1ce4e371123f6f4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:20:16 +0200
Subject: [PATCH 230/768] Inline alias

---
 packages/framework/src/Facades/Route.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index ee98d1f2e65..bd93ba62e90 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -5,7 +5,6 @@
 namespace Hyde\Facades;
 
 use Hyde\Foundation\RouteCollection;
-use Hyde\Routing\Route as RouteModel;
 
 /**
  * Provides an easy way to access the Hyde pseudo-router.
@@ -18,9 +17,9 @@ class Route
      * @param  string  $routeKey  Example: posts/foo.md
      * @return \Hyde\Routing\Route|null
      */
-    public static function get(string $routeKey): ?RouteModel
+    public static function get(string $routeKey): ?\Hyde\Routing\Route
     {
-        return RouteModel::get($routeKey);
+        return \Hyde\Routing\Route::get($routeKey);
     }
 
     /**
@@ -31,9 +30,9 @@ public static function get(string $routeKey): ?RouteModel
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
-    public static function getOrFail(string $routeKey): RouteModel
+    public static function getOrFail(string $routeKey): \Hyde\Routing\Route
     {
-        return RouteModel::getOrFail($routeKey);
+        return \Hyde\Routing\Route::getOrFail($routeKey);
     }
 
     /**
@@ -43,23 +42,23 @@ public static function getOrFail(string $routeKey): RouteModel
      */
     public static function all(): RouteCollection
     {
-        return RouteModel::all();
+        return \Hyde\Routing\Route::all();
     }
 
     /**
      * Get the current route for the page being rendered.
      */
-    public static function current(): ?RouteModel
+    public static function current(): ?\Hyde\Routing\Route
     {
-        return RouteModel::current();
+        return \Hyde\Routing\Route::current();
     }
 
     /**
      * Get the home route, usually the index page route.
      */
-    public static function home(): ?RouteModel
+    public static function home(): ?\Hyde\Routing\Route
     {
-        return RouteModel::home();
+        return \Hyde\Routing\Route::home();
     }
 
     /**
@@ -70,6 +69,6 @@ public static function home(): ?RouteModel
      */
     public static function exists(string $routeKey): bool
     {
-        return RouteModel::exists($routeKey);
+        return \Hyde\Routing\Route::exists($routeKey);
     }
 }

From fe178a32b4e2d49d33f5452e22bd1c633b2702e7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:22:35 +0200
Subject: [PATCH 231/768] Update PHPDoc

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

diff --git a/packages/framework/src/Routing/Redirect.php b/packages/framework/src/Routing/Redirect.php
index 7e2e939e025..f3bd08cea98 100644
--- a/packages/framework/src/Routing/Redirect.php
+++ b/packages/framework/src/Routing/Redirect.php
@@ -9,6 +9,8 @@
 /**
  * A basic redirect page. Is not discoverable by Hyde, instead you manually need to create the pages.
  * Typically, you'll do this in a build task. Pass data a new object, then call the store method.
+ * The store method will then render the redirect page to the project's site output directory.
+ * Once viewed in a web browser a meta refresh will redirect the user to the new location.
  *
  * @example `Redirect::make('foo', 'bar')->store();`
  */

From 051f61624473831f3b6f111be3810b89e4694321 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:23:55 +0200
Subject: [PATCH 232/768] Move Redirect class to Helpers namespace

---
 packages/framework/src/{Routing => Helpers}/Redirect.php | 2 +-
 packages/framework/tests/Feature/RedirectTest.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/{Routing => Helpers}/Redirect.php (98%)

diff --git a/packages/framework/src/Routing/Redirect.php b/packages/framework/src/Helpers/Redirect.php
similarity index 98%
rename from packages/framework/src/Routing/Redirect.php
rename to packages/framework/src/Helpers/Redirect.php
index f3bd08cea98..2791f2029c2 100644
--- a/packages/framework/src/Routing/Redirect.php
+++ b/packages/framework/src/Helpers/Redirect.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Routing;
+namespace Hyde\Helpers;
 
 use Hyde\Hyde;
 
diff --git a/packages/framework/tests/Feature/RedirectTest.php b/packages/framework/tests/Feature/RedirectTest.php
index 5eee7ff2fb7..dcee9623b56 100644
--- a/packages/framework/tests/Feature/RedirectTest.php
+++ b/packages/framework/tests/Feature/RedirectTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Helpers\Redirect;
 use Hyde\Hyde;
-use Hyde\Routing\Redirect;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Routing\Redirect
+ * @covers \Hyde\Helpers\Redirect
  */
 class RedirectTest extends TestCase
 {

From a77aec435aa504631c06692862d5a58efb0de419 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:25:15 +0200
Subject: [PATCH 233/768] Move RouteKey class to Support\Models namespace

---
 packages/framework/src/Framework/Concerns/HydePage.php        | 2 +-
 packages/framework/src/Routing/Route.php                      | 3 ++-
 .../framework/src/{Routing => Support/Models}/RouteKey.php    | 2 +-
 packages/framework/tests/Feature/RouteKeyTest.php             | 4 ++--
 packages/framework/tests/Feature/RouteTest.php                | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename packages/framework/src/{Routing => Support/Models}/RouteKey.php (97%)

diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 38f671a4bcc..41da263c99b 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -15,8 +15,8 @@
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Routing\Route;
-use Hyde\Routing\RouteKey;
 use Hyde\Support\Contracts\CompilableContract;
+use Hyde\Support\Models\RouteKey;
 
 /**
  * The base class for all Hyde pages.
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Routing/Route.php
index 42290826619..a8afe64f819 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Routing/Route.php
@@ -9,10 +9,11 @@
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
+use Hyde\Support\Models\RouteKey;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
-use function str_replace;
 use Stringable;
+use function str_replace;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages
diff --git a/packages/framework/src/Routing/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
similarity index 97%
rename from packages/framework/src/Routing/RouteKey.php
rename to packages/framework/src/Support/Models/RouteKey.php
index d9ab9e28328..be2c99109ca 100644
--- a/packages/framework/src/Routing/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Routing;
+namespace Hyde\Support\Models;
 
 use Stringable;
 use function unslash;
diff --git a/packages/framework/tests/Feature/RouteKeyTest.php b/packages/framework/tests/Feature/RouteKeyTest.php
index 75da944a575..17b3e338643 100644
--- a/packages/framework/tests/Feature/RouteKeyTest.php
+++ b/packages/framework/tests/Feature/RouteKeyTest.php
@@ -8,11 +8,11 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\RouteKey;
+use Hyde\Support\Models\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Routing\RouteKey
+ * @covers \Hyde\Support\Models\RouteKey
  */
 class RouteKeyTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 30944c9324c..aa061fca42f 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -9,7 +9,7 @@
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Routing\Route;
-use Hyde\Routing\RouteKey;
+use Hyde\Support\Models\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**

From afe85a350ed492101cd4632726a4eb218053928f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:26:48 +0200
Subject: [PATCH 234/768] Move Route class to Support\Models namespace

While I think the namespace Hyde\Routing\Route is beautiful I don't think it's needed for just a few classes, and I don't think Hyde will get more Routing classes in the foreseeable future.
---
 .../src/Console/Commands/RouteListCommand.php |  2 +-
 packages/framework/src/Facades/Route.php      | 26 +++++++++----------
 .../Foundation/Concerns/ManagesViewData.php   |  4 +--
 .../src/Foundation/RouteCollection.php        |  2 +-
 .../src/Framework/Concerns/HydePage.php       |  4 +--
 .../Navigation/DocumentationSidebar.php       |  2 +-
 .../Framework/Features/Navigation/NavItem.php |  4 +--
 .../Features/Navigation/NavigationMenu.php    |  2 +-
 .../src/Framework/Services/BuildService.php   |  4 +--
 .../src/Framework/Services/SitemapService.php |  2 +-
 packages/framework/src/Hyde.php               |  2 +-
 .../framework/src/Pages/DocumentationPage.php |  2 +-
 .../src/{Routing => Support/Models}/Route.php |  3 +--
 .../tests/Feature/HydeKernelTest.php          |  2 +-
 .../framework/tests/Feature/HydePageTest.php  |  2 +-
 .../tests/Feature/NavigationMenuTest.php      |  2 +-
 .../tests/Feature/RouteCollectionTest.php     |  2 +-
 .../framework/tests/Feature/RouteTest.php     |  4 +--
 .../Services/DocumentationSidebarTest.php     |  2 +-
 .../tests/Unit/DocumentationPageTest.php      |  2 +-
 .../tests/Unit/Facades/RouteFacadeTest.php    |  2 +-
 .../tests/Unit/HydeFileHelpersTest.php        |  2 +-
 packages/framework/tests/Unit/NavItemTest.php |  2 +-
 .../Views/Components/LinkComponentTest.php    |  4 +--
 .../Unit/Views/NavigationLinkViewTest.php     |  2 +-
 .../src/Routing/PageRouter.php                |  2 +-
 packages/testing/src/TestCase.php             |  2 +-
 27 files changed, 45 insertions(+), 46 deletions(-)
 rename packages/framework/src/{Routing => Support/Models}/Route.php (98%)

diff --git a/packages/framework/src/Console/Commands/RouteListCommand.php b/packages/framework/src/Console/Commands/RouteListCommand.php
index ad913d10bca..8aaf6bee027 100644
--- a/packages/framework/src/Console/Commands/RouteListCommand.php
+++ b/packages/framework/src/Console/Commands/RouteListCommand.php
@@ -36,7 +36,7 @@ public function handle(): int
     protected function getRoutes(): array
     {
         $routes = [];
-        /** @var \Hyde\Routing\Route $route */
+        /** @var \Hyde\Support\Models\Route $route */
         foreach (Hyde::routes() as $route) {
             $routes[] = [
                 $this->formatPageType($route->getPageClass()),
diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index bd93ba62e90..46b64f2073b 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -15,50 +15,50 @@ class Route
      * Get a route from the route index for the specified route key.
      *
      * @param  string  $routeKey  Example: posts/foo.md
-     * @return \Hyde\Routing\Route|null
+     * @return \Hyde\Support\Models\Route|null
      */
-    public static function get(string $routeKey): ?\Hyde\Routing\Route
+    public static function get(string $routeKey): ?\Hyde\Support\Models\Route
     {
-        return \Hyde\Routing\Route::get($routeKey);
+        return \Hyde\Support\Models\Route::get($routeKey);
     }
 
     /**
      * Get a route from the route index for the specified route key or throw an exception.
      *
      * @param  string  $routeKey
-     * @return \Hyde\Routing\Route
+     * @return \Hyde\Support\Models\Route
      *
      * @throws \Hyde\Framework\Exceptions\RouteNotFoundException
      */
-    public static function getOrFail(string $routeKey): \Hyde\Routing\Route
+    public static function getOrFail(string $routeKey): \Hyde\Support\Models\Route
     {
-        return \Hyde\Routing\Route::getOrFail($routeKey);
+        return \Hyde\Support\Models\Route::getOrFail($routeKey);
     }
 
     /**
      * Get all routes from the route index.
      *
-     * @return \Hyde\Foundation\RouteCollection<\Hyde\Routing\Route>
+     * @return \Hyde\Foundation\RouteCollection<\Hyde\Support\Models\Route>
      */
     public static function all(): RouteCollection
     {
-        return \Hyde\Routing\Route::all();
+        return \Hyde\Support\Models\Route::all();
     }
 
     /**
      * Get the current route for the page being rendered.
      */
-    public static function current(): ?\Hyde\Routing\Route
+    public static function current(): ?\Hyde\Support\Models\Route
     {
-        return \Hyde\Routing\Route::current();
+        return \Hyde\Support\Models\Route::current();
     }
 
     /**
      * Get the home route, usually the index page route.
      */
-    public static function home(): ?\Hyde\Routing\Route
+    public static function home(): ?\Hyde\Support\Models\Route
     {
-        return \Hyde\Routing\Route::home();
+        return \Hyde\Support\Models\Route::home();
     }
 
     /**
@@ -69,6 +69,6 @@ public static function home(): ?\Hyde\Routing\Route
      */
     public static function exists(string $routeKey): bool
     {
-        return \Hyde\Routing\Route::exists($routeKey);
+        return \Hyde\Support\Models\Route::exists($routeKey);
     }
 }
diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 9aac00d3127..9df079e91b8 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation\Concerns;
 
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\View;
 
 /**
@@ -40,7 +40,7 @@ public function currentPage(): ?string
     /**
      * Get the route for the page being rendered.
      *
-     * @return \Hyde\Routing\Route|null
+     * @return \Hyde\Support\Models\Route|null
      */
     public function currentRoute(): ?Route
     {
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index e0d37ffe2ef..540b0117956 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Pseudo-Router for Hyde.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Framework/Concerns/HydePage.php
index 41da263c99b..5313fb6dccc 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Framework/Concerns/HydePage.php
@@ -14,8 +14,8 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
-use Hyde\Routing\Route;
 use Hyde\Support\Contracts\CompilableContract;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Models\RouteKey;
 
 /**
@@ -185,7 +185,7 @@ public function getRouteKey(): string
     /**
      * Get the route for the page.
      *
-     * @return \Hyde\Routing\Route The page's route.
+     * @return \Hyde\Support\Models\Route The page's route.
      */
     public function getRoute(): Route
     {
diff --git a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
index a6d7f281a77..73a07a5aa74 100644
--- a/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
+++ b/packages/framework/src/Framework/Features/Navigation/DocumentationSidebar.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index 5ccf866b947..bad84db3776 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
 
@@ -30,7 +30,7 @@ class NavItem implements Stringable
     /**
      * Create a new navigation menu item.
      *
-     * @param  \Hyde\Routing\Route|null  $route
+     * @param  \Hyde\Support\Models\Route|null  $route
      * @param  string  $label
      * @param  int  $priority
      * @param  bool  $hidden
diff --git a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
index c05d0230218..71c5994e9d5 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavigationMenu.php
@@ -6,7 +6,7 @@
 
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Collection;
 
 /**
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 011bb3d7e6e..a33be791575 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -9,7 +9,7 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Models\Site;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
@@ -96,7 +96,7 @@ protected function compilePagesForClass(string $pageClass): void
         $this->newLine(2);
     }
 
-    /** @psalm-return \Closure(\Hyde\Routing\Route):string */
+    /** @psalm-return \Closure(\Hyde\Support\Models\Route):string */
     protected function compileRoute(): Closure
     {
         return function (Route $route) {
diff --git a/packages/framework/src/Framework/Services/SitemapService.php b/packages/framework/src/Framework/Services/SitemapService.php
index 03bdc1079db..f66e5d93de2 100644
--- a/packages/framework/src/Framework/Services/SitemapService.php
+++ b/packages/framework/src/Framework/Services/SitemapService.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use SimpleXMLElement;
 
 /**
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 8759d9d02cf..3b3ec413f20 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -10,7 +10,7 @@
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Helpers\Features;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\Facade;
 
 /**
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index e74a2741ca6..fd26cd1921c 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
 use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Page class for documentation pages.
diff --git a/packages/framework/src/Routing/Route.php b/packages/framework/src/Support/Models/Route.php
similarity index 98%
rename from packages/framework/src/Routing/Route.php
rename to packages/framework/src/Support/Models/Route.php
index a8afe64f819..d4eb58713ac 100644
--- a/packages/framework/src/Routing/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -2,14 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Routing;
+namespace Hyde\Support\Models;
 
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
-use Hyde\Support\Models\RouteKey;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
 use Stringable;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index b9fb5f852ed..d193f190d05 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 85f91f4f266..c5122af81b6 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -12,7 +12,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/NavigationMenuTest.php b/packages/framework/tests/Feature/NavigationMenuTest.php
index 57093bb7542..2b1dc907be0 100644
--- a/packages/framework/tests/Feature/NavigationMenuTest.php
+++ b/packages/framework/tests/Feature/NavigationMenuTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\Features\Navigation\NavigationMenu;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 7dce4105784..97cf8942efc 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -10,7 +10,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Collection;
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index aa061fca42f..5d509202cc2 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -8,12 +8,12 @@
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Support\Models\RouteKey;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Routing\Route
+ * @covers \Hyde\Support\Models\Route
  */
 class RouteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index e0fd585f282..80077c5a9d8 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Features\Navigation\DocumentationSidebar;
 use Hyde\Framework\Features\Navigation\NavItem;
 use Hyde\Hyde;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 00fd2ac2fd1..d92df155128 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -7,7 +7,7 @@
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index f3ad783a869..974363e155c 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -14,6 +14,6 @@ class RouteFacadeTest extends TestCase
 {
     public function test_route_facade_can_call_methods_on_the_route_model()
     {
-        $this->assertEquals(Route::all(), \Hyde\Routing\Route::all());
+        $this->assertEquals(Route::all(), \Hyde\Support\Models\Route::all());
     }
 }
diff --git a/packages/framework/tests/Unit/HydeFileHelpersTest.php b/packages/framework/tests/Unit/HydeFileHelpersTest.php
index fa62e4cce1b..e9be2c88ca9 100644
--- a/packages/framework/tests/Unit/HydeFileHelpersTest.php
+++ b/packages/framework/tests/Unit/HydeFileHelpersTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit;
 
 use Hyde\Hyde;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index dd4d6f57503..f7bcdf2bc98 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
index c698f91e52a..29bdc4f6c83 100644
--- a/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
+++ b/packages/framework/tests/Unit/Views/Components/LinkComponentTest.php
@@ -20,7 +20,7 @@ public function test_link_component_can_be_rendered()
 
     public function test_link_component_can_be_rendered_with_route()
     {
-        $route = \Hyde\Routing\Route::get('index');
+        $route = \Hyde\Support\Models\Route::get('index');
         $this->assertEquals('<a href="index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
@@ -28,7 +28,7 @@ public function test_link_component_can_be_rendered_with_route()
     public function test_link_component_can_be_rendered_with_route_for_nested_pages()
     {
         View::share('currentPage', 'foo/bar');
-        $route = \Hyde\Routing\Route::get('index');
+        $route = \Hyde\Support\Models\Route::get('index');
         $this->assertEquals('<a href="../index.html">bar</a>', rtrim(
             Blade::render('<x-link href="'.$route.'">bar</x-link>')));
     }
diff --git a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
index f8bbe5c53fd..984f9b6b4e3 100644
--- a/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationLinkViewTest.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Views;
 
 use Hyde\Framework\Features\Navigation\NavItem;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 40e28c41fbc..59392df8d3a 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -8,7 +8,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 
 /**
  * Handle routing for a web page request.
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index b5f2189ff33..81262745fdf 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -6,7 +6,7 @@
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPage;
-use Hyde\Routing\Route;
+use Hyde\Support\Models\Route;
 use Illuminate\View\Component;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 

From a0ea468d994a056234634f275387bd7813422529 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 18:28:15 +0000
Subject: [PATCH 235/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index d4eb58713ac..45e27af5718 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -11,8 +11,8 @@
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
-use Stringable;
 use function str_replace;
+use Stringable;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages

From 35063a6fc6a96d119c6ba4163be5f38ec1bde2c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:30:01 +0200
Subject: [PATCH 236/768] Add note on discovery

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

diff --git a/packages/framework/src/Helpers/Redirect.php b/packages/framework/src/Helpers/Redirect.php
index 2791f2029c2..6b4de3c5524 100644
--- a/packages/framework/src/Helpers/Redirect.php
+++ b/packages/framework/src/Helpers/Redirect.php
@@ -12,6 +12,8 @@
  * The store method will then render the redirect page to the project's site output directory.
  * Once viewed in a web browser a meta refresh will redirect the user to the new location.
  *
+ * Since redirects are not discoverable, they also never show up in navigation, sitemaps, etc.
+ *
  * @example `Redirect::make('foo', 'bar')->store();`
  */
 class Redirect

From f9d76eb1901a55a1415414456e9e8440eae4510b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:35:23 +0200
Subject: [PATCH 237/768] Remove Route::home() method to reduce complexity

Method is only used in one place, that is semantically rather equal when inlined.
---
 .../components/navigation/navigation-brand.blade.php      | 2 +-
 packages/framework/src/Facades/Route.php                  | 8 --------
 packages/framework/src/Support/Models/Route.php           | 5 -----
 packages/framework/tests/Feature/RouteTest.php            | 5 -----
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/packages/framework/resources/views/components/navigation/navigation-brand.blade.php b/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
index d95a1d4c7d5..2c38f07f9e8 100644
--- a/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
@@ -1,3 +1,3 @@
-<a href="{{ Route::home() }}" class="font-bold px-4" aria-label="Home page">
+<a href="{{ Route::get('index') }}" class="font-bold px-4" aria-label="Home page">
     {{ config('site.name', 'HydePHP') }}
 </a>
\ No newline at end of file
diff --git a/packages/framework/src/Facades/Route.php b/packages/framework/src/Facades/Route.php
index 46b64f2073b..cf50fbe8bd4 100644
--- a/packages/framework/src/Facades/Route.php
+++ b/packages/framework/src/Facades/Route.php
@@ -53,14 +53,6 @@ public static function current(): ?\Hyde\Support\Models\Route
         return \Hyde\Support\Models\Route::current();
     }
 
-    /**
-     * Get the home route, usually the index page route.
-     */
-    public static function home(): ?\Hyde\Support\Models\Route
-    {
-        return \Hyde\Support\Models\Route::home();
-    }
-
     /**
      * Determine if the supplied route key exists in the route index.
      *
diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index 45e27af5718..b608c056afc 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -130,11 +130,6 @@ public static function current(): ?Route
         return Hyde::currentRoute();
     }
 
-    public static function home(): ?Route
-    {
-        return Route::get('index');
-    }
-
     public static function exists(string $routeKey): bool
     {
         return Hyde::routes()->has($routeKey);
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 5d509202cc2..ac75ec8f004 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -147,11 +147,6 @@ public function test_current_returns_null_if_route_is_not_found()
         $this->assertNull(Route::current());
     }
 
-    public function test_home_helper_returns_index_route()
-    {
-        $this->assertEquals(Route::get('index'), Route::home());
-    }
-
     public function test_to_array_method()
     {
         $this->assertEquals([

From 53aaeae994292d5cbd5c0ad3aeb1a29aaa16e417 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 20:57:09 +0200
Subject: [PATCH 238/768] Move down toArray method

---
 .../framework/src/Support/Models/Route.php    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index b608c056afc..601a69af48f 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -43,22 +43,6 @@ public function __toString(): string
         return $this->getLink();
     }
 
-    /**
-     * @return array<string, string>
-     */
-    public function toArray(): array
-    {
-        return [
-            'routeKey' => $this->getRouteKey(),
-            'sourcePath' => $this->getSourcePath(),
-            'outputPath' => $this->getOutputPath(),
-            'page' => [
-                'class' => $this->getPageClass(),
-                'identifier' => $this->getPageIdentifier(),
-            ],
-        ];
-    }
-
     /**
      * Resolve a site web link to the compiled page.
      * The path is relative to the current page being rendered, and uses pretty URLs if enabled.
@@ -110,6 +94,22 @@ public function is(Route|RouteKey|string $route): bool
         return $this->getRouteKey() === (string) $route;
     }
 
+    /**
+     * @return array<string, string>
+     */
+    public function toArray(): array
+    {
+        return [
+            'routeKey' => $this->getRouteKey(),
+            'sourcePath' => $this->getSourcePath(),
+            'outputPath' => $this->getOutputPath(),
+            'page' => [
+                'class' => $this->getPageClass(),
+                'identifier' => $this->getPageIdentifier(),
+            ],
+        ];
+    }
+
     public static function get(string $routeKey): ?Route
     {
         return Hyde::routes()->get(str_replace('.', '/', $routeKey));

From 8f9fcb13c5dd0052f540f722ab8d5c24c27fe1af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:05:08 +0200
Subject: [PATCH 239/768] Shorten comment

---
 packages/framework/src/Support/Models/Route.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index 601a69af48f..a8c88cce92f 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -44,8 +44,7 @@ public function __toString(): string
     }
 
     /**
-     * Resolve a site web link to the compiled page.
-     * The path is relative to the current page being rendered, and uses pretty URLs if enabled.
+     * Generate a link to the route destination, relative to the current route, and supports pretty URLs.
      */
     public function getLink(): string
     {

From bdff546de2bdff455f620798d0bbc545b29f95f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:09:25 +0200
Subject: [PATCH 240/768] Move up method

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

diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index a8c88cce92f..dec75eb613f 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -51,6 +51,11 @@ public function getLink(): string
         return Hyde::relativeLink($this->page->getLink());
     }
 
+    public function getPage(): HydePage
+    {
+        return $this->page;
+    }
+
     public function getPageClass(): string
     {
         return $this->page::class;
@@ -61,11 +66,6 @@ public function getPageIdentifier(): string
         return $this->page->getIdentifier();
     }
 
-    public function getPage(): HydePage
-    {
-        return $this->page;
-    }
-
     public function getRouteKey(): string
     {
         return $this->page->getRouteKey();

From 98fbd9148604d7f383de011cfb9fecedfd034a5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:12:44 +0200
Subject: [PATCH 241/768] Remove Site constructor as class is only used
 statically

---
 packages/framework/src/Support/Models/Site.php | 11 -----------
 packages/framework/tests/Feature/SiteTest.php  | 16 ----------------
 2 files changed, 27 deletions(-)

diff --git a/packages/framework/src/Support/Models/Site.php b/packages/framework/src/Support/Models/Site.php
index 99ba508fbb3..4aa003c401e 100644
--- a/packages/framework/src/Support/Models/Site.php
+++ b/packages/framework/src/Support/Models/Site.php
@@ -16,17 +16,6 @@ final class Site
     /** @var string The relative path to the output directory */
     public static string $outputPath;
 
-    public ?string $url;
-    public ?string $name;
-    public ?string $language;
-
-    public function __construct()
-    {
-        $this->url = self::url();
-        $this->name = self::name();
-        $this->language = self::language();
-    }
-
     public static function url(): ?string
     {
         return config('site.url');
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index 474e8c34151..fe2a31714ef 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -13,22 +13,6 @@
  */
 class SiteTest extends TestCase
 {
-    public function testConstruct()
-    {
-        $site = new Site();
-
-        $this->assertNotNull($site->name);
-        $this->assertNotNull($site->language);
-        $this->assertNotNull($site->url);
-
-        $this->assertEquals(config('site.name'), $site->name);
-        $this->assertEquals(config('site.language'), $site->language);
-        $this->assertEquals(config('site.url'), $site->url);
-
-        $this->assertSame(Site::name(), $site->name);
-        $this->assertSame(Site::language(), $site->language);
-        $this->assertSame(Site::url(), $site->url);
-    }
 
     public function testUrl()
     {

From 3ea095becb47f312f5c09d201112fdd8c23bc34a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:15:05 +0200
Subject: [PATCH 242/768] Move the Site class into Facades namespace

---
 config/app.php                                                | 2 +-
 packages/framework/src/{Support/Models => Facades}/Site.php   | 2 +-
 packages/framework/src/Foundation/Filesystem.php              | 2 +-
 .../src/Framework/Concerns/RegistersFileLocations.php         | 2 +-
 packages/framework/src/Framework/Services/BuildService.php    | 2 +-
 .../tests/Feature/BuildOutputDirectoryCanBeChangedTest.php    | 2 +-
 .../tests/Feature/Commands/BuildSearchCommandTest.php         | 2 +-
 packages/framework/tests/Feature/SiteTest.php                 | 4 ++--
 packages/framework/tests/Feature/StaticPageBuilderTest.php    | 2 +-
 packages/framework/tests/Feature/StaticSiteServiceTest.php    | 2 +-
 packages/framework/tests/Unit/HydeServiceProviderTest.php     | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/framework/src/{Support/Models => Facades}/Site.php (95%)

diff --git a/config/app.php b/config/app.php
index b845264787a..b39ac06ad6f 100644
--- a/config/app.php
+++ b/config/app.php
@@ -95,7 +95,7 @@
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
         'Asset' => \Hyde\Facades\Asset::class,
-        'Site' => \Hyde\Support\Models\Site::class,
+        'Site' => \Hyde\Facades\Site::class,
         'Route' => \Hyde\Facades\Route::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
diff --git a/packages/framework/src/Support/Models/Site.php b/packages/framework/src/Facades/Site.php
similarity index 95%
rename from packages/framework/src/Support/Models/Site.php
rename to packages/framework/src/Facades/Site.php
index 4aa003c401e..d8190109305 100644
--- a/packages/framework/src/Support/Models/Site.php
+++ b/packages/framework/src/Facades/Site.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Models;
+namespace Hyde\Facades;
 
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
 
diff --git a/packages/framework/src/Foundation/Filesystem.php b/packages/framework/src/Foundation/Filesystem.php
index 4d28fee4236..4aee6f9d5f7 100644
--- a/packages/framework/src/Foundation/Filesystem.php
+++ b/packages/framework/src/Foundation/Filesystem.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Foundation;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Site;
 
 /**
  * File helper methods, bound to the HydeKernel instance, and is an integral part of the framework.
diff --git a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
index ae93b8f40a8..5c3a9b52d3e 100644
--- a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
+++ b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Concerns;
 
-use Hyde\Support\Models\Site;
+use Hyde\Facades\Site;
 
 /**
  * This trait registers the file paths for important Hyde locations.
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index a33be791575..2d4a13ea805 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -5,12 +5,12 @@
 namespace Hyde\Framework\Services;
 
 use Closure;
+use Hyde\Facades\Site;
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
 use Hyde\Support\Models\Route;
-use Hyde\Support\Models\Site;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
index afa270cd197..ce40b9ba1f6 100644
--- a/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Feature/BuildOutputDirectoryCanBeChangedTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Services\RebuildService;
 use Hyde\Hyde;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index a49040f22b8..62635f71688 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature\Commands;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Hyde;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 
 /**
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index fe2a31714ef..44de79cd548 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Models\Site
+ * @covers \Hyde\Facades\Site
  */
 class SiteTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php
index 03ef7fdc9b1..bb9c0d0c761 100644
--- a/packages/framework/tests/Feature/StaticPageBuilderTest.php
+++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Hyde;
@@ -12,7 +13,6 @@
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 4b6b4c445da..8a916e7533c 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Site;
 use Hyde\Hyde;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index a4c63c449be..136405cd70d 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
+use Hyde\Facades\Site;
 use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\HydeServiceProvider;
 use Hyde\Framework\Services\AssetService;
@@ -12,7 +13,6 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
-use Hyde\Support\Models\Site;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Artisan;
 

From 11eb3bcd4abc17ddfd48d10e48a3bd434cb743b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:15:31 +0200
Subject: [PATCH 243/768] Sort aliases

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

diff --git a/config/app.php b/config/app.php
index b39ac06ad6f..640003d9db5 100644
--- a/config/app.php
+++ b/config/app.php
@@ -94,9 +94,9 @@
 
     'aliases' => [
         'Hyde' => Hyde\Hyde::class,
-        'Asset' => \Hyde\Facades\Asset::class,
         'Site' => \Hyde\Facades\Site::class,
         'Route' => \Hyde\Facades\Route::class,
+        'Asset' => \Hyde\Facades\Asset::class,
         'BladePage' => \Hyde\Pages\BladePage::class,
         'MarkdownPage' => \Hyde\Pages\MarkdownPage::class,
         'MarkdownPost' => \Hyde\Pages\MarkdownPost::class,

From 40fb86863c1115c01e8698a0731e24d85e86e60c Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 19:16:12 +0000
Subject: [PATCH 244/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index 44de79cd548..dd843f3640b 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -13,7 +13,6 @@
  */
 class SiteTest extends TestCase
 {
-
     public function testUrl()
     {
         $this->assertSame('http://localhost', Site::url());

From 91f2d22ff771b13baaae5c62c3a5aa7a6636b7af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:18:12 +0200
Subject: [PATCH 245/768] Move Meta to Facades namespace

---
 config/hyde.php                                               | 2 +-
 packages/framework/config/hyde.php                            | 2 +-
 packages/framework/src/{Helpers => Facades}/Meta.php          | 2 +-
 .../src/Framework/Features/Metadata/GlobalMetadataBag.php     | 2 +-
 .../src/Framework/Features/Metadata/PageMetadataBag.php       | 2 +-
 packages/framework/tests/Feature/GlobalMetadataBagTest.php    | 2 +-
 packages/framework/tests/Feature/MetadataHelperTest.php       | 4 ++--
 packages/framework/tests/Feature/MetadataTest.php             | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/framework/src/{Helpers => Facades}/Meta.php (99%)

diff --git a/config/hyde.php b/config/hyde.php
index a6d0443a665..4f4014feaaf 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Helpers\Features;
-use Hyde\Helpers\Meta;
 
 return [
     /*
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index a6d0443a665..4f4014feaaf 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Helpers\Features;
-use Hyde\Helpers\Meta;
 
 return [
     /*
diff --git a/packages/framework/src/Helpers/Meta.php b/packages/framework/src/Facades/Meta.php
similarity index 99%
rename from packages/framework/src/Helpers/Meta.php
rename to packages/framework/src/Facades/Meta.php
index 34280af7120..a7abe070386 100644
--- a/packages/framework/src/Helpers/Meta.php
+++ b/packages/framework/src/Facades/Meta.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Facades;
 
 use Hyde\Framework\Features\Metadata\Elements\LinkElement;
 use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index 15eddefc9ec..41337e5104d 100644
--- a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Features\Metadata;
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\RssFeedService;
 use Hyde\Helpers\Features;
-use Hyde\Helpers\Meta;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\View;
 
diff --git a/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
index e3345c7901d..6d8a39af2b7 100644
--- a/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Features\Metadata;
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPost;
 
 class PageMetadataBag extends MetadataBag
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index cb7d98e80b9..802962a32ab 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
-use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\View;
diff --git a/packages/framework/tests/Feature/MetadataHelperTest.php b/packages/framework/tests/Feature/MetadataHelperTest.php
index 773881ce2e5..e25d20817ca 100644
--- a/packages/framework/tests/Feature/MetadataHelperTest.php
+++ b/packages/framework/tests/Feature/MetadataHelperTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Metadata\GlobalMetadataBag;
-use Hyde\Helpers\Meta;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Helpers\Meta
+ * @covers \Hyde\Facades\Meta
  */
 class MetadataHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index 28deaaf23da..954990bc232 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Meta;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Metadata\Elements\LinkElement;
 use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
 use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
 use Hyde\Framework\Features\Metadata\MetadataBag;
-use Hyde\Helpers\Meta;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;

From 2adc0d480715bb96c5f711b7a2d2afcb7d688052 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:19:24 +0200
Subject: [PATCH 246/768] Move Redirect class to Support\Models namespace

---
 .../framework/src/{Helpers => Support/Models}/Redirect.php    | 2 +-
 packages/framework/tests/Feature/RedirectTest.php             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/src/{Helpers => Support/Models}/Redirect.php (97%)

diff --git a/packages/framework/src/Helpers/Redirect.php b/packages/framework/src/Support/Models/Redirect.php
similarity index 97%
rename from packages/framework/src/Helpers/Redirect.php
rename to packages/framework/src/Support/Models/Redirect.php
index 6b4de3c5524..ee8d4f6005a 100644
--- a/packages/framework/src/Helpers/Redirect.php
+++ b/packages/framework/src/Support/Models/Redirect.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Support\Models;
 
 use Hyde\Hyde;
 
diff --git a/packages/framework/tests/Feature/RedirectTest.php b/packages/framework/tests/Feature/RedirectTest.php
index dcee9623b56..4228e7fa4f0 100644
--- a/packages/framework/tests/Feature/RedirectTest.php
+++ b/packages/framework/tests/Feature/RedirectTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Helpers\Redirect;
 use Hyde\Hyde;
+use Hyde\Support\Models\Redirect;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Helpers\Redirect
+ * @covers \Hyde\Support\Models\Redirect
  */
 class RedirectTest extends TestCase
 {

From 62dfc249097d51c98d68a10671d4379ccaab22cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:20:21 +0200
Subject: [PATCH 247/768] Move Features class to Facades namespace

---
 config/hyde.php                                             | 2 +-
 packages/framework/config/hyde.php                          | 2 +-
 .../resources/views/components/post/article.blade.php       | 2 +-
 packages/framework/resources/views/layouts/docs.blade.php   | 2 +-
 packages/framework/resources/views/layouts/page.blade.php   | 2 +-
 .../framework/src/Console/Commands/BuildSiteCommand.php     | 2 +-
 packages/framework/src/{Helpers => Facades}/Features.php    | 4 +++-
 packages/framework/src/Foundation/FileCollection.php        | 2 +-
 packages/framework/src/Foundation/HydeKernel.php            | 4 ++--
 packages/framework/src/Foundation/PageCollection.php        | 2 +-
 .../DataCollections/DataCollectionServiceProvider.php       | 2 +-
 .../src/Framework/Features/Metadata/GlobalMetadataBag.php   | 2 +-
 .../framework/src/Framework/Services/MarkdownService.php    | 2 +-
 .../src/Framework/Services/SemanticDocumentationArticle.php | 2 +-
 .../framework/src/Framework/Services/ValidationService.php  | 2 +-
 packages/framework/src/Hyde.php                             | 2 +-
 .../framework/tests/Feature/ConfigurableFeaturesTest.php    | 4 ++--
 packages/framework/tests/Feature/DarkmodeFeatureTest.php    | 6 +++---
 packages/framework/tests/Feature/DataCollectionTest.php     | 2 +-
 packages/framework/tests/Feature/HydeKernelTest.php         | 2 +-
 .../framework/tests/Feature/Services/RssFeedServiceTest.php | 2 +-
 packages/framework/tests/Unit/HydeHelperFacadeTest.php      | 2 +-
 22 files changed, 28 insertions(+), 26 deletions(-)
 rename packages/framework/src/{Helpers => Facades}/Features.php (98%)

diff --git a/config/hyde.php b/config/hyde.php
index 4f4014feaaf..5bfed50e73c 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Helpers\Features;
 
 return [
     /*
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index 4f4014feaaf..5bfed50e73c 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Helpers\Features;
 
 return [
     /*
diff --git a/packages/framework/resources/views/components/post/article.blade.php b/packages/framework/resources/views/components/post/article.blade.php
index 798b318c6c2..33503dba886 100644
--- a/packages/framework/resources/views/components/post/article.blade.php
+++ b/packages/framework/resources/views/components/post/article.blade.php
@@ -1,6 +1,6 @@
 <article aria-label="Article" id="{{ Hyde::url("posts/$page->identifier", '') }}" itemscope
          itemtype="http://schema.org/Article"
-        @class(['post-article mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Helpers\Features::hasTorchlight()])>
+        @class(['post-article mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Facades\Features::hasTorchlight()])>
     <meta itemprop="identifier" content="{{ $page->identifier }}">
     @if(Hyde::hasSiteUrl())
         <meta itemprop="url" content="{{ Hyde::url('posts/' . $page->identifier) }}">
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index 227337256f4..b6ba4f7d65f 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -22,7 +22,7 @@ class="dark:bg-gray-900 min-h-screen bg-gray-50 md:bg-white absolute top-16 md:t
 <div id="support">
     @include('hyde::components.docs.sidebar-backdrop')
 
-    @if(Hyde\Helpers\Features::hasDocumentationSearch())
+    @if(Hyde\Facades\Features::hasDocumentationSearch())
         @include('hyde::components.docs.search-widget')
         @include('hyde::components.docs.search-scripts')
     @endif
diff --git a/packages/framework/resources/views/layouts/page.blade.php b/packages/framework/resources/views/layouts/page.blade.php
index 488426d7e95..45bdf520a08 100644
--- a/packages/framework/resources/views/layouts/page.blade.php
+++ b/packages/framework/resources/views/layouts/page.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 
     <main id="content" class="mx-auto max-w-7xl py-16 px-8">
-        <article @class(['mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Helpers\Features::hasTorchlight()])>
+        <article @class(['mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Facades\Features::hasTorchlight()])>
             {!! $markdown !!}
         </article>
     </main>
diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 54bf82b3c99..403ff4c6cf2 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Console\Commands;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use LaravelZero\Framework\Commands\Command;
diff --git a/packages/framework/src/Helpers/Features.php b/packages/framework/src/Facades/Features.php
similarity index 98%
rename from packages/framework/src/Helpers/Features.php
rename to packages/framework/src/Facades/Features.php
index 5e74cad02c5..a64dd56cbc5 100644
--- a/packages/framework/src/Helpers/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Facades;
 
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
@@ -10,6 +10,8 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 use JsonSerializable;
+use function count;
+use function str_starts_with;
 
 /**
  * Allows features to be enabled and disabled in a simple object-oriented manner.
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index 17f6feceb5f..29695b1889d 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Foundation;
 
+use Hyde\Facades\Features;
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\DiscoveryService;
-use Hyde\Helpers\Features;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
diff --git a/packages/framework/src/Foundation/HydeKernel.php b/packages/framework/src/Foundation/HydeKernel.php
index 7a916b75f07..6abe2df7791 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Foundation;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Traits\Macroable;
@@ -82,7 +82,7 @@ public function hasFeature(string $feature): bool
 
     /**
      * @inheritDoc
-     * @psalm-return array{basePath: string, features: \Hyde\Helpers\Features, pages: \Hyde\Foundation\PageCollection, routes: \Hyde\Foundation\RouteCollection}
+     * @psalm-return array{basePath: string, features: \Hyde\Facades\Features, pages: \Hyde\Foundation\PageCollection, routes: \Hyde\Foundation\RouteCollection}
      */
     public function toArray(): array
     {
diff --git a/packages/framework/src/Foundation/PageCollection.php b/packages/framework/src/Foundation/PageCollection.php
index 98805c840bd..db498dc595a 100644
--- a/packages/framework/src/Foundation/PageCollection.php
+++ b/packages/framework/src/Foundation/PageCollection.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Foundation;
 
+use Hyde\Facades\Features;
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\FileNotFoundException;
-use Hyde\Helpers\Features;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
diff --git a/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php b/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
index c2df6393ca5..5c262523a43 100644
--- a/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
+++ b/packages/framework/src/Framework/Features/DataCollections/DataCollectionServiceProvider.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Features\DataCollections;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Features\DataCollections\Facades\MarkdownCollection;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\ServiceProvider;
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index 41337e5104d..4aedb64cb4a 100644
--- a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Features\Metadata;
 
+use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
 use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\RssFeedService;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\View;
 
diff --git a/packages/framework/src/Framework/Services/MarkdownService.php b/packages/framework/src/Framework/Services/MarkdownService.php
index 2f20ee68131..13869ba22af 100644
--- a/packages/framework/src/Framework/Services/MarkdownService.php
+++ b/packages/framework/src/Framework/Services/MarkdownService.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Services;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Concerns\Internal\SetsUpMarkdownConverter;
-use Hyde\Helpers\Features;
 use Hyde\Markdown\Contracts\MarkdownPostProcessorContract as PostProcessor;
 use Hyde\Markdown\Contracts\MarkdownPreProcessorContract as PreProcessor;
 use Hyde\Markdown\MarkdownConverter;
diff --git a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
index 70330eee8ca..e9c655c83c6 100644
--- a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Str;
 
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index ac97bda4409..c2f4286ff16 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Hyde;
 use Hyde\Support\Models\ValidationResult as Result;
 
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 3b3ec413f20..0137c264a17 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -4,12 +4,12 @@
 
 namespace Hyde;
 
+use Hyde\Facades\Features;
 use Hyde\Foundation\FileCollection;
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PageCollection;
 use Hyde\Foundation\RouteCollection;
 use Hyde\Framework\Concerns\HydePage;
-use Hyde\Helpers\Features;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\Facade;
 
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 6d36dcc7d07..50577ae1ded 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Helpers\Features
+ * @covers \Hyde\Facades\Features
  */
 class ConfigurableFeaturesTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
index 52815d23fa1..cc7868d8f57 100644
--- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php
+++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Config;
 
 /**
- * @covers \Hyde\Helpers\Features::darkmode
- * @covers \Hyde\Helpers\Features::hasDarkmode
+ * @covers \Hyde\Facades\Features::darkmode
+ * @covers \Hyde\Facades\Features::hasDarkmode
  */
 class DarkmodeFeatureTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/DataCollectionTest.php b/packages/framework/tests/Feature/DataCollectionTest.php
index 7532d5d838d..5a3ccb47f49 100644
--- a/packages/framework/tests/Feature/DataCollectionTest.php
+++ b/packages/framework/tests/Feature/DataCollectionTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Features\DataCollections\DataCollection;
 use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
 use Hyde\Framework\Features\DataCollections\Facades\MarkdownCollection;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\MarkdownDocument;
 use Hyde\Testing\TestCase;
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index d193f190d05..46861f50618 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Composer\InstalledVersions;
+use Hyde\Facades\Features;
 use Hyde\Foundation\HydeKernel;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
 use Hyde\Pages\DocumentationPage;
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index 67a652a91a5..9da43297058 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Services\RssFeedService;
-use Hyde\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/HydeHelperFacadeTest.php b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
index 3c90a6aefd7..e8ca9eb8843 100644
--- a/packages/framework/tests/Unit/HydeHelperFacadeTest.php
+++ b/packages/framework/tests/Unit/HydeHelperFacadeTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Helpers\Features;
+use Hyde\Facades\Features;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 

From 428a62864115450e0d8141aa425a6c9fcfb8a04d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:20:38 +0200
Subject: [PATCH 248/768] Move Includes class to Facades namespace

---
 packages/framework/resources/views/layouts/footer.blade.php | 2 +-
 packages/framework/src/{Helpers => Facades}/Includes.php    | 2 +-
 packages/framework/tests/Feature/IncludesFacadeTest.php     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/framework/src/{Helpers => Facades}/Includes.php (99%)

diff --git a/packages/framework/resources/views/layouts/footer.blade.php b/packages/framework/resources/views/layouts/footer.blade.php
index 8a182f357bc..1034578fa24 100644
--- a/packages/framework/resources/views/layouts/footer.blade.php
+++ b/packages/framework/resources/views/layouts/footer.blade.php
@@ -1,7 +1,7 @@
 @if(config('hyde.footer') !== false)
     <footer aria-label="Page footer" class="flex py-4 px-6 w-full text-center mt-auto bg-slate-100 dark:bg-gray-800">
         <div class="prose dark:prose-invert text-center mx-auto">
-            {!! \Hyde\Helpers\Includes::markdown('footer',
+            {!! \Hyde\Facades\Includes::markdown('footer',
                     config('hyde.footer', 'Site proudly built with [HydePHP](https://github.com/hydephp/hyde) 🎩')) !!}
         </div>
         <a href="#app" aria-label="Go to top of page" class="float-right">
diff --git a/packages/framework/src/Helpers/Includes.php b/packages/framework/src/Facades/Includes.php
similarity index 99%
rename from packages/framework/src/Helpers/Includes.php
rename to packages/framework/src/Facades/Includes.php
index 87b04bb2df9..1f9764f18a7 100644
--- a/packages/framework/src/Helpers/Includes.php
+++ b/packages/framework/src/Facades/Includes.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Helpers;
+namespace Hyde\Facades;
 
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
diff --git a/packages/framework/tests/Feature/IncludesFacadeTest.php b/packages/framework/tests/Feature/IncludesFacadeTest.php
index 7c2a3a93479..943c0ef3a87 100644
--- a/packages/framework/tests/Feature/IncludesFacadeTest.php
+++ b/packages/framework/tests/Feature/IncludesFacadeTest.php
@@ -4,13 +4,13 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Helpers\Includes;
+use Hyde\Facades\Includes;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\File;
 
 /**
- * @covers \Hyde\Helpers\Includes
+ * @covers \Hyde\Facades\Includes
  */
 class IncludesFacadeTest extends TestCase
 {

From b514ffe5fb878892e76160533b5c118f430378b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:21:19 +0200
Subject: [PATCH 249/768] Add todos

---
 packages/framework/src/Facades/Features.php | 1 +
 packages/framework/src/Facades/Includes.php | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index a64dd56cbc5..ddb0b5b13dc 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -15,6 +15,7 @@
 
 /**
  * Allows features to be enabled and disabled in a simple object-oriented manner.
+ * @todo Split facade logic to service/manager class.
  *
  * @see \Hyde\Framework\Testing\Feature\ConfigurableFeaturesTest
  *
diff --git a/packages/framework/src/Facades/Includes.php b/packages/framework/src/Facades/Includes.php
index 1f9764f18a7..32b030b4c50 100644
--- a/packages/framework/src/Facades/Includes.php
+++ b/packages/framework/src/Facades/Includes.php
@@ -8,6 +8,9 @@
 use Hyde\Markdown\Models\Markdown;
 use Illuminate\Support\Facades\Blade;
 
+/**
+ * @todo Split facade logic to service/manager class.
+ */
 class Includes
 {
     /**

From 109dcfff4f02d030019ca5342e7b57d9f830c41e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 19:21:32 +0000
Subject: [PATCH 250/768] Apply fixes from StyleCI

---
 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 ddb0b5b13dc..8380a94f9bf 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -4,17 +4,18 @@
 
 namespace Hyde\Facades;
 
+use function count;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 use JsonSerializable;
-use function count;
 use function str_starts_with;
 
 /**
  * Allows features to be enabled and disabled in a simple object-oriented manner.
+ *
  * @todo Split facade logic to service/manager class.
  *
  * @see \Hyde\Framework\Testing\Feature\ConfigurableFeaturesTest

From 0b8c4bd5229e4a6d98d1a1e17203e9ce563e1f49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:25:26 +0200
Subject: [PATCH 251/768] Change namespace of HydePage class

---
 .../src/Foundation/Concerns/ManagesViewData.php        |  5 ++---
 packages/framework/src/Foundation/FileCollection.php   |  2 +-
 packages/framework/src/Foundation/PageCollection.php   |  6 +++---
 packages/framework/src/Foundation/RouteCollection.php  |  2 +-
 .../Constructors/FindsNavigationDataForPage.php        |  4 ++--
 .../Actions/Constructors/FindsTitleForPage.php         |  2 +-
 .../src/Framework/Actions/SourceFileParser.php         |  2 +-
 .../src/Framework/Actions/StaticPageBuilder.php        |  4 ++--
 .../src/Framework/Concerns/BaseMarkdownPage.php        |  3 ++-
 .../src/Framework/Concerns/RegistersFileLocations.php  |  1 +
 .../src/Framework/Concerns/ValidatesExistence.php      |  2 +-
 .../PostBuildTasks/GenerateBuildManifest.php           |  4 ++--
 .../Framework/Features/Metadata/GlobalMetadataBag.php  |  2 +-
 .../Framework/Features/Metadata/PageMetadataBag.php    |  2 +-
 .../src/Framework/Features/Navigation/NavItem.php      |  2 +-
 .../framework/src/Framework/Services/BuildService.php  |  2 +-
 .../src/Framework/Services/DiscoveryService.php        | 10 +++++-----
 packages/framework/src/Hyde.php                        |  2 +-
 .../src/Markdown/Contracts/FrontMatter/PageSchema.php  |  2 +-
 .../FrontMatter/SubSchemas/NavigationSchema.php        |  2 +-
 packages/framework/src/Pages/BladePage.php             |  2 +-
 .../src/{Framework => Pages}/Concerns/HydePage.php     |  3 ++-
 packages/framework/src/Pages/HtmlPage.php              |  2 +-
 packages/framework/src/Support/Models/File.php         |  8 ++++----
 packages/framework/src/Support/Models/Route.php        |  4 ++--
 packages/framework/src/Support/Models/RouteKey.php     |  2 +-
 packages/framework/tests/Feature/HydePageTest.php      |  4 ++--
 packages/framework/tests/Feature/MetadataTest.php      |  2 +-
 packages/framework/tests/Unit/NavItemTest.php          |  2 +-
 .../tests/Unit/PageModelGetAllFilesHelperTest.php      |  2 +-
 .../framework/tests/Unit/PageModelGetHelperTest.php    |  2 +-
 .../framework/tests/Unit/PageModelParseHelperTest.php  |  2 +-
 packages/realtime-compiler/src/Routing/PageRouter.php  |  2 +-
 packages/testing/src/TestCase.php                      |  2 +-
 34 files changed, 51 insertions(+), 49 deletions(-)
 rename packages/framework/src/{Framework => Pages}/Concerns/HydePage.php (99%)

diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 9df079e91b8..5e8be62248d 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Foundation\Concerns;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\View;
 
@@ -18,9 +17,9 @@ trait ManagesViewData
     /**
      * Share data for the page being rendered.
      *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page
+     * @param  \Hyde\Pages\Concerns\HydePage  $page
      */
-    public function shareViewData(HydePage $page): void
+    public function shareViewData(\Hyde\Pages\Concerns\HydePage $page): void
     {
         View::share('page', $page);
         View::share('currentPage', $page->getRouteKey());
diff --git a/packages/framework/src/Foundation/FileCollection.php b/packages/framework/src/Foundation/FileCollection.php
index 29695b1889d..d0d9923cc0f 100644
--- a/packages/framework/src/Foundation/FileCollection.php
+++ b/packages/framework/src/Foundation/FileCollection.php
@@ -6,9 +6,9 @@
 
 use Hyde\Facades\Features;
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
diff --git a/packages/framework/src/Foundation/PageCollection.php b/packages/framework/src/Foundation/PageCollection.php
index db498dc595a..5217652f377 100644
--- a/packages/framework/src/Foundation/PageCollection.php
+++ b/packages/framework/src/Foundation/PageCollection.php
@@ -6,9 +6,9 @@
 
 use Hyde\Facades\Features;
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\HtmlPage;
 use Hyde\Pages\MarkdownPage;
@@ -66,8 +66,8 @@ protected function discoverPagesFor(string $pageClass): void
     }
 
     /**
-     * @param  string<\Hyde\Framework\Concerns\HydePage>  $pageClass
-     * @return \Illuminate\Support\Collection<\Hyde\Framework\Concerns\HydePage>
+     * @param  string<\Hyde\Pages\Concerns\HydePage>  $pageClass
+     * @return \Illuminate\Support\Collection<\Hyde\Pages\Concerns\HydePage>
      */
     protected function parsePagesFor(string $pageClass): Collection
     {
diff --git a/packages/framework/src/Foundation/RouteCollection.php b/packages/framework/src/Foundation/RouteCollection.php
index 540b0117956..0ee2689a2ee 100644
--- a/packages/framework/src/Foundation/RouteCollection.php
+++ b/packages/framework/src/Foundation/RouteCollection.php
@@ -5,7 +5,7 @@
 namespace Hyde\Foundation;
 
 use Hyde\Foundation\Concerns\BaseFoundationCollection;
-use Hyde\Framework\Concerns\HydePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index b0a608ea054..b13994074df 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
@@ -17,7 +17,7 @@
  * @internal
  *
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
- * @see \Hyde\Framework\Concerns\HydePage
+ * @see \Hyde\Pages\Concerns\HydePage
  */
 final class FindsNavigationDataForPage
 {
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
index 439285139ba..b5a53093e7f 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Actions\Constructors;
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
diff --git a/packages/framework/src/Framework/Actions/SourceFileParser.php b/packages/framework/src/Framework/Actions/SourceFileParser.php
index fa365e5d0fa..833712fbe67 100644
--- a/packages/framework/src/Framework/Actions/SourceFileParser.php
+++ b/packages/framework/src/Framework/Actions/SourceFileParser.php
@@ -5,9 +5,9 @@
 namespace Hyde\Framework\Actions;
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Concerns\ValidatesExistence;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * Parses a source file and returns a new page model instance for it.
diff --git a/packages/framework/src/Framework/Actions/StaticPageBuilder.php b/packages/framework/src/Framework/Actions/StaticPageBuilder.php
index b295e194fc1..907fecd6ac7 100644
--- a/packages/framework/src/Framework/Actions/StaticPageBuilder.php
+++ b/packages/framework/src/Framework/Actions/StaticPageBuilder.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * Converts a Page Model into a static HTML page.
@@ -20,7 +20,7 @@ class StaticPageBuilder
     /**
      * Construct the class.
      *
-     * @param  \Hyde\Framework\Concerns\HydePage  $page  the Page to compile into HTML
+     * @param  \Hyde\Pages\Concerns\HydePage  $page  the Page to compile into HTML
      * @param  bool  $selfInvoke  if set to true the class will invoke when constructed
      */
     public function __construct(protected HydePage $page, bool $selfInvoke = false)
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
index ec23df57a80..c4c7a1a212e 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
@@ -8,6 +8,7 @@
 use Hyde\Markdown\Contracts\MarkdownDocumentContract;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * The base class for all Markdown-based page models.
@@ -15,7 +16,7 @@
  * @see \Hyde\Pages\MarkdownPage
  * @see \Hyde\Pages\MarkdownPost
  * @see \Hyde\Pages\DocumentationPage
- * @see \Hyde\Framework\Concerns\HydePage
+ * @see \Hyde\Pages\Concerns\HydePage
  * @see \Hyde\Framework\Testing\Feature\HydePageTest
  */
 abstract class BaseMarkdownPage extends HydePage implements MarkdownDocumentContract
diff --git a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
index 5c3a9b52d3e..59f9e25debc 100644
--- a/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
+++ b/packages/framework/src/Framework/Concerns/RegistersFileLocations.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Concerns;
 
 use Hyde\Facades\Site;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * This trait registers the file paths for important Hyde locations.
diff --git a/packages/framework/src/Framework/Concerns/ValidatesExistence.php b/packages/framework/src/Framework/Concerns/ValidatesExistence.php
index a544da69bb0..91467ccc41d 100644
--- a/packages/framework/src/Framework/Concerns/ValidatesExistence.php
+++ b/packages/framework/src/Framework/Concerns/ValidatesExistence.php
@@ -21,7 +21,7 @@ trait ValidatesExistence
      */
     public function validateExistence(string $model, string $slug): void
     {
-        /** @var \Hyde\Framework\Concerns\HydePage $model */
+        /** @var \Hyde\Pages\Concerns\HydePage $model */
         $filepath = $model::sourceDirectory().'/'.
             $slug.$model::fileExtension();
 
diff --git a/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
index 114a3d1eff9..fa648d6e901 100644
--- a/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
+++ b/packages/framework/src/Framework/Features/BuildTasks/PostBuildTasks/GenerateBuildManifest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Features\BuildTasks\PostBuildTasks;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Services\ChecksumService;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Support\Collection;
 
@@ -28,7 +28,7 @@ public function run(): void
     {
         $pages = new Collection();
 
-        /** @var \Hyde\Framework\Concerns\HydePage $page */
+        /** @var \Hyde\Pages\Concerns\HydePage $page */
         foreach (Hyde::pages() as $page) {
             $pages->push([
                 'source_path' => $page->getSourcePath(),
diff --git a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
index 4aedb64cb4a..c160ba75362 100644
--- a/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/GlobalMetadataBag.php
@@ -6,9 +6,9 @@
 
 use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Services\RssFeedService;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Illuminate\Support\Facades\View;
 
 /**
diff --git a/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
index 6d8a39af2b7..65516005e61 100644
--- a/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/PageMetadataBag.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Features\Metadata;
 
 use Hyde\Facades\Meta;
-use Hyde\Framework\Concerns\HydePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPost;
 
 class PageMetadataBag extends MetadataBag
diff --git a/packages/framework/src/Framework/Features/Navigation/NavItem.php b/packages/framework/src/Framework/Features/Navigation/NavItem.php
index bad84db3776..1ebaf3e2409 100644
--- a/packages/framework/src/Framework/Features/Navigation/NavItem.php
+++ b/packages/framework/src/Framework/Features/Navigation/NavItem.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Features\Navigation;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Str;
 use Stringable;
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
index 2d4a13ea805..7649f5a4b63 100644
--- a/packages/framework/src/Framework/Services/BuildService.php
+++ b/packages/framework/src/Framework/Services/BuildService.php
@@ -73,7 +73,7 @@ function ($filepath) {
     }
 
     /**
-     * @return \Hyde\Foundation\RouteCollection<array-key, class-string<\Hyde\Framework\Concerns\HydePage>>
+     * @return \Hyde\Foundation\RouteCollection<array-key, class-string<\Hyde\Pages\Concerns\HydePage>>
      */
     protected function getDiscoveredModels(): RouteCollection
     {
diff --git a/packages/framework/src/Framework/Services/DiscoveryService.php b/packages/framework/src/Framework/Services/DiscoveryService.php
index 3c2125337be..0dfe2bbb4c7 100644
--- a/packages/framework/src/Framework/Services/DiscoveryService.php
+++ b/packages/framework/src/Framework/Services/DiscoveryService.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Services;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\UnsupportedPageTypeException;
 use Hyde\Hyde;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
@@ -29,7 +29,7 @@ class DiscoveryService
     /**
      * Supply a model::class constant and get a list of all the existing source file base names.
      *
-     * @param  string<\Hyde\Framework\Concerns\HydePage>  $model
+     * @param  string<\Hyde\Pages\Concerns\HydePage>  $model
      * @return array
      *
      * @throws \Hyde\Framework\Exceptions\UnsupportedPageTypeException
@@ -52,13 +52,13 @@ public static function getSourceFileListForModel(string $model): array
 
     public static function getModelFileExtension(string $model): string
     {
-        /** @var \Hyde\Framework\Concerns\HydePage $model */
+        /** @var \Hyde\Pages\Concerns\HydePage $model */
         return $model::fileExtension();
     }
 
     public static function getModelSourceDirectory(string $model): string
     {
-        /** @var \Hyde\Framework\Concerns\HydePage $model */
+        /** @var \Hyde\Pages\Concerns\HydePage $model */
         return $model::sourceDirectory();
     }
 
@@ -94,7 +94,7 @@ public static function getMediaAssetFiles(): array
     /**
      * Create a filepath that can be opened in the browser from a terminal.
      *
-     * @param  string<\Hyde\Framework\Concerns\HydePage>  $filepath
+     * @param  string<\Hyde\Pages\Concerns\HydePage>  $filepath
      * @return string
      */
     public static function createClickableFilepath(string $filepath): string
diff --git a/packages/framework/src/Hyde.php b/packages/framework/src/Hyde.php
index 0137c264a17..f96c273fe2d 100644
--- a/packages/framework/src/Hyde.php
+++ b/packages/framework/src/Hyde.php
@@ -9,7 +9,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Foundation\PageCollection;
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Concerns\HydePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\Facade;
 
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
index 46d47ee1173..06b3d9fce9d 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Contracts\FrontMatter;
 
 /**
- * @see \Hyde\Framework\Concerns\HydePage
+ * @see \Hyde\Pages\Concerns\HydePage
  */
 interface PageSchema extends \Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema
 {
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
index 61e547e63c7..14c8049ad90 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/NavigationSchema.php
@@ -6,7 +6,7 @@
 
 /**
  * @see \Hyde\Framework\Features\Navigation\NavigationData
- * @see \Hyde\Framework\Concerns\HydePage
+ * @see \Hyde\Pages\Concerns\HydePage
  */
 interface NavigationSchema
 {
diff --git a/packages/framework/src/Pages/BladePage.php b/packages/framework/src/Pages/BladePage.php
index 55bb4871984..604373b4ccc 100644
--- a/packages/framework/src/Pages/BladePage.php
+++ b/packages/framework/src/Pages/BladePage.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Pages;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * Page class for Blade pages.
diff --git a/packages/framework/src/Framework/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
similarity index 99%
rename from packages/framework/src/Framework/Concerns/HydePage.php
rename to packages/framework/src/Pages/Concerns/HydePage.php
index 5313fb6dccc..35a977a315f 100644
--- a/packages/framework/src/Framework/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Concerns;
+namespace Hyde\Pages\Concerns;
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
+use Hyde\Framework\Concerns\HasFrontMatter;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Factories\Concerns\HasFactory;
 use Hyde\Framework\Features\Metadata\PageMetadataBag;
diff --git a/packages/framework/src/Pages/HtmlPage.php b/packages/framework/src/Pages/HtmlPage.php
index 5ce72b1c51a..7a8fe693fb8 100644
--- a/packages/framework/src/Pages/HtmlPage.php
+++ b/packages/framework/src/Pages/HtmlPage.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Pages;
 
-use Hyde\Framework\Concerns\HydePage;
+use Hyde\Pages\Concerns\HydePage;
 
 /**
  * Page class for HTML pages.
diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index 59f33b3b39a..f216e0c5730 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -29,13 +29,13 @@ class File implements Arrayable, JsonSerializable, Stringable
     /**
      * If the file is associated with a page, the class can be specified here.
      *
-     * @var string<\Hyde\Framework\Concerns\HydePage>|null
+     * @var string<\Hyde\Pages\Concerns\HydePage>|null
      */
     public ?string $belongsTo = null;
 
     /**
      * @param  string  $path  The path relative to the project root.
-     * @param  class-string<\Hyde\Framework\Concerns\HydePage>|null  $belongsToClass
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>|null  $belongsToClass
      * @return \Hyde\Framework\Models\Support\File
      */
     public static function make(string $path, ?string $belongsToClass = null): static
@@ -45,7 +45,7 @@ public static function make(string $path, ?string $belongsToClass = null): stati
 
     /**
      * @param  string  $path  The path relative to the project root.
-     * @param  string<\Hyde\Framework\Concerns\HydePage>|null  $belongsToClass
+     * @param  string<\Hyde\Pages\Concerns\HydePage>|null  $belongsToClass
      */
     public function __construct(string $path, ?string $belongsToClass = null)
     {
@@ -65,7 +65,7 @@ public function __toString(): string
      * Supply a page class to associate with this file,
      * or leave blank to get the file's associated class.
      *
-     * @param  string<\Hyde\Framework\Concerns\HydePage>|null  $class
+     * @param  string<\Hyde\Pages\Concerns\HydePage>|null  $class
      * @return string|$this|null
      */
     public function belongsTo(?string $class = null): null|string|static
diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index dec75eb613f..23e828a2d0e 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -5,14 +5,14 @@
 namespace Hyde\Support\Models;
 
 use Hyde\Foundation\RouteCollection;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Exceptions\RouteNotFoundException;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
-use function str_replace;
 use Stringable;
+use function str_replace;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages
diff --git a/packages/framework/src/Support/Models/RouteKey.php b/packages/framework/src/Support/Models/RouteKey.php
index be2c99109ca..1bc1b4bf8ef 100644
--- a/packages/framework/src/Support/Models/RouteKey.php
+++ b/packages/framework/src/Support/Models/RouteKey.php
@@ -41,7 +41,7 @@ public function get(): string
 
     public static function fromPage(string $pageClass, string $identifier): self
     {
-        /** @var \Hyde\Framework\Concerns\HydePage $pageClass */
+        /** @var \Hyde\Pages\Concerns\HydePage $pageClass */
         return new self(unslash($pageClass::outputDirectory().'/'.$identifier));
     }
 }
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index c5122af81b6..cc048105c5f 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -5,10 +5,10 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Concerns\BaseMarkdownPage;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
@@ -22,7 +22,7 @@
  * so we will use the MarkdownPage class as a proxy,
  * since it's the simplest implementation.
  *
- * @covers \Hyde\Framework\Concerns\HydePage
+ * @covers \Hyde\Pages\Concerns\HydePage
  * @covers \Hyde\Framework\Concerns\BaseMarkdownPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index 954990bc232..a067458e59a 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Facades\Meta;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Metadata\Elements\LinkElement;
 use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
 use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
 use Hyde\Framework\Features\Metadata\MetadataBag;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
diff --git a/packages/framework/tests/Unit/NavItemTest.php b/packages/framework/tests/Unit/NavItemTest.php
index f7bcdf2bc98..9e7ca842de1 100644
--- a/packages/framework/tests/Unit/NavItemTest.php
+++ b/packages/framework/tests/Unit/NavItemTest.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Testing\Unit;
 
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Framework\Features\Navigation\NavItem;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Hyde\Testing\TestCase;
 
diff --git a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
index fe9cb872dd8..be44db16bba 100644
--- a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php
@@ -12,7 +12,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @see \Hyde\Framework\Concerns\HydePage::files()
+ * @see \Hyde\Pages\Concerns\HydePage::files()
  */
 class PageModelGetAllFilesHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/PageModelGetHelperTest.php b/packages/framework/tests/Unit/PageModelGetHelperTest.php
index 6b2af27b4f4..1f9907e21b8 100644
--- a/packages/framework/tests/Unit/PageModelGetHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelGetHelperTest.php
@@ -13,7 +13,7 @@
 use Illuminate\Support\Collection;
 
 /**
- * @see \Hyde\Framework\Concerns\HydePage::all()
+ * @see \Hyde\Pages\Concerns\HydePage::all()
  */
 class PageModelGetHelperTest extends TestCase
 {
diff --git a/packages/framework/tests/Unit/PageModelParseHelperTest.php b/packages/framework/tests/Unit/PageModelParseHelperTest.php
index d49f6d1623c..5db6c0cca05 100644
--- a/packages/framework/tests/Unit/PageModelParseHelperTest.php
+++ b/packages/framework/tests/Unit/PageModelParseHelperTest.php
@@ -12,7 +12,7 @@
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Concerns\HydePage::parse
+ * @covers \Hyde\Pages\Concerns\HydePage::parse
  */
 class PageModelParseHelperTest extends TestCase
 {
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 59392df8d3a..7ce3db5da99 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -5,7 +5,7 @@
 use Desilva\Microserve\Request;
 use Desilva\Microserve\Response;
 use Hyde\Framework\Actions\StaticPageBuilder;
-use Hyde\Framework\Concerns\HydePage;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
 use Hyde\Support\Models\Route;
diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 81262745fdf..ed1577df8f4 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -3,8 +3,8 @@
 namespace Hyde\Testing;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Concerns\HydePage;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Illuminate\View\Component;

From 5436000069ffcd81d04d8f9cddfa8f3672008f25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:26:04 +0200
Subject: [PATCH 252/768] Change namespace of BaseMarkdownPage class

---
 .../src/Framework/Actions/Constructors/FindsTitleForPage.php  | 2 +-
 packages/framework/src/Framework/Actions/SourceFileParser.php | 4 ++--
 .../src/{Framework => Pages}/Concerns/BaseMarkdownPage.php    | 3 +--
 packages/framework/src/Pages/Concerns/HydePage.php            | 2 +-
 packages/framework/src/Pages/DocumentationPage.php            | 2 +-
 packages/framework/src/Pages/MarkdownPage.php                 | 2 +-
 packages/framework/src/Pages/MarkdownPost.php                 | 2 +-
 packages/framework/tests/Feature/HydePageTest.php             | 4 ++--
 8 files changed, 10 insertions(+), 11 deletions(-)
 rename packages/framework/src/{Framework => Pages}/Concerns/BaseMarkdownPage.php (96%)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
index b5a53093e7f..f6f893bb27d 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Actions\Constructors;
 
-use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Pages\Concerns\HydePage;
 
 /**
diff --git a/packages/framework/src/Framework/Actions/SourceFileParser.php b/packages/framework/src/Framework/Actions/SourceFileParser.php
index 833712fbe67..e8cc4e87c14 100644
--- a/packages/framework/src/Framework/Actions/SourceFileParser.php
+++ b/packages/framework/src/Framework/Actions/SourceFileParser.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Concerns\ValidatesExistence;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Pages\Concerns\HydePage;
 
 /**
@@ -57,7 +57,7 @@ protected function parseBladePage(): BladePage
 
     protected function parseMarkdownPage(string $pageClass): BaseMarkdownPage
     {
-        /** @var \Hyde\Framework\Concerns\BaseMarkdownPage $pageClass */
+        /** @var \Hyde\Pages\Concerns\BaseMarkdownPage $pageClass */
         $document = MarkdownFileParser::parse(
             $pageClass::sourcePath($this->identifier)
         );
diff --git a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php b/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
similarity index 96%
rename from packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
rename to packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
index c4c7a1a212e..f538d9ee644 100644
--- a/packages/framework/src/Framework/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Concerns;
+namespace Hyde\Pages\Concerns;
 
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\MarkdownDocumentContract;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\Concerns\HydePage;
 
 /**
  * The base class for all Markdown-based page models.
diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index 35a977a315f..8e799a2b382 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -33,7 +33,7 @@
  * and you can then access the parsed file from the HydeKernel's page index.
  * The source files are usually parsed by the SourceFileParser action.
  *
- * @see \Hyde\Framework\Concerns\BaseMarkdownPage
+ * @see \Hyde\Pages\Concerns\BaseMarkdownPage
  * @see \Hyde\Framework\Testing\Feature\HydePageTest
  */
 abstract class HydePage implements CompilableContract, PageSchema
diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index fd26cd1921c..498501d13bf 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -5,8 +5,8 @@
 namespace Hyde\Pages;
 
 use Hyde\Framework\Actions\GeneratesSidebarTableOfContents;
-use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Support\Models\Route;
 
 /**
diff --git a/packages/framework/src/Pages/MarkdownPage.php b/packages/framework/src/Pages/MarkdownPage.php
index 064f2ee6113..86e8b9d2b26 100644
--- a/packages/framework/src/Pages/MarkdownPage.php
+++ b/packages/framework/src/Pages/MarkdownPage.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Pages;
 
-use Hyde\Framework\Concerns\BaseMarkdownPage;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 
 /**
  * Page class for Markdown pages.
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 058668b18c4..7389f7a4625 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -5,10 +5,10 @@
 namespace Hyde\Pages;
 
 use Hyde\Foundation\PageCollection;
-use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Support\Models\DateString;
 
 /**
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index cc048105c5f..60f86553593 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Concerns\BaseMarkdownPage;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\BladePage;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPage;
@@ -23,7 +23,7 @@
  * since it's the simplest implementation.
  *
  * @covers \Hyde\Pages\Concerns\HydePage
- * @covers \Hyde\Framework\Concerns\BaseMarkdownPage
+ * @covers \Hyde\Pages\Concerns\BaseMarkdownPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
  * @covers \Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage

From 93e3f9ba1ce2e61b65d4067fc8e9bda029deb36b Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 19:27:26 +0000
Subject: [PATCH 253/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Support/Models/Route.php b/packages/framework/src/Support/Models/Route.php
index 23e828a2d0e..169dcd8fbc5 100644
--- a/packages/framework/src/Support/Models/Route.php
+++ b/packages/framework/src/Support/Models/Route.php
@@ -11,8 +11,8 @@
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
-use Stringable;
 use function str_replace;
+use Stringable;
 
 /**
  * The Route class bridges the gaps between Hyde pages and their respective compiled static webpages

From aa46b5a7964df2672b56436ed52782f5939ba3b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:30:30 +0200
Subject: [PATCH 254/768] Add stub from contract to base class

---
 packages/framework/src/Pages/Concerns/HydePage.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index 8e799a2b382..bf1dcfd73e6 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -149,6 +149,13 @@ public static function outputPath(string $identifier): string
         return RouteKey::fromPage(static::class, $identifier).'.html';
     }
 
+    /**
+     * Compile the page into static HTML.
+     *
+     * @return string The compiled HTML for the page.
+     */
+    abstract public function compile(): string;
+
     /**
      * Get the path to the instance source file, relative to the project root.
      */

From 55237aff42c16971e58f4610e286cafbd74e802b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:31:28 +0200
Subject: [PATCH 255/768] Inline contract annotations

---
 packages/framework/src/Pages/Concerns/HydePage.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index bf1dcfd73e6..cfb6d4bc2a6 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -165,7 +165,9 @@ public function getSourcePath(): string
     }
 
     /**
-     * Get the path where the compiled page instance will be saved.
+     * Get the path where the compiled page will be saved.
+     *
+     * @return string Path relative to the site output directory.
      */
     public function getOutputPath(): string
     {
@@ -227,7 +229,9 @@ public function getIdentifier(): string
     }
 
     /**
-     * Get the Blade template key for the page.
+     * Get the Blade template for the page.
+     *
+     * @return string Blade template/view key.
      */
     public function getBladeView(): string
     {

From 7527d12f5ac27639210e5136dc1f4d12305d5e50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:31:56 +0200
Subject: [PATCH 256/768] No longer implement CompilableContract

---
 packages/framework/src/Pages/Concerns/HydePage.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index cfb6d4bc2a6..ea01c9c7e13 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -15,7 +15,6 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
-use Hyde\Support\Contracts\CompilableContract;
 use Hyde\Support\Models\Route;
 use Hyde\Support\Models\RouteKey;
 
@@ -36,7 +35,7 @@
  * @see \Hyde\Pages\Concerns\BaseMarkdownPage
  * @see \Hyde\Framework\Testing\Feature\HydePageTest
  */
-abstract class HydePage implements CompilableContract, PageSchema
+abstract class HydePage implements PageSchema
 {
     use ConstructsPageSchemas;
     use HasFrontMatter;

From f91bc1552ba551c582073d2a14d514757bc246d7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:32:18 +0200
Subject: [PATCH 257/768] Remove unused interface CompilableContract

---
 .../Support/Contracts/CompilableContract.php  | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/packages/framework/src/Support/Contracts/CompilableContract.php b/packages/framework/src/Support/Contracts/CompilableContract.php
index b0f871e8f6c..ce7ebe2ae1b 100644
--- a/packages/framework/src/Support/Contracts/CompilableContract.php
+++ b/packages/framework/src/Support/Contracts/CompilableContract.php
@@ -4,26 +4,3 @@
 
 namespace Hyde\Support\Contracts;
 
-interface CompilableContract
-{
-    /**
-     * Compile the page into static HTML.
-     *
-     * @return string The compiled HTML for the page.
-     */
-    public function compile(): string;
-
-    /**
-     * Get the path where the compiled page will be saved.
-     *
-     * @return string Path relative to the site output directory.
-     */
-    public function getOutputPath(): string;
-
-    /**
-     * Get the Blade template for the page.
-     *
-     * @return string Blade template/view key.
-     */
-    public function getBladeView(): string;
-}

From 89b2e4886b8a96bcf1b12dbb6e2851f8ce197521 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:32:22 +0200
Subject: [PATCH 258/768] Delete CompilableContract.php

---
 .../framework/src/Support/Contracts/CompilableContract.php  | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 packages/framework/src/Support/Contracts/CompilableContract.php

diff --git a/packages/framework/src/Support/Contracts/CompilableContract.php b/packages/framework/src/Support/Contracts/CompilableContract.php
deleted file mode 100644
index ce7ebe2ae1b..00000000000
--- a/packages/framework/src/Support/Contracts/CompilableContract.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Support\Contracts;
-

From 957043a8f5270b83aa6e4638aaa76a46eb2549c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:34:13 +0200
Subject: [PATCH 259/768] Remove unnecessary property override

---
 packages/framework/src/Pages/Concerns/BaseMarkdownPage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php b/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
index f538d9ee644..9c3c863923a 100644
--- a/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
+++ b/packages/framework/src/Pages/Concerns/BaseMarkdownPage.php
@@ -20,7 +20,6 @@
  */
 abstract class BaseMarkdownPage extends HydePage implements MarkdownDocumentContract
 {
-    public string $identifier;
     public Markdown $markdown;
 
     public static string $fileExtension = '.md';

From 712c98b38393dcd9c3833154e87eb195d21c7aa6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:44:03 +0200
Subject: [PATCH 260/768] Deprecate internal trait

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index af239bbb3c7..91092bb4d11 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -10,6 +10,9 @@
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 
+/**
+ * @deprecated Refactor to use factories instead.
+ */
 trait ConstructsPageSchemas
 {
     protected function constructPageSchemas(): void

From ca55170b301ed6db81c13aa0b677cf509c68867d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:47:31 +0200
Subject: [PATCH 261/768] Move class ValidationResult to new Validation
 namespace

---
 .../Features/Validation}/ValidationResult.php                 | 2 +-
 .../framework/src/Framework/Services/ValidationService.php    | 2 +-
 .../framework/tests/Feature/Commands/ValidateCommandTest.php  | 2 +-
 .../tests/Feature/Services/ValidationServiceTest.php          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/framework/src/{Support/Models => Framework/Features/Validation}/ValidationResult.php (98%)

diff --git a/packages/framework/src/Support/Models/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
similarity index 98%
rename from packages/framework/src/Support/Models/ValidationResult.php
rename to packages/framework/src/Framework/Features/Validation/ValidationResult.php
index edfa034a143..cd990901b80 100644
--- a/packages/framework/src/Support/Models/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Models;
+namespace Hyde\Framework\Features\Validation;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index c2f4286ff16..56a6ab88ef9 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Facades\Features;
+use Hyde\Framework\Features\Validation\ValidationResult as Result;
 use Hyde\Hyde;
-use Hyde\Support\Models\ValidationResult as Result;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 7e2be55cc1c..58ed18cdeef 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Support\Models\ValidationResult
+ * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 28e437d49ee..9f7c73073ba 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -4,16 +4,16 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
+use Hyde\Framework\Features\Validation\ValidationResult;
 use Hyde\Framework\Services\ValidationService;
 use Hyde\Hyde;
-use Hyde\Support\Models\ValidationResult;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Support\Models\ValidationResult
+ * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */

From dc0271b69b99de202f46455730542903894fd664 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:51:31 +0200
Subject: [PATCH 262/768] Convert concatenation to string interpolation

---
 .../Framework/Features/Validation/ValidationResult.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index cd990901b80..863b84eb882 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -116,26 +116,26 @@ protected function formatResult(string $message): string
 
     protected function formatPassed(string $message): string
     {
-        return '<fg=white;bg=green> PASS <fg=green> '.$message.'</></>';
+        return "<fg=white;bg=green> PASS <fg=green> $message</></>";
     }
 
     protected function formatFailed(string $message): string
     {
-        return '<fg=gray;bg=yellow> FAIL <fg=yellow> '.$message.'</></>';
+        return "<fg=gray;bg=yellow> FAIL <fg=yellow> $message</></>";
     }
 
     protected function formatSkipped(string $message): string
     {
-        return '<fg=white;bg=gray> SKIP <fg=gray> '.$message.'</></>';
+        return "<fg=white;bg=gray> SKIP <fg=gray> $message</></>";
     }
 
     protected function formatTimeString(string $time): string
     {
-        return '<fg=gray> ('.$time.'ms)</>';
+        return "<fg=gray> ({$time}ms)</>";
     }
 
     protected function formatTip(string $tip): string
     {
-        return '<fg=gray>'.$tip.'</>';
+        return "<fg=gray>$tip</>";
     }
 }

From 88a0ad21b3c97e01298814da5ff73272314d6ea1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:54:06 +0200
Subject: [PATCH 263/768] Introduce constants for status codes

---
 .../Features/Validation/ValidationResult.php       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index 863b84eb882..e124d9f4baf 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -10,6 +10,10 @@
  */
 class ValidationResult
 {
+    const PASSED = 0;
+    const SKIPPED = 1;
+    const FAILED = 2;
+
     public string $message;
     public string $tip;
 
@@ -81,13 +85,13 @@ public function failed(): bool
     public function statusCode(): int
     {
         if ($this->skipped()) {
-            return 1;
+            return self::SKIPPED;
         }
         if ($this->passed()) {
-            return 0;
+            return self::PASSED;
         }
 
-        return 2;
+        return self::FAILED;
     }
 
     public function message(): string
@@ -108,8 +112,8 @@ public function formattedMessage(?string $withTimeString = null): string
     protected function formatResult(string $message): string
     {
         return match ($this->statusCode()) {
-            0 => $this->formatPassed($message),
-            2 => $this->formatFailed($message),
+            self::PASSED => $this->formatPassed($message),
+            self::FAILED => $this->formatFailed($message),
             default => $this->formatSkipped($message),
         };
     }

From b9b01ee5922500be2053d34c7bf33ce36a829f02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:54:40 +0200
Subject: [PATCH 264/768] Make constants protected

---
 .../src/Framework/Features/Validation/ValidationResult.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index e124d9f4baf..8ed8bb36ca0 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -10,9 +10,9 @@
  */
 class ValidationResult
 {
-    const PASSED = 0;
-    const SKIPPED = 1;
-    const FAILED = 2;
+    protected const PASSED = 0;
+    protected const SKIPPED = 1;
+    protected const FAILED = 2;
 
     public string $message;
     public string $tip;

From 25bb1de93ffcbe60ee3bfad4a6f2f99e744c8f84 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:54:49 +0200
Subject: [PATCH 265/768] Make constants public

---
 .../src/Framework/Features/Validation/ValidationResult.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index 8ed8bb36ca0..e30661062a3 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -10,9 +10,9 @@
  */
 class ValidationResult
 {
-    protected const PASSED = 0;
-    protected const SKIPPED = 1;
-    protected const FAILED = 2;
+    public const PASSED = 0;
+    public const SKIPPED = 1;
+    public const FAILED = 2;
 
     public string $message;
     public string $tip;

From 2d4e40577c889317c4cd2f92e4334284a62d7882 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:55:30 +0200
Subject: [PATCH 266/768] Extract helper for shared code

---
 .../Features/Validation/ValidationResult.php  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index e30661062a3..28cc1ee5aba 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -28,9 +28,7 @@ public function __construct(string $defaultMessage = 'Generic check')
     public function pass(?string $withMessage = null): static
     {
         $this->passed = true;
-        if ($withMessage) {
-            $this->message = $withMessage;
-        }
+        $this->withMessage($withMessage);
 
         return $this;
     }
@@ -38,9 +36,7 @@ public function pass(?string $withMessage = null): static
     public function fail(?string $withMessage = null): static
     {
         $this->passed = false;
-        if ($withMessage) {
-            $this->message = $withMessage;
-        }
+        $this->withMessage($withMessage);
 
         return $this;
     }
@@ -48,9 +44,7 @@ public function fail(?string $withMessage = null): static
     public function skip(?string $withMessage = null): static
     {
         $this->skipped = true;
-        if ($withMessage) {
-            $this->message = $withMessage;
-        }
+        $this->withMessage($withMessage);
 
         return $this;
     }
@@ -142,4 +136,11 @@ protected function formatTip(string $tip): string
     {
         return "<fg=gray>$tip</>";
     }
+
+    protected function withMessage(?string $withMessage): void
+    {
+        if ($withMessage) {
+            $this->message = $withMessage;
+        }
+    }
 }

From d9153b29dc54a7ff58a8d9976622ddd1a556a437 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:56:09 +0200
Subject: [PATCH 267/768] Return static instead of void

---
 .../src/Framework/Features/Validation/ValidationResult.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index 28cc1ee5aba..bfa6e5759a6 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -137,10 +137,12 @@ protected function formatTip(string $tip): string
         return "<fg=gray>$tip</>";
     }
 
-    protected function withMessage(?string $withMessage): void
+    protected function withMessage(?string $withMessage): static
     {
         if ($withMessage) {
             $this->message = $withMessage;
         }
+
+        return $this;
     }
 }

From 9f829b6880666fac9a488eb382a6896497066f85 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:56:40 +0200
Subject: [PATCH 268/768] Shorten return operation

---
 .../Features/Validation/ValidationResult.php         | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index bfa6e5759a6..c090b688884 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -28,25 +28,19 @@ public function __construct(string $defaultMessage = 'Generic check')
     public function pass(?string $withMessage = null): static
     {
         $this->passed = true;
-        $this->withMessage($withMessage);
-
-        return $this;
+        return $this->withMessage($withMessage);
     }
 
     public function fail(?string $withMessage = null): static
     {
         $this->passed = false;
-        $this->withMessage($withMessage);
-
-        return $this;
+        return $this->withMessage($withMessage);
     }
 
     public function skip(?string $withMessage = null): static
     {
         $this->skipped = true;
-        $this->withMessage($withMessage);
-
-        return $this;
+        return $this->withMessage($withMessage);
     }
 
     public function withTip(string $withTip): static

From 00c693473ec5d60b4f9effe7c08eaba779e333f3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 21:56:47 +0200
Subject: [PATCH 269/768] Add spacing before return value

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

diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
index c090b688884..4e9be38900f 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationResult.php
@@ -28,18 +28,21 @@ public function __construct(string $defaultMessage = 'Generic check')
     public function pass(?string $withMessage = null): static
     {
         $this->passed = true;
+
         return $this->withMessage($withMessage);
     }
 
     public function fail(?string $withMessage = null): static
     {
         $this->passed = false;
+
         return $this->withMessage($withMessage);
     }
 
     public function skip(?string $withMessage = null): static
     {
         $this->skipped = true;
+
         return $this->withMessage($withMessage);
     }
 

From 9ce89ab45672570226e7a2877afd366c0e168d35 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:02:11 +0200
Subject: [PATCH 270/768] Move class ValidationService to Features\Validation
 namespace

---
 .../framework/src/Console/Commands/ValidateCommand.php |  2 +-
 .../Validation}/ValidationService.php                  |  5 ++++-
 .../tests/Feature/Commands/ValidateCommandTest.php     |  2 +-
 .../tests/Feature/Services/ValidationServiceTest.php   | 10 +++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)
 rename packages/framework/src/Framework/{Services => Features/Validation}/ValidationService.php (97%)

diff --git a/packages/framework/src/Console/Commands/ValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
index 87b1cfaf1e6..1e250842560 100644
--- a/packages/framework/src/Console/Commands/ValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Services\ValidationService;
+use Hyde\Framework\Features\Validation\ValidationService;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Features/Validation/ValidationService.php
similarity index 97%
rename from packages/framework/src/Framework/Services/ValidationService.php
rename to packages/framework/src/Framework/Features/Validation/ValidationService.php
index 56a6ab88ef9..7875f287d2d 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationService.php
@@ -2,11 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Services;
+namespace Hyde\Framework\Features\Validation;
 
 use Hyde\Facades\Features;
 use Hyde\Framework\Features\Validation\ValidationResult as Result;
+use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use function count;
+use function str_starts_with;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 58ed18cdeef..8d64e5834c9 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -8,7 +8,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
- * @covers \Hyde\Framework\Services\ValidationService
+ * @covers \Hyde\Framework\Features\Validation\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 9f7c73073ba..bb3f3a73c75 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -5,27 +5,27 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Features\Validation\ValidationResult;
-use Hyde\Framework\Services\ValidationService;
+use Hyde\Framework\Features\Validation\ValidationService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
- * @covers \Hyde\Framework\Services\ValidationService
+ * @covers \Hyde\Framework\Features\Validation\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationServiceTest extends TestCase
 {
-    protected ValidationService $service;
+    protected \Hyde\Framework\Features\Validation\ValidationService $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new ValidationService();
+        $this->service = new \Hyde\Framework\Features\Validation\ValidationService();
     }
 
     // Rather meta, but lets us know that the method assertions are correct, and gives us test coverage
@@ -44,7 +44,7 @@ public function test_checks_returns_an_array_of_validation_check_methods()
         // Assert each key starts with 'check_' and is a valid class method name
         foreach ($checks as $check) {
             $this->assertStringStartsWith('check_', $check);
-            $this->assertTrue(method_exists(ValidationService::class, $check));
+            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\ValidationService::class, $check));
         }
     }
 

From 50d075f885440d48d1a9285a6c2a601aa7bd7b9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:03:38 +0200
Subject: [PATCH 271/768] Rename ValidationService to SiteValidator

---
 .github/workflows/continuous-integration.yml         |  2 +-
 .../src/Console/Commands/ValidateCommand.php         | 10 +++++-----
 .../{ValidationService.php => SiteValidator.php}     |  2 +-
 .../tests/Feature/Commands/ValidateCommandTest.php   |  2 +-
 .../tests/Feature/Services/ValidationServiceTest.php | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/framework/src/Framework/Features/Validation/{ValidationService.php => SiteValidator.php} (99%)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 3689272b43e..d93bd1ab1f1 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -346,7 +346,7 @@ jobs:
         run: vendor/bin/parallel-lint --colors app config packages tests --show-deprecated
 
       - name: Check coding syntax/standards (PHP CodeSniffer)
-        run: vendor/bin/phpcs --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,ValidationService.php" || true
+        run: vendor/bin/phpcs --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,SiteValidator.php" || true
 
       - name: Run static analysis (Psalm/Shepherd)
         run: vendor/bin/psalm --shepherd || true
diff --git a/packages/framework/src/Console/Commands/ValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
index 1e250842560..97ad0ded613 100644
--- a/packages/framework/src/Console/Commands/ValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Features\Validation\ValidationService;
+use Hyde\Framework\Features\Validation\SiteValidator;
 use LaravelZero\Framework\Commands\Command;
 
 /**
@@ -21,13 +21,13 @@ class ValidateCommand extends Command
     protected float $time_start;
     protected float $time_total = 0;
 
-    protected ValidationService $service;
+    protected SiteValidator $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new ValidationService();
+        $this->service = new SiteValidator();
     }
 
     public function handle(): int
@@ -36,7 +36,7 @@ public function handle(): int
 
         $this->newLine();
 
-        foreach (ValidationService::checks() as $check) {
+        foreach (SiteValidator::checks() as $check) {
             $this->check($check);
         }
 
@@ -66,6 +66,6 @@ protected function time(): string
 
     protected function timeTotal(): string
     {
-        return'<fg=gray>Ran '.sizeof(ValidationService::checks()).' checks in '.number_format($this->time_total, 2).'ms</>';
+        return'<fg=gray>Ran '.sizeof(SiteValidator::checks()).' checks in '.number_format($this->time_total, 2).'ms</>';
     }
 }
diff --git a/packages/framework/src/Framework/Features/Validation/ValidationService.php b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
similarity index 99%
rename from packages/framework/src/Framework/Features/Validation/ValidationService.php
rename to packages/framework/src/Framework/Features/Validation/SiteValidator.php
index 7875f287d2d..2cc01338b2b 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationService.php
+++ b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
@@ -15,7 +15,7 @@
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
-class ValidationService
+class SiteValidator
 {
     /** @return string[] */
     public static function checks(): array
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 8d64e5834c9..a92be0293d9 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -8,7 +8,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
- * @covers \Hyde\Framework\Features\Validation\ValidationService
+ * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index bb3f3a73c75..84812f7c23b 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -5,27 +5,27 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Features\Validation\ValidationResult;
-use Hyde\Framework\Features\Validation\ValidationService;
+use Hyde\Framework\Features\Validation\SiteValidator;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
- * @covers \Hyde\Framework\Features\Validation\ValidationService
+ * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationServiceTest extends TestCase
 {
-    protected \Hyde\Framework\Features\Validation\ValidationService $service;
+    protected \Hyde\Framework\Features\Validation\SiteValidator $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new \Hyde\Framework\Features\Validation\ValidationService();
+        $this->service = new \Hyde\Framework\Features\Validation\SiteValidator();
     }
 
     // Rather meta, but lets us know that the method assertions are correct, and gives us test coverage
@@ -38,13 +38,13 @@ protected function test(string $method, int $expectedStatusCode)
 
     public function test_checks_returns_an_array_of_validation_check_methods()
     {
-        $checks = ValidationService::checks();
+        $checks = SiteValidator::checks();
         $this->assertIsArray($checks);
 
         // Assert each key starts with 'check_' and is a valid class method name
         foreach ($checks as $check) {
             $this->assertStringStartsWith('check_', $check);
-            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\ValidationService::class, $check));
+            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\SiteValidator::class, $check));
         }
     }
 

From 1dbb543df90db01f2a12b91408d1309cf7f42017 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:04:22 +0200
Subject: [PATCH 272/768] Rename test for renamed class

---
 .../framework/tests/Feature/Commands/ValidateCommandTest.php  | 2 +-
 .../{ValidationServiceTest.php => SiteValidatorTest.php}      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/tests/Feature/Services/{ValidationServiceTest.php => SiteValidatorTest.php} (98%)

diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index a92be0293d9..703e8f7aa19 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -11,7 +11,7 @@
  * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
- * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
+ * @see \Hyde\Framework\Testing\Feature\Services\SiteValidatorTest
  */
 class ValidateCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/SiteValidatorTest.php
similarity index 98%
rename from packages/framework/tests/Feature/Services/ValidationServiceTest.php
rename to packages/framework/tests/Feature/Services/SiteValidatorTest.php
index 84812f7c23b..a241ad5ef21 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SiteValidatorTest.php
@@ -10,14 +10,14 @@
 use Hyde\Testing\TestCase;
 
 /**
- * Class ValidationServiceTest.
+ * Class SiteValidatorTest.
  *
  * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
-class ValidationServiceTest extends TestCase
+class SiteValidatorTest extends TestCase
 {
     protected \Hyde\Framework\Features\Validation\SiteValidator $service;
 

From 45798d3b4280bead606ae8252d4d14cde7f8c1ef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:04:55 +0200
Subject: [PATCH 273/768] Add noinspection tag as methods are entry points

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

diff --git a/packages/framework/src/Framework/Features/Validation/SiteValidator.php b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
index 2cc01338b2b..6815269d05f 100644
--- a/packages/framework/src/Framework/Features/Validation/SiteValidator.php
+++ b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */
 
 declare(strict_types=1);
 

From 45b8e55c00787fd33d271b486d8cc970f3b143bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:05:49 +0200
Subject: [PATCH 274/768] Revert "Add noinspection tag as methods are entry
 points"

This reverts commit 45798d3b4280bead606ae8252d4d14cde7f8c1ef.
---
 .../src/Framework/Features/Validation/SiteValidator.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Validation/SiteValidator.php b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
index 6815269d05f..2cc01338b2b 100644
--- a/packages/framework/src/Framework/Features/Validation/SiteValidator.php
+++ b/packages/framework/src/Framework/Features/Validation/SiteValidator.php
@@ -1,4 +1,4 @@
-<?php /** @noinspection PhpUnused */
+<?php
 
 declare(strict_types=1);
 

From 44ab025c866964eab43bf260426d044a4123c75e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:05:53 +0200
Subject: [PATCH 275/768] Revert "Rename test for renamed class"

This reverts commit 1dbb543df90db01f2a12b91408d1309cf7f42017.
---
 .../framework/tests/Feature/Commands/ValidateCommandTest.php  | 2 +-
 .../{SiteValidatorTest.php => ValidationServiceTest.php}      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/framework/tests/Feature/Services/{SiteValidatorTest.php => ValidationServiceTest.php} (98%)

diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 703e8f7aa19..a92be0293d9 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -11,7 +11,7 @@
  * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
- * @see \Hyde\Framework\Testing\Feature\Services\SiteValidatorTest
+ * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
 class ValidateCommandTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/Services/SiteValidatorTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
similarity index 98%
rename from packages/framework/tests/Feature/Services/SiteValidatorTest.php
rename to packages/framework/tests/Feature/Services/ValidationServiceTest.php
index a241ad5ef21..84812f7c23b 100644
--- a/packages/framework/tests/Feature/Services/SiteValidatorTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -10,14 +10,14 @@
 use Hyde\Testing\TestCase;
 
 /**
- * Class SiteValidatorTest.
+ * Class ValidationServiceTest.
  *
  * @covers \Hyde\Framework\Features\Validation\SiteValidator
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
-class SiteValidatorTest extends TestCase
+class ValidationServiceTest extends TestCase
 {
     protected \Hyde\Framework\Features\Validation\SiteValidator $service;
 

From 2858a8b33a8ca33f5afe268f0f8cd53bda11e3d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:05:56 +0200
Subject: [PATCH 276/768] Revert "Rename ValidationService to SiteValidator"

This reverts commit 50d075f885440d48d1a9285a6c2a601aa7bd7b9e.
---
 .github/workflows/continuous-integration.yml         |  2 +-
 .../src/Console/Commands/ValidateCommand.php         | 10 +++++-----
 .../{SiteValidator.php => ValidationService.php}     |  2 +-
 .../tests/Feature/Commands/ValidateCommandTest.php   |  2 +-
 .../tests/Feature/Services/ValidationServiceTest.php | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/framework/src/Framework/Features/Validation/{SiteValidator.php => ValidationService.php} (99%)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index d93bd1ab1f1..3689272b43e 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -346,7 +346,7 @@ jobs:
         run: vendor/bin/parallel-lint --colors app config packages tests --show-deprecated
 
       - name: Check coding syntax/standards (PHP CodeSniffer)
-        run: vendor/bin/phpcs --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,SiteValidator.php" || true
+        run: vendor/bin/phpcs --colors --cache=build/cache/phpcs.cache packages --standard=PSR2 --extensions="php" --ignore="*test.php,*.blade.php,ValidationService.php" || true
 
       - name: Run static analysis (Psalm/Shepherd)
         run: vendor/bin/psalm --shepherd || true
diff --git a/packages/framework/src/Console/Commands/ValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
index 97ad0ded613..1e250842560 100644
--- a/packages/framework/src/Console/Commands/ValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Features\Validation\SiteValidator;
+use Hyde\Framework\Features\Validation\ValidationService;
 use LaravelZero\Framework\Commands\Command;
 
 /**
@@ -21,13 +21,13 @@ class ValidateCommand extends Command
     protected float $time_start;
     protected float $time_total = 0;
 
-    protected SiteValidator $service;
+    protected ValidationService $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new SiteValidator();
+        $this->service = new ValidationService();
     }
 
     public function handle(): int
@@ -36,7 +36,7 @@ public function handle(): int
 
         $this->newLine();
 
-        foreach (SiteValidator::checks() as $check) {
+        foreach (ValidationService::checks() as $check) {
             $this->check($check);
         }
 
@@ -66,6 +66,6 @@ protected function time(): string
 
     protected function timeTotal(): string
     {
-        return'<fg=gray>Ran '.sizeof(SiteValidator::checks()).' checks in '.number_format($this->time_total, 2).'ms</>';
+        return'<fg=gray>Ran '.sizeof(ValidationService::checks()).' checks in '.number_format($this->time_total, 2).'ms</>';
     }
 }
diff --git a/packages/framework/src/Framework/Features/Validation/SiteValidator.php b/packages/framework/src/Framework/Features/Validation/ValidationService.php
similarity index 99%
rename from packages/framework/src/Framework/Features/Validation/SiteValidator.php
rename to packages/framework/src/Framework/Features/Validation/ValidationService.php
index 2cc01338b2b..7875f287d2d 100644
--- a/packages/framework/src/Framework/Features/Validation/SiteValidator.php
+++ b/packages/framework/src/Framework/Features/Validation/ValidationService.php
@@ -15,7 +15,7 @@
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
-class SiteValidator
+class ValidationService
 {
     /** @return string[] */
     public static function checks(): array
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index a92be0293d9..8d64e5834c9 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -8,7 +8,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
- * @covers \Hyde\Framework\Features\Validation\SiteValidator
+ * @covers \Hyde\Framework\Features\Validation\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 84812f7c23b..bb3f3a73c75 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -5,27 +5,27 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Features\Validation\ValidationResult;
-use Hyde\Framework\Features\Validation\SiteValidator;
+use Hyde\Framework\Features\Validation\ValidationService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
- * @covers \Hyde\Framework\Features\Validation\SiteValidator
+ * @covers \Hyde\Framework\Features\Validation\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationServiceTest extends TestCase
 {
-    protected \Hyde\Framework\Features\Validation\SiteValidator $service;
+    protected \Hyde\Framework\Features\Validation\ValidationService $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new \Hyde\Framework\Features\Validation\SiteValidator();
+        $this->service = new \Hyde\Framework\Features\Validation\ValidationService();
     }
 
     // Rather meta, but lets us know that the method assertions are correct, and gives us test coverage
@@ -38,13 +38,13 @@ protected function test(string $method, int $expectedStatusCode)
 
     public function test_checks_returns_an_array_of_validation_check_methods()
     {
-        $checks = SiteValidator::checks();
+        $checks = ValidationService::checks();
         $this->assertIsArray($checks);
 
         // Assert each key starts with 'check_' and is a valid class method name
         foreach ($checks as $check) {
             $this->assertStringStartsWith('check_', $check);
-            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\SiteValidator::class, $check));
+            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\ValidationService::class, $check));
         }
     }
 

From 6b9afe6e50e90448c625f0820846b5e127b58721 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:05:59 +0200
Subject: [PATCH 277/768] Revert "Move class ValidationService to
 Features\Validation namespace"

This reverts commit 9ce89ab45672570226e7a2877afd366c0e168d35.
---
 .../framework/src/Console/Commands/ValidateCommand.php |  2 +-
 .../Validation => Services}/ValidationService.php      |  5 +----
 .../tests/Feature/Commands/ValidateCommandTest.php     |  2 +-
 .../tests/Feature/Services/ValidationServiceTest.php   | 10 +++++-----
 4 files changed, 8 insertions(+), 11 deletions(-)
 rename packages/framework/src/Framework/{Features/Validation => Services}/ValidationService.php (97%)

diff --git a/packages/framework/src/Console/Commands/ValidateCommand.php b/packages/framework/src/Console/Commands/ValidateCommand.php
index 1e250842560..87b1cfaf1e6 100644
--- a/packages/framework/src/Console/Commands/ValidateCommand.php
+++ b/packages/framework/src/Console/Commands/ValidateCommand.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Features\Validation\ValidationService;
+use Hyde\Framework\Services\ValidationService;
 use LaravelZero\Framework\Commands\Command;
 
 /**
diff --git a/packages/framework/src/Framework/Features/Validation/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
similarity index 97%
rename from packages/framework/src/Framework/Features/Validation/ValidationService.php
rename to packages/framework/src/Framework/Services/ValidationService.php
index 7875f287d2d..56a6ab88ef9 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -2,14 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Features\Validation;
+namespace Hyde\Framework\Services;
 
 use Hyde\Facades\Features;
 use Hyde\Framework\Features\Validation\ValidationResult as Result;
-use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
-use function count;
-use function str_starts_with;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 8d64e5834c9..58ed18cdeef 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -8,7 +8,7 @@
 
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
- * @covers \Hyde\Framework\Features\Validation\ValidationService
+ * @covers \Hyde\Framework\Services\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index bb3f3a73c75..9f7c73073ba 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -5,27 +5,27 @@
 namespace Hyde\Framework\Testing\Feature\Services;
 
 use Hyde\Framework\Features\Validation\ValidationResult;
-use Hyde\Framework\Features\Validation\ValidationService;
+use Hyde\Framework\Services\ValidationService;
 use Hyde\Hyde;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
- * @covers \Hyde\Framework\Features\Validation\ValidationService
+ * @covers \Hyde\Framework\Services\ValidationService
  * @covers \Hyde\Framework\Features\Validation\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */
 class ValidationServiceTest extends TestCase
 {
-    protected \Hyde\Framework\Features\Validation\ValidationService $service;
+    protected ValidationService $service;
 
     public function __construct()
     {
         parent::__construct();
 
-        $this->service = new \Hyde\Framework\Features\Validation\ValidationService();
+        $this->service = new ValidationService();
     }
 
     // Rather meta, but lets us know that the method assertions are correct, and gives us test coverage
@@ -44,7 +44,7 @@ public function test_checks_returns_an_array_of_validation_check_methods()
         // Assert each key starts with 'check_' and is a valid class method name
         foreach ($checks as $check) {
             $this->assertStringStartsWith('check_', $check);
-            $this->assertTrue(method_exists(\Hyde\Framework\Features\Validation\ValidationService::class, $check));
+            $this->assertTrue(method_exists(ValidationService::class, $check));
         }
     }
 

From 1f5ba864f6d680fb7760b22eb1ed43d3608f7605 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:06:15 +0200
Subject: [PATCH 278/768] Revert "Move class ValidationResult to new Validation
 namespace"

This reverts commit ca55170b301ed6db81c13aa0b677cf509c68867d.
---
 .../framework/src/Framework/Services/ValidationService.php    | 2 +-
 .../Validation => Support/Models}/ValidationResult.php        | 2 +-
 .../framework/tests/Feature/Commands/ValidateCommandTest.php  | 2 +-
 .../tests/Feature/Services/ValidationServiceTest.php          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/framework/src/{Framework/Features/Validation => Support/Models}/ValidationResult.php (98%)

diff --git a/packages/framework/src/Framework/Services/ValidationService.php b/packages/framework/src/Framework/Services/ValidationService.php
index 56a6ab88ef9..c2f4286ff16 100644
--- a/packages/framework/src/Framework/Services/ValidationService.php
+++ b/packages/framework/src/Framework/Services/ValidationService.php
@@ -5,8 +5,8 @@
 namespace Hyde\Framework\Services;
 
 use Hyde\Facades\Features;
-use Hyde\Framework\Features\Validation\ValidationResult as Result;
 use Hyde\Hyde;
+use Hyde\Support\Models\ValidationResult as Result;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/src/Framework/Features/Validation/ValidationResult.php b/packages/framework/src/Support/Models/ValidationResult.php
similarity index 98%
rename from packages/framework/src/Framework/Features/Validation/ValidationResult.php
rename to packages/framework/src/Support/Models/ValidationResult.php
index 4e9be38900f..e54b9d0e4d8 100644
--- a/packages/framework/src/Framework/Features/Validation/ValidationResult.php
+++ b/packages/framework/src/Support/Models/ValidationResult.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Features\Validation;
+namespace Hyde\Support\Models;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
diff --git a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
index 58ed18cdeef..7e2be55cc1c 100644
--- a/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ValidateCommandTest.php
@@ -9,7 +9,7 @@
 /**
  * @covers \Hyde\Console\Commands\ValidateCommand
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Framework\Features\Validation\ValidationResult
+ * @covers \Hyde\Support\Models\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Services\ValidationServiceTest
  */
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 9f7c73073ba..28e437d49ee 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -4,16 +4,16 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Features\Validation\ValidationResult;
 use Hyde\Framework\Services\ValidationService;
 use Hyde\Hyde;
+use Hyde\Support\Models\ValidationResult;
 use Hyde\Testing\TestCase;
 
 /**
  * Class ValidationServiceTest.
  *
  * @covers \Hyde\Framework\Services\ValidationService
- * @covers \Hyde\Framework\Features\Validation\ValidationResult
+ * @covers \Hyde\Support\Models\ValidationResult
  *
  * @see \Hyde\Framework\Testing\Feature\Commands\ValidateCommandTest
  */

From b74ed5879d1854b85005ec95bac6e0c54fe380de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:09:35 +0200
Subject: [PATCH 279/768] Move SemanticDocumentationArticle to Models
 namespaces

This is a model, not service
---
 .../docs/documentation-article.blade.php      |  2 +-
 .../resources/views/layouts/docs.blade.php    |  2 +-
 .../Models}/SemanticDocumentationArticle.php  |  3 ++-
 .../Feature/Services/HydeSmartDocsTest.php    | 24 +++++++++----------
 4 files changed, 16 insertions(+), 15 deletions(-)
 rename packages/framework/src/{Framework/Services => Support/Models}/SemanticDocumentationArticle.php (98%)

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 9c3ff077d06..4364f1c12b2 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 @@
 @props([
-    /** @var \Hyde\Framework\Services\SemanticDocumentationArticle */
+    /** @var \Hyde\Support\Models\SemanticDocumentationArticle */
     'document'
 ])
 
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index b6ba4f7d65f..f6aa5e9644a 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -16,7 +16,7 @@ class="bg-white dark:bg-gray-900 dark:text-white min-h-screen w-screen relative
 <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)]">
     <x-hyde::docs.documentation-article
-            :document="\Hyde\Framework\Services\SemanticDocumentationArticle::create($page, $markdown)"/>
+            :document="\Hyde\Support\Models\SemanticDocumentationArticle::create($page, $markdown)"/>
 </main>
 
 <div id="support">
diff --git a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php b/packages/framework/src/Support/Models/SemanticDocumentationArticle.php
similarity index 98%
rename from packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
rename to packages/framework/src/Support/Models/SemanticDocumentationArticle.php
index e9c655c83c6..2d92c86f410 100644
--- a/packages/framework/src/Framework/Services/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Support/Models/SemanticDocumentationArticle.php
@@ -2,11 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Services;
+namespace Hyde\Support\Models;
 
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Str;
+use function str_contains;
 
 /**
  * Class to make Hyde documentation pages smarter,
diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index ba553d2886e..be46a5d5fd0 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Framework\Services\SemanticDocumentationArticle;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\SemanticDocumentationArticle;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Framework\Services\SemanticDocumentationArticle
+ * @covers \Hyde\Support\Models\SemanticDocumentationArticle
  */
 class HydeSmartDocsTest extends TestCase
 {
@@ -60,7 +60,7 @@ protected function mockTorchlight(): void
 
     public function test_create_helper_creates_new_instance_and_processes_it()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertInstanceOf(SemanticDocumentationArticle::class, $page);
 
@@ -70,7 +70,7 @@ public function test_create_helper_creates_new_instance_and_processes_it()
     public function test_instance_can_be_constructed_directly_with_same_result_as_facade()
     {
         $class = new SemanticDocumentationArticle($this->mock, $this->html);
-        $facade = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $facade = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         // Baseline since we manually need to call the process method
         $this->assertNotEquals($class, $facade);
@@ -83,7 +83,7 @@ public function test_instance_can_be_constructed_directly_with_same_result_as_fa
 
     public function test_render_header_returns_the_extracted_header()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
     }
@@ -97,14 +97,14 @@ public function test_render_header_returns_the_extracted_header_with_varying_new
         ];
 
         foreach ($tests as $test) {
-            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
         }
     }
 
     public function test_render_body_returns_the_extracted_body()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
     }
@@ -118,14 +118,14 @@ public function test_render_body_returns_the_extracted_body_with_varying_newline
         ];
 
         foreach ($tests as $test) {
-            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
         }
     }
 
     public function test_render_footer_is_empty_by_default()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('', $page->renderFooter());
     }
@@ -134,7 +134,7 @@ public function test_add_dynamic_header_content_adds_source_link_when_conditions
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'header']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
     }
@@ -163,7 +163,7 @@ public function test_edit_source_link_text_can_be_customized()
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
         config(['docs.edit_source_link_text' => 'Go to Source']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderHeader());
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderFooter());
@@ -172,7 +172,7 @@ public function test_edit_source_link_text_can_be_customized()
     public function test_add_dynamic_footer_content_adds_torchlight_attribution_when_conditions_are_met()
     {
         $this->mockTorchlight();
-        $page = SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
+        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
 
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }

From 059f1be8f17cb44106f8db39ccc6dcab76b5b758 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:23:43 +0200
Subject: [PATCH 280/768] Method is not internal

---
 packages/framework/src/Pages/DocumentationPage.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 498501d13bf..6d56a1d62c3 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -29,7 +29,6 @@ public function getRouteKey(): string
         return trim(static::outputDirectory().'/'.basename($this->identifier), '/');
     }
 
-    /** @internal */
     public function getOnlineSourcePath(): string|false
     {
         if (config('docs.source_file_location_base') === null) {

From 097daca42ebc14ee7263fc47f87747dea78b6ff5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:23:52 +0200
Subject: [PATCH 281/768] Add see tag

---
 packages/framework/src/Pages/DocumentationPage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Pages/DocumentationPage.php b/packages/framework/src/Pages/DocumentationPage.php
index 6d56a1d62c3..be92111d9fc 100644
--- a/packages/framework/src/Pages/DocumentationPage.php
+++ b/packages/framework/src/Pages/DocumentationPage.php
@@ -29,6 +29,7 @@ public function getRouteKey(): string
         return trim(static::outputDirectory().'/'.basename($this->identifier), '/');
     }
 
+    /** @see https://hydephp.com/docs/master/documentation-pages#automatic-edit-page-button */
     public function getOnlineSourcePath(): string|false
     {
         if (config('docs.source_file_location_base') === null) {

From 182a217aa48f50ff9e09889f3692806e34a760cd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:27:30 +0200
Subject: [PATCH 282/768] Move SemanticDocumentationArticle to
 Features\Documentation namespaces

---
 .../docs/documentation-article.blade.php      |  2 +-
 .../resources/views/layouts/docs.blade.php    |  2 +-
 .../SemanticDocumentationArticle.php          |  2 +-
 .../Feature/Services/HydeSmartDocsTest.php    | 24 +++++++++----------
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename packages/framework/src/{Support/Models => Framework/Features/Documentation}/SemanticDocumentationArticle.php (98%)

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 4364f1c12b2..67d013f406e 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 @@
 @props([
-    /** @var \Hyde\Support\Models\SemanticDocumentationArticle */
+    /** @var \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle */
     'document'
 ])
 
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index f6aa5e9644a..412956ba30b 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -16,7 +16,7 @@ class="bg-white dark:bg-gray-900 dark:text-white min-h-screen w-screen relative
 <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)]">
     <x-hyde::docs.documentation-article
-            :document="\Hyde\Support\Models\SemanticDocumentationArticle::create($page, $markdown)"/>
+            :document="\Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($page, $markdown)"/>
 </main>
 
 <div id="support">
diff --git a/packages/framework/src/Support/Models/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
similarity index 98%
rename from packages/framework/src/Support/Models/SemanticDocumentationArticle.php
rename to packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
index 2d92c86f410..b1e2f858d35 100644
--- a/packages/framework/src/Support/Models/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Support\Models;
+namespace Hyde\Framework\Features\Documentation;
 
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index be46a5d5fd0..b221badbaac 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
+use Hyde\Framework\Features\Documentation\SemanticDocumentationArticle;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
-use Hyde\Support\Models\SemanticDocumentationArticle;
 use Hyde\Testing\TestCase;
 
 /**
- * @covers \Hyde\Support\Models\SemanticDocumentationArticle
+ * @covers \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle
  */
 class HydeSmartDocsTest extends TestCase
 {
@@ -60,7 +60,7 @@ protected function mockTorchlight(): void
 
     public function test_create_helper_creates_new_instance_and_processes_it()
     {
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertInstanceOf(SemanticDocumentationArticle::class, $page);
 
@@ -70,7 +70,7 @@ public function test_create_helper_creates_new_instance_and_processes_it()
     public function test_instance_can_be_constructed_directly_with_same_result_as_facade()
     {
         $class = new SemanticDocumentationArticle($this->mock, $this->html);
-        $facade = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $facade = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         // Baseline since we manually need to call the process method
         $this->assertNotEquals($class, $facade);
@@ -83,7 +83,7 @@ public function test_instance_can_be_constructed_directly_with_same_result_as_fa
 
     public function test_render_header_returns_the_extracted_header()
     {
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
     }
@@ -97,14 +97,14 @@ public function test_render_header_returns_the_extracted_header_with_varying_new
         ];
 
         foreach ($tests as $test) {
-            $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
         }
     }
 
     public function test_render_body_returns_the_extracted_body()
     {
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
     }
@@ -118,14 +118,14 @@ public function test_render_body_returns_the_extracted_body_with_varying_newline
         ];
 
         foreach ($tests as $test) {
-            $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
         }
     }
 
     public function test_render_footer_is_empty_by_default()
     {
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('', $page->renderFooter());
     }
@@ -134,7 +134,7 @@ public function test_add_dynamic_header_content_adds_source_link_when_conditions
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'header']);
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
     }
@@ -163,7 +163,7 @@ public function test_edit_source_link_text_can_be_customized()
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
         config(['docs.edit_source_link_text' => 'Go to Source']);
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderHeader());
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderFooter());
@@ -172,7 +172,7 @@ public function test_edit_source_link_text_can_be_customized()
     public function test_add_dynamic_footer_content_adds_torchlight_attribution_when_conditions_are_met()
     {
         $this->mockTorchlight();
-        $page = \Hyde\Support\Models\SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
+        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
 
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }

From a525aecd5408b3339803a2f0bd2d20fbc38f32ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:28:12 +0200
Subject: [PATCH 283/768] Move up static create method

---
 .../SemanticDocumentationArticle.php          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
index b1e2f858d35..595510da87a 100644
--- a/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
@@ -24,6 +24,18 @@ class SemanticDocumentationArticle
     protected string $body;
     protected string $footer;
 
+    /**
+     * Create a new SemanticDocumentationArticle instance, process, and return it.
+     *
+     * @param  \Hyde\Pages\DocumentationPage  $page  The source page object
+     * @param  string  $html  compiled HTML content
+     * @return static new processed instance
+     */
+    public static function create(DocumentationPage $page, string $html): static
+    {
+        return (new self($page, $html))->process();
+    }
+
     public function __construct(DocumentationPage $page, string $html)
     {
         $this->page = $page;
@@ -110,18 +122,6 @@ protected function renderSourceLink(): string
         ])->render();
     }
 
-    /**
-     * Create a new SemanticDocumentationArticle instance, process, and return it.
-     *
-     * @param  \Hyde\Pages\DocumentationPage  $page  The source page object
-     * @param  string  $html  compiled HTML content
-     * @return static new processed instance
-     */
-    public static function create(DocumentationPage $page, string $html): static
-    {
-        return (new self($page, $html))->process();
-    }
-
     /**
      * Does the current document use Torchlight?
      *

From f5dcc4df423c1fccb7af58d946b7e2eae7f62480 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:28:32 +0200
Subject: [PATCH 284/768] Cleanup test code

---
 .../Feature/Services/HydeSmartDocsTest.php    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index b221badbaac..fb59a0798df 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -60,7 +60,7 @@ protected function mockTorchlight(): void
 
     public function test_create_helper_creates_new_instance_and_processes_it()
     {
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertInstanceOf(SemanticDocumentationArticle::class, $page);
 
@@ -70,7 +70,7 @@ public function test_create_helper_creates_new_instance_and_processes_it()
     public function test_instance_can_be_constructed_directly_with_same_result_as_facade()
     {
         $class = new SemanticDocumentationArticle($this->mock, $this->html);
-        $facade = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $facade = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         // Baseline since we manually need to call the process method
         $this->assertNotEquals($class, $facade);
@@ -83,7 +83,7 @@ public function test_instance_can_be_constructed_directly_with_same_result_as_fa
 
     public function test_render_header_returns_the_extracted_header()
     {
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
     }
@@ -97,14 +97,14 @@ public function test_render_header_returns_the_extracted_header_with_varying_new
         ];
 
         foreach ($tests as $test) {
-            $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
         }
     }
 
     public function test_render_body_returns_the_extracted_body()
     {
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
     }
@@ -118,14 +118,14 @@ public function test_render_body_returns_the_extracted_body_with_varying_newline
         ];
 
         foreach ($tests as $test) {
-            $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
         }
     }
 
     public function test_render_footer_is_empty_by_default()
     {
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlines('', $page->renderFooter());
     }
@@ -134,7 +134,7 @@ public function test_add_dynamic_header_content_adds_source_link_when_conditions
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'header']);
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
     }
@@ -163,7 +163,7 @@ public function test_edit_source_link_text_can_be_customized()
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
         config(['docs.edit_source_link_text' => 'Go to Source']);
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderHeader());
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderFooter());
@@ -172,7 +172,7 @@ public function test_edit_source_link_text_can_be_customized()
     public function test_add_dynamic_footer_content_adds_torchlight_attribution_when_conditions_are_met()
     {
         $this->mockTorchlight();
-        $page = \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
+        $page = SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
 
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }

From 18649d96b834ebfc9af7bfc9a07d5c65084c9d9c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:29:19 +0200
Subject: [PATCH 285/768] Rename test property

---
 .../Feature/Services/HydeSmartDocsTest.php    | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index fb59a0798df..573ef882fb7 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -15,7 +15,7 @@
  */
 class HydeSmartDocsTest extends TestCase
 {
-    protected DocumentationPage $mock;
+    protected DocumentationPage $page;
     protected string $html;
 
     protected function setUp(): void
@@ -23,8 +23,8 @@ protected function setUp(): void
         parent::setUp();
 
         file_put_contents(Hyde::path('_docs/foo.md'), "# Foo\n\nHello world.");
-        $this->mock = DocumentationPage::parse('foo');
-        $this->html = Markdown::render($this->mock->markdown->body);
+        $this->page = DocumentationPage::parse('foo');
+        $this->html = Markdown::render($this->page->markdown->body);
     }
 
     protected function tearDown(): void
@@ -60,7 +60,7 @@ protected function mockTorchlight(): void
 
     public function test_create_helper_creates_new_instance_and_processes_it()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertInstanceOf(SemanticDocumentationArticle::class, $page);
 
@@ -69,8 +69,8 @@ public function test_create_helper_creates_new_instance_and_processes_it()
 
     public function test_instance_can_be_constructed_directly_with_same_result_as_facade()
     {
-        $class = new SemanticDocumentationArticle($this->mock, $this->html);
-        $facade = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $class = new SemanticDocumentationArticle($this->page, $this->html);
+        $facade = SemanticDocumentationArticle::create($this->page, $this->html);
 
         // Baseline since we manually need to call the process method
         $this->assertNotEquals($class, $facade);
@@ -83,7 +83,7 @@ public function test_instance_can_be_constructed_directly_with_same_result_as_fa
 
     public function test_render_header_returns_the_extracted_header()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
     }
@@ -97,14 +97,14 @@ public function test_render_header_returns_the_extracted_header_with_varying_new
         ];
 
         foreach ($tests as $test) {
-            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = SemanticDocumentationArticle::create($this->page, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<h1>Foo</h1>', $page->renderHeader());
         }
     }
 
     public function test_render_body_returns_the_extracted_body()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
     }
@@ -118,14 +118,14 @@ public function test_render_body_returns_the_extracted_body_with_varying_newline
         ];
 
         foreach ($tests as $test) {
-            $page = SemanticDocumentationArticle::create($this->mock, Markdown::render($test));
+            $page = SemanticDocumentationArticle::create($this->page, Markdown::render($test));
             $this->assertEqualsIgnoringNewlines('<p>Hello world.</p>', $page->renderBody());
         }
     }
 
     public function test_render_footer_is_empty_by_default()
     {
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlines('', $page->renderFooter());
     }
@@ -134,7 +134,7 @@ public function test_add_dynamic_header_content_adds_source_link_when_conditions
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'header']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
     }
@@ -143,7 +143,7 @@ public function test_edit_source_link_is_added_to_footer_when_conditions_are_met
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'footer']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderFooter());
     }
@@ -152,7 +152,7 @@ public function test_edit_source_link_can_be_added_to_both_header_and_footer()
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderFooter());
@@ -163,7 +163,7 @@ public function test_edit_source_link_text_can_be_customized()
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
         config(['docs.edit_source_link_text' => 'Go to Source']);
-        $page = SemanticDocumentationArticle::create($this->mock, $this->html);
+        $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
         $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderHeader());
         $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderFooter());
@@ -172,7 +172,7 @@ public function test_edit_source_link_text_can_be_customized()
     public function test_add_dynamic_footer_content_adds_torchlight_attribution_when_conditions_are_met()
     {
         $this->mockTorchlight();
-        $page = SemanticDocumentationArticle::create($this->mock, 'Syntax highlighted by torchlight.dev');
+        $page = SemanticDocumentationArticle::create($this->page, 'Syntax highlighted by torchlight.dev');
 
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }

From 8db8ec5e4aaec35252fcc09b89d56b084b6a7846 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:35:51 +0200
Subject: [PATCH 286/768] Add code spacing

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

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 573ef882fb7..eb3abec3d48 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -55,6 +55,7 @@ protected function mockTorchlight(): void
         app()->bind('env', function () {
             return 'production';
         });
+
         config(['torchlight.token' => '12345']);
     }
 

From f5405eb9e3b609dbedfd53dac07b59ebcfc2fb83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:36:15 +0200
Subject: [PATCH 287/768] Move down helper methods

---
 .../Feature/Services/HydeSmartDocsTest.php    | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index eb3abec3d48..ae29fd17538 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -34,31 +34,6 @@ protected function tearDown(): void
         unlink(Hyde::path('_docs/foo.md'));
     }
 
-    protected function assertEqualsIgnoringNewlines(string $expected, string $actual): void
-    {
-        $this->assertEquals(
-            str_replace(["\n", "\r"], '', $expected),
-            str_replace(["\n", "\r"], '', $actual)
-        );
-    }
-
-    protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected, string $actual): void
-    {
-        $this->assertEquals(
-            str_replace(["\n", "\r", '    '], '', $expected),
-            str_replace(["\n", "\r", '    '], '', $actual)
-        );
-    }
-
-    protected function mockTorchlight(): void
-    {
-        app()->bind('env', function () {
-            return 'production';
-        });
-
-        config(['torchlight.token' => '12345']);
-    }
-
     public function test_create_helper_creates_new_instance_and_processes_it()
     {
         $page = SemanticDocumentationArticle::create($this->page, $this->html);
@@ -177,4 +152,29 @@ public function test_add_dynamic_footer_content_adds_torchlight_attribution_when
 
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }
+
+    protected function assertEqualsIgnoringNewlines(string $expected, string $actual): void
+    {
+        $this->assertEquals(
+            str_replace(["\n", "\r"], '', $expected),
+            str_replace(["\n", "\r"], '', $actual)
+        );
+    }
+
+    protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected, string $actual): void
+    {
+        $this->assertEquals(
+            str_replace(["\n", "\r", '    '], '', $expected),
+            str_replace(["\n", "\r", '    '], '', $actual)
+        );
+    }
+
+    protected function mockTorchlight(): void
+    {
+        app()->bind('env', function () {
+            return 'production';
+        });
+
+        config(['torchlight.token' => '12345']);
+    }
 }

From a020bb46cbe1dcb4a6de5d28271d98be11aa80d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:36:23 +0200
Subject: [PATCH 288/768] Import functions

---
 .../framework/tests/Feature/Services/HydeSmartDocsTest.php     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index ae29fd17538..2cede7821a5 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -9,6 +9,9 @@
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use function app;
+use function config;
+use function str_replace;
 
 /**
  * @covers \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle

From 24e835f5d9d0345b0b315ca6c1b41dffc1afe49c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:41:31 +0200
Subject: [PATCH 289/768] Test the documentation article view

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

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 2cede7821a5..89907741143 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -12,6 +12,7 @@
 use function app;
 use function config;
 use function str_replace;
+use function view;
 
 /**
  * @covers \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle
@@ -156,6 +157,16 @@ public function test_add_dynamic_footer_content_adds_torchlight_attribution_when
         $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
     }
 
+    public function test_the_documentation_article_view()
+    {
+        $rendered = view('hyde::components.docs.documentation-article', [
+            'document' => SemanticDocumentationArticle::create($this->page, $this->html)
+        ])->render();
+
+        $this->assertStringContainsString('<h1>Foo</h1>', $rendered);
+        $this->assertStringContainsString('<p>Hello world.</p>', $rendered);
+    }
+
     protected function assertEqualsIgnoringNewlines(string $expected, string $actual): void
     {
         $this->assertEquals(

From 1b600d0429308bbe77367f23b96c9e95528e6375 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:43:29 +0200
Subject: [PATCH 290/768] Take the liberty to format the test code a bit since
 we strip newlines anyways

---
 .../Feature/Services/HydeSmartDocsTest.php    | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 89907741143..47d86a3c5b3 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -116,7 +116,9 @@ public function test_add_dynamic_header_content_adds_source_link_when_conditions
         config(['docs.edit_source_link_position' => 'header']);
         $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>
+        HTML, $page->renderHeader());
     }
 
     public function test_edit_source_link_is_added_to_footer_when_conditions_are_met()
@@ -125,17 +127,25 @@ public function test_edit_source_link_is_added_to_footer_when_conditions_are_met
         config(['docs.edit_source_link_position' => 'footer']);
         $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderFooter());
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>
+        HTML, $page->renderFooter());
     }
 
     public function test_edit_source_link_can_be_added_to_both_header_and_footer()
     {
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
+
         $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderHeader());
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>', $page->renderFooter());
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>
+        HTML, $page->renderHeader());
+
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <p class="edit-page-link"><a href="https://example.com/foo.md">Edit Source</a></p>
+        HTML, $page->renderFooter());
     }
 
     public function test_edit_source_link_text_can_be_customized()
@@ -143,10 +153,16 @@ public function test_edit_source_link_text_can_be_customized()
         config(['docs.source_file_location_base' => 'https://example.com/']);
         config(['docs.edit_source_link_position' => 'both']);
         config(['docs.edit_source_link_text' => 'Go to Source']);
+
         $page = SemanticDocumentationArticle::create($this->page, $this->html);
 
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderHeader());
-        $this->assertEqualsIgnoringNewlinesAndIndentation('<p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>', $page->renderFooter());
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <h1>Foo</h1><p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>
+        HTML, $page->renderHeader());
+
+        $this->assertEqualsIgnoringNewlinesAndIndentation(<<<'HTML'
+            <p class="edit-page-link"><a href="https://example.com/foo.md">Go to Source</a></p>
+        HTML, $page->renderFooter());
     }
 
     public function test_add_dynamic_footer_content_adds_torchlight_attribution_when_conditions_are_met()

From 5c1d50cc714f37e2bb18f237b7d3701fb0f92dd1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:48:19 +0200
Subject: [PATCH 291/768] Fix type annotation

---
 .../views/components/docs/documentation-article.blade.php      | 3 +--
 1 file changed, 1 insertion(+), 2 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 67d013f406e..0df46894eb6 100644
--- a/packages/framework/resources/views/components/docs/documentation-article.blade.php
+++ b/packages/framework/resources/views/components/docs/documentation-article.blade.php
@@ -1,6 +1,5 @@
 @props([
-    /** @var \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle */
-    'document'
+    /** @var \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle $document */
 ])
 
 <article id="document" itemscope itemtype="http://schema.org/Article" @class(['mx-auto lg:ml-8 prose

From 7ad7c6d38f84504b223783ebc81a1a1e8a400f42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:49:01 +0200
Subject: [PATCH 292/768] Format class attribute

---
 .../views/components/docs/documentation-article.blade.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 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 0df46894eb6..4dd95791a2a 100644
--- a/packages/framework/resources/views/components/docs/documentation-article.blade.php
+++ b/packages/framework/resources/views/components/docs/documentation-article.blade.php
@@ -2,9 +2,9 @@
     /** @var \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle $document */
 ])
 
-<article id="document" itemscope itemtype="http://schema.org/Article" @class(['mx-auto lg:ml-8 prose
-			dark:prose-invert max-w-3xl p-12 md:px-16 max-w-[1000px] min-h-[calc(100vh_-_4rem)]', 'torchlight-enabled'=>
-			$document->hasTorchlight()])>
+<article id="document" itemscope itemtype="http://schema.org/Article" @class([
+        'mx-auto lg:ml-8 prose dark:prose-invert max-w-3xl p-12 md:px-16 max-w-[1000px] min-h-[calc(100vh_-_4rem)]',
+        'torchlight-enabled' => $document->hasTorchlight()])>
     @yield('content')
 
     <header id="document-header" class="flex items-center flex-wrap prose-h1:mb-3">

From 96b2392064e324561ada373f9b05f4d05265bda1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:49:56 +0200
Subject: [PATCH 293/768] Render methods now return HtmlStrings

---
 .../Documentation/SemanticDocumentationArticle.php  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
index 595510da87a..4c938194d68 100644
--- a/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
+++ b/packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php
@@ -6,6 +6,7 @@
 
 use Hyde\Facades\Features;
 use Hyde\Pages\DocumentationPage;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use function str_contains;
 
@@ -42,19 +43,19 @@ public function __construct(DocumentationPage $page, string $html)
         $this->html = $html;
     }
 
-    public function renderHeader(): string
+    public function renderHeader(): HtmlString
     {
-        return $this->header;
+        return new HtmlString($this->header);
     }
 
-    public function renderBody(): string
+    public function renderBody(): HtmlString
     {
-        return $this->body;
+        return new HtmlString($this->body);
     }
 
-    public function renderFooter(): string
+    public function renderFooter(): HtmlString
     {
-        return $this->footer;
+        return new HtmlString($this->footer);
     }
 
     /** @internal */

From 3a59e029dabd6077fb2e13d96555018780c9a6b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:52:33 +0200
Subject: [PATCH 294/768] Expect HtmlString

---
 .../tests/Feature/Services/HydeSmartDocsTest.php      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 47d86a3c5b3..24d80e16632 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -9,6 +9,7 @@
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\HtmlString;
 use function app;
 use function config;
 use function str_replace;
@@ -170,7 +171,7 @@ public function test_add_dynamic_footer_content_adds_torchlight_attribution_when
         $this->mockTorchlight();
         $page = SemanticDocumentationArticle::create($this->page, 'Syntax highlighted by torchlight.dev');
 
-        $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter());
+        $this->assertStringContainsString('Syntax highlighting by <a href="https://torchlight.dev/"', $page->renderFooter()->toHtml());
     }
 
     public function test_the_documentation_article_view()
@@ -183,19 +184,19 @@ public function test_the_documentation_article_view()
         $this->assertStringContainsString('<p>Hello world.</p>', $rendered);
     }
 
-    protected function assertEqualsIgnoringNewlines(string $expected, string $actual): void
+    protected function assertEqualsIgnoringNewlines(string $expected, HtmlString $actual): void
     {
         $this->assertEquals(
             str_replace(["\n", "\r"], '', $expected),
-            str_replace(["\n", "\r"], '', $actual)
+            str_replace(["\n", "\r"], '', $actual->toHtml())
         );
     }
 
-    protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected, string $actual): void
+    protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected, HtmlString $actual): void
     {
         $this->assertEquals(
             str_replace(["\n", "\r", '    '], '', $expected),
-            str_replace(["\n", "\r", '    '], '', $actual)
+            str_replace(["\n", "\r", '    '], '', $actual->toHtml())
         );
     }
 

From 241b3eac69a7c38b1e53c1e4d82380d0f1266d8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:52:53 +0200
Subject: [PATCH 295/768] Convert braces {!! !!} -> {{ }}

---
 .../views/components/docs/documentation-article.blade.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 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 4dd95791a2a..894ff8f5552 100644
--- a/packages/framework/resources/views/components/docs/documentation-article.blade.php
+++ b/packages/framework/resources/views/components/docs/documentation-article.blade.php
@@ -8,12 +8,12 @@
     @yield('content')
 
     <header id="document-header" class="flex items-center flex-wrap prose-h1:mb-3">
-        {!! $document->renderHeader() !!}
+        {{ $document->renderHeader() }}
     </header>
     <section id="document-main-content" itemprop="articleBody">
-        {!! $document->renderBody() !!}
+        {{ $document->renderBody() }}
     </section>
     <footer id="document-footer" class="flex items-center flex-wrap mt-8 prose-p:my-3 justify-between text-[90%]">
-        {!! $document->renderFooter() !!}
+        {{ $document->renderFooter() }}
     </footer>
 </article>
\ No newline at end of file

From 13e2de22ab8eb81065b9502be517345fdfe257c8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:54:30 +0200
Subject: [PATCH 296/768] Extract helper methods

---
 .../Feature/Services/HydeSmartDocsTest.php     | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 24d80e16632..105916218c6 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -187,19 +187,29 @@ public function test_the_documentation_article_view()
     protected function assertEqualsIgnoringNewlines(string $expected, HtmlString $actual): void
     {
         $this->assertEquals(
-            str_replace(["\n", "\r"], '', $expected),
-            str_replace(["\n", "\r"], '', $actual->toHtml())
+            $this->withoutNewLines($expected),
+            $this->withoutNewLines($actual->toHtml())
         );
     }
 
     protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected, HtmlString $actual): void
     {
         $this->assertEquals(
-            str_replace(["\n", "\r", '    '], '', $expected),
-            str_replace(["\n", "\r", '    '], '', $actual->toHtml())
+            $this->withoutNewLinesAndIndentation($expected),
+            $this->withoutNewLinesAndIndentation($actual->toHtml())
         );
     }
 
+    protected function withoutNewLines(string $expected): string|array
+    {
+        return str_replace(["\n", "\r"], '', $expected);
+    }
+
+    protected function withoutNewLinesAndIndentation(string $expected): string|array
+    {
+        return str_replace(["\n", "\r", '    '], '', $expected);
+    }
+
     protected function mockTorchlight(): void
     {
         app()->bind('env', function () {

From b66e6ab671f595619fd51a6b26a129e468ab42d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Thu, 27 Oct 2022 22:54:56 +0200
Subject: [PATCH 297/768] Only return strings

---
 .../framework/tests/Feature/Services/HydeSmartDocsTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 105916218c6..09722c8ac5b 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -200,12 +200,12 @@ protected function assertEqualsIgnoringNewlinesAndIndentation(string $expected,
         );
     }
 
-    protected function withoutNewLines(string $expected): string|array
+    protected function withoutNewLines(string $expected): string
     {
         return str_replace(["\n", "\r"], '', $expected);
     }
 
-    protected function withoutNewLinesAndIndentation(string $expected): string|array
+    protected function withoutNewLinesAndIndentation(string $expected): string
     {
         return str_replace(["\n", "\r", '    '], '', $expected);
     }

From 084b4713b8e4df43b3f4d1d25eb51b89a366c4b4 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Thu, 27 Oct 2022 20:55:15 +0000
Subject: [PATCH 298/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
index 09722c8ac5b..b438215b915 100644
--- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
+++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php
@@ -4,14 +4,14 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
+use function app;
+use function config;
 use Hyde\Framework\Features\Documentation\SemanticDocumentationArticle;
 use Hyde\Hyde;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\HtmlString;
-use function app;
-use function config;
 use function str_replace;
 use function view;
 
@@ -177,7 +177,7 @@ public function test_add_dynamic_footer_content_adds_torchlight_attribution_when
     public function test_the_documentation_article_view()
     {
         $rendered = view('hyde::components.docs.documentation-article', [
-            'document' => SemanticDocumentationArticle::create($this->page, $this->html)
+            'document' => SemanticDocumentationArticle::create($this->page, $this->html),
         ])->render();
 
         $this->assertStringContainsString('<h1>Foo</h1>', $rendered);

From 1d3846fbe6b559fc54e1b4306af919975cdaf737 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 11:49:41 +0200
Subject: [PATCH 299/768] Add back required prop

---
 .../views/components/docs/documentation-article.blade.php        | 1 +
 1 file changed, 1 insertion(+)

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 894ff8f5552..b766a8c16db 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,6 @@
 @props([
     /** @var \Hyde\Framework\Features\Documentation\SemanticDocumentationArticle $document */
+    'document',
 ])
 
 <article id="document" itemscope itemtype="http://schema.org/Article" @class([

From 0e9de01deb8b9d0cc193df4b26dce045e154fe15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:02:25 +0200
Subject: [PATCH 300/768] Document factory class

---
 packages/framework/src/Framework/Factories/BlogPostFactory.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostFactory.php
index 0cb13194371..a7070a6ebca 100644
--- a/packages/framework/src/Framework/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostFactory.php
@@ -17,6 +17,9 @@
  * Streamlines the data construction specific to a blog post.
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
+ *
+ * All data can be set using front matter in the page source file. If no front matter is set for the given key,
+ * this class will attempt to generate and discover the values based on the page and the project's configuration.
  */
 class BlogPostFactory extends Concerns\PageFactory
 {

From 57682ff8e3adfcb836eb8d63040216df6728e082 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:04:45 +0200
Subject: [PATCH 301/768] Add PHPDoc

---
 .../src/Framework/Factories/Concerns/PageFactory.php         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/Concerns/PageFactory.php b/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
index 602413eebd0..0831fe55abb 100644
--- a/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
@@ -6,6 +6,11 @@
 
 use Illuminate\Contracts\Support\Arrayable;
 
+/**
+ * Streamlines the data construction specific to a page.
+ *
+ * Simply pass along the data the class needs to run, then access the data using the toArray() method.
+ */
 abstract class PageFactory implements Arrayable
 {
     abstract public function toArray(): array;

From 77f59e4854346fab73ea1d85f3e7782d9ce9efd0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:05:25 +0200
Subject: [PATCH 302/768] Rename PageFactory to PageDataFactory

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 4 ++--
 .../{BlogPostFactory.php => BlogPostDataFactory.php}          | 2 +-
 .../framework/src/Framework/Factories/Concerns/HasFactory.php | 2 +-
 .../Concerns/{PageFactory.php => PageDataFactory.php}         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/framework/src/Framework/Factories/{BlogPostFactory.php => BlogPostDataFactory.php} (97%)
 rename packages/framework/src/Framework/Factories/Concerns/{PageFactory.php => PageDataFactory.php} (86%)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 91092bb4d11..9416fb1ca34 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -6,7 +6,7 @@
 
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
-use Hyde\Framework\Factories\BlogPostFactory;
+use Hyde\Framework\Factories\BlogPostDataFactory;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 
@@ -20,7 +20,7 @@ protected function constructPageSchemas(): void
         $this->constructPageSchema();
 
         if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostFactory($this->matter, $this->markdown));
+            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
         }
     }
 
diff --git a/packages/framework/src/Framework/Factories/BlogPostFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
similarity index 97%
rename from packages/framework/src/Framework/Factories/BlogPostFactory.php
rename to packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index a7070a6ebca..1472f440802 100644
--- a/packages/framework/src/Framework/Factories/BlogPostFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -21,7 +21,7 @@
  * All data can be set using front matter in the page source file. If no front matter is set for the given key,
  * this class will attempt to generate and discover the values based on the page and the project's configuration.
  */
-class BlogPostFactory extends Concerns\PageFactory
+class BlogPostDataFactory extends Concerns\PageDataFactory
 {
     use HasFrontMatter;
 
diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 54adca3edb8..c49e944e885 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -6,7 +6,7 @@
 
 trait HasFactory
 {
-    public function constructFactoryData(PageFactory $data): void
+    public function constructFactoryData(PageDataFactory $data): void
     {
         foreach ($data->toArray() as $key => $value) {
             $this->{$key} = $value;
diff --git a/packages/framework/src/Framework/Factories/Concerns/PageFactory.php b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
similarity index 86%
rename from packages/framework/src/Framework/Factories/Concerns/PageFactory.php
rename to packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
index 0831fe55abb..764cf0c5d16 100644
--- a/packages/framework/src/Framework/Factories/Concerns/PageFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
@@ -11,7 +11,7 @@
  *
  * Simply pass along the data the class needs to run, then access the data using the toArray() method.
  */
-abstract class PageFactory implements Arrayable
+abstract class PageDataFactory implements Arrayable
 {
     abstract public function toArray(): array;
 }

From 8c5db6e2ef030aaadfa24d0110212685b979189b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:09:39 +0200
Subject: [PATCH 303/768] Update factory documentation

---
 .../Framework/Factories/Concerns/PageDataFactory.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
index 764cf0c5d16..81d2764fd15 100644
--- a/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
@@ -7,9 +7,17 @@
 use Illuminate\Contracts\Support\Arrayable;
 
 /**
- * Streamlines the data construction specific to a page.
+ * Streamlines the data dynamic construction specific to a HydePHP page.
  *
- * Simply pass along the data the class needs to run, then access the data using the toArray() method.
+ * Simply pass along the data the class needs to run, then access the parsed data using the toArray() method.
+ *
+ * Commonly, all data can be set using front matter in the page source file.
+ *
+ * However, as all front matter is optional in Hyde, if no front matter is set for the given key,
+ * the factory may attempt to generate and discover the values based on the page's contents,
+ * as well as the project's overall configuration.
+ *
+ * In other words, this is where the magic happens.
  */
 abstract class PageDataFactory implements Arrayable
 {

From 78685f7a2c2a8de15ee9c03b8944563cf8815596 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:13:00 +0200
Subject: [PATCH 304/768] Link to the schema constants

---
 .../src/Framework/Factories/BlogPostDataFactory.php        | 3 +++
 .../src/Framework/Factories/Concerns/PageDataFactory.php   | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 1472f440802..f35b7ed1090 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -7,6 +7,7 @@
 use Hyde\Framework\Concerns\HasFrontMatter;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Support\Models\DateString;
@@ -25,6 +26,8 @@ class BlogPostDataFactory extends Concerns\PageDataFactory
 {
     use HasFrontMatter;
 
+    public const SCHEMA = BlogPostSchema::MARKDOWN_POST_SCHEMA;
+
     private FrontMatter $matter;
     private Markdown $markdown;
 
diff --git a/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
index 81d2764fd15..03217c5b3b5 100644
--- a/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/PageDataFactory.php
@@ -21,5 +21,12 @@
  */
 abstract class PageDataFactory implements Arrayable
 {
+    /**
+     * The front matter properties supported by this factory.
+     *
+     * @var array<string, string|array>
+     */
+    public const SCHEMA = [];
+
     abstract public function toArray(): array;
 }

From 82e61925e698dd79150de9dbbf8c59602f5b69b4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:15:04 +0200
Subject: [PATCH 305/768] Add PHPDoc

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index f35b7ed1090..faafaa33784 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -26,6 +26,9 @@ class BlogPostDataFactory extends Concerns\PageDataFactory
 {
     use HasFrontMatter;
 
+    /**
+     * The front matter properties supported by this factory.
+     */
     public const SCHEMA = BlogPostSchema::MARKDOWN_POST_SCHEMA;
 
     private FrontMatter $matter;

From db9aba6d7c9c1bc81026624a61c41c0785c125fc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:15:55 +0200
Subject: [PATCH 306/768] Add PHPDoc

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index faafaa33784..cc7736cd280 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -28,6 +28,8 @@ class BlogPostDataFactory extends Concerns\PageDataFactory
 
     /**
      * The front matter properties supported by this factory.
+     *
+     * Note that this class does not add the title, as that is already added to all pages.
      */
     public const SCHEMA = BlogPostSchema::MARKDOWN_POST_SCHEMA;
 

From 5a0ea9abe69959a96df156be050ddf6df453daa5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:27:33 +0200
Subject: [PATCH 307/768] Create Author.php

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

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

From 4f2eecf3605b60581a251058ebdc8da4def4ab63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:28:13 +0200
Subject: [PATCH 308/768] Create AuthorTest.php

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

diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
new file mode 100644
index 00000000000..998b877df42
--- /dev/null
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Facades;
+
+use Hyde\Facades\Author;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Facades\Author
+ */
+class AuthorTest extends TestCase
+{
+    //
+}

From 1e4681eac260f9aef89c1ed7d8c0cc8c85157ace Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:31:30 +0200
Subject: [PATCH 309/768] Add create facade method

---
 packages/framework/src/Facades/Author.php            |  7 ++++++-
 packages/framework/tests/Unit/Facades/AuthorTest.php | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index e0071a61dd4..75734c9d277 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Facades;
 
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+
 class Author
 {
-    //
+    public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor
+    {
+        return new PostAuthor($username, ['name' => $name, 'website' => $website]);
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index 998b877df42..377a68aa4e7 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Author;
+use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Testing\TestCase;
 
 /**
@@ -12,5 +13,14 @@
  */
 class AuthorTest extends TestCase
 {
-    //
+    public function testCreate()
+    {
+        $author = Author::create('john_doe', '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->assertEquals(PostAuthor::create('foo'), Author::create('foo'));
+    }
 }

From 7f163f4bbbfb9941531ecaabd0ac2901a39d5489 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:32:15 +0200
Subject: [PATCH 310/768] Add PHPDoc

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

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 75734c9d277..f7673e55735 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -6,6 +6,11 @@
 
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
+/**
+ * Allows you to easily add pre-defined authors for your blog posts.
+ * 
+ * @see \Hyde\Framework\Features\Blogging\Models\PostAuthor
+ */
 class Author
 {
     public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor

From c932659205b7ed0ef44694ba6c709e0e6e773e71 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 10:35:38 +0000
Subject: [PATCH 311/768] Apply fixes from StyleCI

---
 packages/framework/src/Facades/Author.php            | 2 +-
 packages/framework/tests/Unit/Facades/AuthorTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index f7673e55735..045c7779c76 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -8,7 +8,7 @@
 
 /**
  * Allows you to easily add pre-defined authors for your blog posts.
- * 
+ *
  * @see \Hyde\Framework\Features\Blogging\Models\PostAuthor
  */
 class Author
diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index 377a68aa4e7..fad6bd9681e 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -20,7 +20,7 @@ public function testCreate()
         $this->assertSame('john_doe', $author->username);
         $this->assertSame('John Doe', $author->name);
         $this->assertSame('https://johndoe.com', $author->website);
-        
+
         $this->assertEquals(PostAuthor::create('foo'), Author::create('foo'));
     }
 }

From a676f055a8ef95c34d1fca1d7bf346f24cf4b047 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:39:00 +0200
Subject: [PATCH 312/768] Rename test to match subject

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php       | 2 +-
 .../tests/Feature/{AuthorTest.php => PostAuthorTest.php}        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename packages/framework/tests/Feature/{AuthorTest.php => PostAuthorTest.php} (99%)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 54d398d2e7c..f69d3e5e553 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -10,7 +10,7 @@
 /**
  * The Post Author model object.
  *
- * @see \Hyde\Framework\Testing\Feature\AuthorTest
+ * @see \Hyde\Framework\Testing\Feature\PostAuthorTest
  */
 class PostAuthor implements Stringable
 {
diff --git a/packages/framework/tests/Feature/AuthorTest.php b/packages/framework/tests/Feature/PostAuthorTest.php
similarity index 99%
rename from packages/framework/tests/Feature/AuthorTest.php
rename to packages/framework/tests/Feature/PostAuthorTest.php
index 20b6e8f4a57..abd5f361d7d 100644
--- a/packages/framework/tests/Feature/AuthorTest.php
+++ b/packages/framework/tests/Feature/PostAuthorTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\PostAuthor
  */
-class AuthorTest extends TestCase
+class PostAuthorTest extends TestCase
 {
     public function test_create_method_creates_new_author_model()
     {

From 234189b9cbfd57c9b5143db7440a6ffcb18ade4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:40:03 +0200
Subject: [PATCH 313/768] Update PHPDoc

---
 .../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 f69d3e5e553..90b47132d56 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -32,8 +32,8 @@ class PostAuthor implements Stringable
     /**
      * The author's website URL.
      *
-     * Could for example, be a Twitter page, website,
-     * or a hyperlink to more posts by the author.
+     * Could for example, be a Twitter page, website, or a hyperlink to more posts by the author.
+     * Should be a fully qualified link, meaning it starts with http:// or https://.
      *
      * @var string|null
      */

From ce9e36db864210c060e1e326fd0c165c312eaa3d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:40:25 +0200
Subject: [PATCH 314/768] Constructors are no longer final

---
 .../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 90b47132d56..56001b4b7f7 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -48,7 +48,7 @@ class PostAuthor implements Stringable
      * @param  string  $username
      * @param  array|null  $data
      */
-    final public function __construct(string $username, ?array $data = [])
+    public function __construct(string $username, ?array $data = [])
     {
         $this->username = $username;
 
@@ -62,7 +62,7 @@ final public function __construct(string $username, ?array $data = [])
     }
 
     /** Dynamically get or create an author based on a username string or front matter array */
-    final public static function make(string|array $data): static
+    public static function make(string|array $data): static
     {
         if (is_string($data)) {
             return static::get($data);

From 6c1afb808e1b5a57a6c3dfc2df42cf122d801591 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:44:22 +0200
Subject: [PATCH 315/768] Constructor no longer accepts an array

---
 packages/framework/src/Facades/Author.php     |  2 +-
 .../Features/Blogging/Models/PostAuthor.php   | 22 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 045c7779c76..47b953958b7 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -15,6 +15,6 @@ class Author
 {
     public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor
     {
-        return new PostAuthor($username, ['name' => $name, 'website' => $website]);
+        return new PostAuthor($username, $name, $website);
     }
 }
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
index 56001b4b7f7..18fb89a670e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -42,23 +42,17 @@ class PostAuthor implements Stringable
     /**
      * Construct a new Post Author object.
      *
-     * Parameters are supplied through an array to make it
-     * easy to load data from Markdown post front matter.
+     * If your input is in the form of an array, you may rather want to use the `make` method.
      *
-     * @param  string  $username
-     * @param  array|null  $data
+     * @param string $username
+     * @param string|null $name
+     * @param string|null $website
      */
-    public function __construct(string $username, ?array $data = [])
+    public function __construct(string $username, ?string $name = null, ?string $website = null)
     {
         $this->username = $username;
-
-        if (isset($data['name'])) {
-            $this->name = $data['name'];
-        }
-
-        if (isset($data['website'])) {
-            $this->website = $data['website'];
-        }
+        $this->name = $name;
+        $this->website = $website;
     }
 
     /** Dynamically get or create an author based on a username string or front matter array */
@@ -83,7 +77,7 @@ public static function all(): Collection
 
     public static function create(string $username, ?string $name = null, ?string $website = null): static
     {
-        return new static($username, ['name' => $name, 'website' => $website]);
+        return new static($username, $name, $website);
     }
 
     public function __toString(): string

From 2aef3759ea0114a2724c29fe9f0ff454952f786d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:45:49 +0200
Subject: [PATCH 316/768] Fix major bug where authors were not discovered due
 to bad config call

---
 .../Features/Blogging/Models/PostAuthor.php          |  2 +-
 packages/framework/tests/Feature/PostAuthorTest.php  | 12 ++++++------
 2 files changed, 7 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 18fb89a670e..485d9bf66cb 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -72,7 +72,7 @@ public static function get(string $username): static
 
     public static function all(): Collection
     {
-        return new Collection(config('authors', []));
+        return new Collection(config('hyde.authors', []));
     }
 
     public static function create(string $username, ?string $name = null, ?string $website = null): static
diff --git a/packages/framework/tests/Feature/PostAuthorTest.php b/packages/framework/tests/Feature/PostAuthorTest.php
index abd5f361d7d..e322336daa6 100644
--- a/packages/framework/tests/Feature/PostAuthorTest.php
+++ b/packages/framework/tests/Feature/PostAuthorTest.php
@@ -38,7 +38,7 @@ public function test_make_method_creates_new_author_model_from_string()
 
     public function test_make_method_creates_new_author_model_from_string_can_find_existing_author()
     {
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('foo', 'bar'),
         ]);
 
@@ -62,7 +62,7 @@ public function test_make_method_creates_new_author_model_from_array_only_needs_
 
     public function test_all_method_returns_empty_collection_if_no_authors_are_set_in_config()
     {
-        Config::set('authors', []);
+        Config::set('hyde.authors', []);
         $authors = PostAuthor::all();
 
         $this->assertInstanceOf(Collection::class, $authors);
@@ -71,7 +71,7 @@ public function test_all_method_returns_empty_collection_if_no_authors_are_set_i
 
     public function test_all_method_returns_collection_with_all_authors_defined_in_config()
     {
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('foo'),
         ]);
         $authors = PostAuthor::all();
@@ -83,7 +83,7 @@ public function test_all_method_returns_collection_with_all_authors_defined_in_c
 
     public function test_multiple_authors_can_be_defined_in_config()
     {
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('foo'),
             PostAuthor::create('bar'),
         ]);
@@ -97,7 +97,7 @@ public function test_multiple_authors_can_be_defined_in_config()
 
     public function test_get_method_returns_config_defined_author_by_username()
     {
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('foo', 'bar'),
         ]);
         $author = PostAuthor::get('foo');
@@ -109,7 +109,7 @@ public function test_get_method_returns_config_defined_author_by_username()
 
     public function test_get_method_returns_new_author_if_username_not_found_in_config()
     {
-        Config::set('authors', []);
+        Config::set('hyde.authors', []);
         $author = PostAuthor::get('foo');
 
         $this->assertInstanceOf(PostAuthor::class, $author);

From f8c8dae743b07374fd4460b04e0a1367a3107dd8 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 10:46:52 +0000
Subject: [PATCH 317/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/PostAuthor.php   | 6 +++---
 1 file changed, 3 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 485d9bf66cb..f07c76a0bf6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -44,9 +44,9 @@ class PostAuthor implements Stringable
      *
      * If your input is in the form of an array, you may rather want to use the `make` method.
      *
-     * @param string $username
-     * @param string|null $name
-     * @param string|null $website
+     * @param  string  $username
+     * @param  string|null  $name
+     * @param  string|null  $website
      */
     public function __construct(string $username, ?string $name = null, ?string $website = null)
     {

From 809e3ba89ebfbf6387b7dffb9e1496deaeb421fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 12:54:11 +0200
Subject: [PATCH 318/768] Update AuthorPostsIntegrationTest.php

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

diff --git a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
index c5df5d202a1..712fc6dfcbc 100644
--- a/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
+++ b/packages/framework/tests/Feature/AuthorPostsIntegrationTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Config::set('authors', []);
+        Config::set('hyde.authors', []);
     }
 
     /**
@@ -78,7 +78,7 @@ public function test_create_post_with_defined_author_with_name()
         // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('test_named_author', 'Test Author'),
         ]);
 
@@ -116,7 +116,7 @@ public function test_create_post_with_defined_author_with_website()
         // Check that the post was created
         $this->assertFileExists(Hyde::path('_posts/test-2dcbb2c-post-with-defined-author-with-name.md'));
 
-        Config::set('authors', [
+        Config::set('hyde.authors', [
             PostAuthor::create('test_author_with_website', 'Test Author', 'https://example.org'),
         ]);
 

From d628315d2183fa044c2f4d7584502441e373574f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:01:33 +0200
Subject: [PATCH 319/768] Document the facade method

---
 packages/framework/src/Facades/Author.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 47b953958b7..09b924869b3 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -13,6 +13,18 @@
  */
 class Author
 {
+    /**
+     * Construct a new Post Author. For Hyde to discover this author,
+     * you must call this method from your hyde.php config file.
+     *
+     * @see https://hydephp.com/docs/master/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.
+     *
+     * @return \Hyde\Framework\Features\Blogging\Models\PostAuthor
+     */
     public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor
     {
         return new PostAuthor($username, $name, $website);

From f515926974ac7ed070625f8b3bbfaa375ad0826f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:04:01 +0200
Subject: [PATCH 320/768] Add get facade method

---
 packages/framework/src/Facades/Author.php            | 12 ++++++++++++
 packages/framework/tests/Unit/Facades/AuthorTest.php | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 09b924869b3..54c578aa5c7 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -29,4 +29,16 @@ public static function create(string $username, ?string $name = null, ?string $w
     {
         return new PostAuthor($username, $name, $website);
     }
+
+    /**
+     * 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.
+     *
+     * @param string $username
+     * @return \Hyde\Framework\Features\Blogging\Models\PostAuthor
+     */
+    public static function get(string $username): PostAuthor
+    {
+        return PostAuthor::get($username);
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index fad6bd9681e..e828b8b379e 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -23,4 +23,15 @@ public function testCreate()
 
         $this->assertEquals(PostAuthor::create('foo'), Author::create('foo'));
     }
+
+    public function testGet()
+    {
+        $author = Author::get('mr_hyde');
+
+        $this->assertSame('mr_hyde', $author->username);
+        $this->assertSame('Mr. Hyde', $author->name);
+        $this->assertSame('https://hydephp.com', $author->website);
+
+        $this->assertEquals(PostAuthor::get('foo'), Author::get('foo'));
+    }
 }

From 4e7865d9c367985cb54c593f0dac629f3a9257d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:06:23 +0200
Subject: [PATCH 321/768] Add all facade method

---
 packages/framework/src/Facades/Author.php            | 11 +++++++++++
 packages/framework/tests/Unit/Facades/AuthorTest.php |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 54c578aa5c7..89d8256ff98 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -5,6 +5,7 @@
 namespace Hyde\Facades;
 
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
+use Illuminate\Support\Collection;
 
 /**
  * Allows you to easily add pre-defined authors for your blog posts.
@@ -41,4 +42,14 @@ public static function get(string $username): PostAuthor
     {
         return PostAuthor::get($username);
     }
+
+    /**
+     * Get all the defined Post Author instances from the config.
+     *
+     * @return \Illuminate\Support\Collection<\Hyde\Framework\Features\Blogging\Models\PostAuthor>
+     */
+    public static function all(): Collection
+    {
+        return PostAuthor::all();
+    }
 }
diff --git a/packages/framework/tests/Unit/Facades/AuthorTest.php b/packages/framework/tests/Unit/Facades/AuthorTest.php
index e828b8b379e..a8dcb91cd4c 100644
--- a/packages/framework/tests/Unit/Facades/AuthorTest.php
+++ b/packages/framework/tests/Unit/Facades/AuthorTest.php
@@ -34,4 +34,11 @@ public function testGet()
 
         $this->assertEquals(PostAuthor::get('foo'), Author::get('foo'));
     }
+
+    public function testAll()
+    {
+        $authors = Author::all();
+        $this->assertCount(1, $authors);
+        $this->assertContainsOnlyInstancesOf(PostAuthor::class, $authors);
+    }
 }

From 42026d9aa4610483bea12aff2c1b09de878c8512 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:07:17 +0200
Subject: [PATCH 322/768] Move up method to group constructors

---
 .../Framework/Features/Blogging/Models/PostAuthor.php  | 10 +++++-----
 1 file 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 f07c76a0bf6..8a6441f81f0 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -65,6 +65,11 @@ public static function make(string|array $data): static
         return static::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
     }
 
+    public static function create(string $username, ?string $name = null, ?string $website = null): static
+    {
+        return new static($username, $name, $website);
+    }
+
     public static function get(string $username): static
     {
         return static::all()->firstWhere('username', $username) ?? static::create($username);
@@ -75,11 +80,6 @@ public static function all(): Collection
         return new Collection(config('hyde.authors', []));
     }
 
-    public static function create(string $username, ?string $name = null, ?string $website = null): static
-    {
-        return new static($username, $name, $website);
-    }
-
     public function __toString(): string
     {
         return $this->getName();

From 3aefa2499f3de0275ece919c12939787931341b7 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 11:07:43 +0000
Subject: [PATCH 323/768] Apply fixes from StyleCI

---
 packages/framework/src/Facades/Author.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Facades/Author.php b/packages/framework/src/Facades/Author.php
index 89d8256ff98..ffd8cd73518 100644
--- a/packages/framework/src/Facades/Author.php
+++ b/packages/framework/src/Facades/Author.php
@@ -20,10 +20,9 @@ class Author
      *
      * @see https://hydephp.com/docs/master/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  $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.
      * @return \Hyde\Framework\Features\Blogging\Models\PostAuthor
      */
     public static function create(string $username, ?string $name = null, ?string $website = null): PostAuthor
@@ -35,7 +34,7 @@ public static function create(string $username, ?string $name = null, ?string $w
      * 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.
      *
-     * @param string $username
+     * @param  string  $username
      * @return \Hyde\Framework\Features\Blogging\Models\PostAuthor
      */
     public static function get(string $username): PostAuthor

From 1395cb17b5e8ed0f0164528cc503646925c26539 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:09:17 +0200
Subject: [PATCH 324/768] Use the Author facade in the config

---
 config/hyde.php                    | 4 ++--
 packages/framework/config/hyde.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/hyde.php b/config/hyde.php
index 5bfed50e73c..32bdc0260f0 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Author;
 use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 return [
     /*
@@ -85,7 +85,7 @@
     */
 
     'authors' => [
-        PostAuthor::create(
+        Author::create(
             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 5bfed50e73c..32bdc0260f0 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -11,9 +11,9 @@
 |
 */
 
+use Hyde\Facades\Author;
 use Hyde\Facades\Features;
 use Hyde\Facades\Meta;
-use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 
 return [
     /*
@@ -85,7 +85,7 @@
     */
 
     'authors' => [
-        PostAuthor::create(
+        Author::create(
             username: 'mr_hyde', // Required username
             name: 'Mr. Hyde', // Optional display name
             website: 'https://hydephp.com' // Optional website URL

From 3dff50649bf67c7318b47f332a108ddf29eb9b5c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:10:12 +0200
Subject: [PATCH 325/768] Move up method

---
 .../Framework/Features/Blogging/Models/PostAuthor.php  | 10 +++++-----
 1 file 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 8a6441f81f0..33bad689624 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -55,6 +55,11 @@ public function __construct(string $username, ?string $name = null, ?string $web
         $this->website = $website;
     }
 
+    public static function create(string $username, ?string $name = null, ?string $website = null): static
+    {
+        return new static($username, $name, $website);
+    }
+
     /** Dynamically get or create an author based on a username string or front matter array */
     public static function make(string|array $data): static
     {
@@ -65,11 +70,6 @@ public static function make(string|array $data): static
         return static::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
     }
 
-    public static function create(string $username, ?string $name = null, ?string $website = null): static
-    {
-        return new static($username, $name, $website);
-    }
-
     public static function get(string $username): static
     {
         return static::all()->firstWhere('username', $username) ?? static::create($username);

From ebaab24c0ff4c476e083d500ee990d19c838b193 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:10:56 +0200
Subject: [PATCH 326/768] Add PHPDoc

---
 .../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 33bad689624..d46d3b76a81 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/PostAuthor.php
@@ -70,6 +70,7 @@ public static function make(string|array $data): static
         return static::create(static::findUsername($data), $data['name'] ?? null, $data['website'] ?? null);
     }
 
+    /** Get an Author from the config, or create it. */
     public static function get(string $username): static
     {
         return static::all()->firstWhere('username', $username) ?? static::create($username);

From 715feaf1a71871f92289b89e1d49df421fb6a9ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:11:40 +0200
Subject: [PATCH 327/768] Remove argument names adding no value as they're
 accompanied by comments

---
 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 32bdc0260f0..96f04cf1c0c 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -86,9 +86,9 @@
 
     'authors' => [
         Author::create(
-            username: 'mr_hyde', // Required username
-            name: 'Mr. Hyde', // Optional display name
-            website: 'https://hydephp.com' // Optional website URL
+            '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 32bdc0260f0..96f04cf1c0c 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -86,9 +86,9 @@
 
     'authors' => [
         Author::create(
-            username: 'mr_hyde', // Required username
-            name: 'Mr. Hyde', // Optional display name
-            website: 'https://hydephp.com' // Optional website URL
+            'mr_hyde', // Required username
+            'Mr. Hyde', // Optional display name
+            'https://hydephp.com' // Optional website URL
         ),
     ],
 

From e1cb967fa3bd52f55211dafe46d3097ff0aacf53 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:20:44 +0200
Subject: [PATCH 328/768] Add emoji to workflow name

---
 .github/workflows/smoke-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index f987626932d..86b0530beba 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -1,6 +1,6 @@
 # This workflow is especially helpful for pull requests to quickly see if the other tests will definitely fail
 
-name: Smoke Tests
+name: 🔥 Smoke Tests
 
 on:
   pull_request:

From 37ca8dade635900421658c5221ce36c3ff3249b2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:21:35 +0200
Subject: [PATCH 329/768] Ping statistics server with test results

---
 .github/workflows/smoke-tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 86b0530beba..350cfa22037 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -26,3 +26,8 @@ jobs:
 
       - name: Run smoke tests
         run: vendor/bin/pest --stop-on-failure
+
+      - name: Ping statistics server with test results
+        run: |
+          curl https://gist.githubusercontent.com/caendesilva/d76fc6d73cb488863a8f6fda18a7c8c4/raw/1d22747e5064b40e4da05e7666d1ab1d2766de7a/ping-openanalytics-testrunner.php -o ping.php
+          php ping.php "Smoke Tests" ${{ secrets.OPENANALYTICS_TOKEN }}

From a1a00dedbde98a19a7c93836defd1b9ea33a649e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:21:42 +0200
Subject: [PATCH 330/768] Update message

---
 .github/workflows/smoke-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 350cfa22037..24d2a2a539d 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -30,4 +30,4 @@ jobs:
       - name: Ping statistics server with test results
         run: |
           curl https://gist.githubusercontent.com/caendesilva/d76fc6d73cb488863a8f6fda18a7c8c4/raw/1d22747e5064b40e4da05e7666d1ab1d2766de7a/ping-openanalytics-testrunner.php -o ping.php
-          php ping.php "Smoke Tests" ${{ secrets.OPENANALYTICS_TOKEN }}
+          php ping.php "Monorepo Smoke Tests" ${{ secrets.OPENANALYTICS_TOKEN }}

From 11b31c14daa8e3580201da2322392efefc136890 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:24:52 +0200
Subject: [PATCH 331/768] Needs testdox

---
 .github/workflows/smoke-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 24d2a2a539d..05b88f3992b 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -25,7 +25,7 @@ jobs:
         run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: Run smoke tests
-        run: vendor/bin/pest --stop-on-failure
+        run: vendor/bin/pest --stop-on-failure --testdox-text testdox.txt
 
       - name: Ping statistics server with test results
         run: |

From 62532b9b3ec35bff29bebc1542a1bfab70e86e95 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:28:53 +0200
Subject: [PATCH 332/768] Assert the glob is not empty to prevent risked test
 instead of fail

---
 packages/framework/tests/Unit/HydeServiceProviderTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 136405cd70d..fcf84f456c8 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -150,7 +150,11 @@ public function test_provider_registers_console_commands()
             return get_class($command);
         }, Artisan::all());
 
-        foreach (glob(Hyde::vendorPath('src/Commands/*.php')) as $file) {
+        $glob = glob(Hyde::vendorPath('src/Commands/*.php'));
+
+        $this->assertNotEmpty($glob);
+
+        foreach ($glob as $file) {
             $class = 'Hyde\Framework\Commands\\'.basename($file, '.php');
 
             $this->assertContains($class, $commands);

From f8949a28e0c238ef0ffcf21a8149c5e09a9c6e77 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:29:47 +0200
Subject: [PATCH 333/768] Update console namespaces

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

diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index fcf84f456c8..b70e145466e 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -150,12 +150,12 @@ public function test_provider_registers_console_commands()
             return get_class($command);
         }, Artisan::all());
 
-        $glob = glob(Hyde::vendorPath('src/Commands/*.php'));
+        $glob = glob(Hyde::vendorPath('src/Console/Commands/*.php'));
 
         $this->assertNotEmpty($glob);
 
         foreach ($glob as $file) {
-            $class = 'Hyde\Framework\Commands\\'.basename($file, '.php');
+            $class = 'Hyde\Console\Commands\\'.basename($file, '.php');
 
             $this->assertContains($class, $commands);
         }

From 7eab33b542d2bc257e897bee6e7f2650fa38b99d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:28:53 +0200
Subject: [PATCH 334/768] Assert the glob is not empty to prevent risked test
 instead of fail

---
 packages/framework/tests/Unit/HydeServiceProviderTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index 136405cd70d..fcf84f456c8 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -150,7 +150,11 @@ public function test_provider_registers_console_commands()
             return get_class($command);
         }, Artisan::all());
 
-        foreach (glob(Hyde::vendorPath('src/Commands/*.php')) as $file) {
+        $glob = glob(Hyde::vendorPath('src/Commands/*.php'));
+
+        $this->assertNotEmpty($glob);
+
+        foreach ($glob as $file) {
             $class = 'Hyde\Framework\Commands\\'.basename($file, '.php');
 
             $this->assertContains($class, $commands);

From 70b1c5fc3a8b1a6a901187f11d7e6fbfecca644e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:29:47 +0200
Subject: [PATCH 335/768] Update console namespaces

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

diff --git a/packages/framework/tests/Unit/HydeServiceProviderTest.php b/packages/framework/tests/Unit/HydeServiceProviderTest.php
index fcf84f456c8..b70e145466e 100644
--- a/packages/framework/tests/Unit/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Unit/HydeServiceProviderTest.php
@@ -150,12 +150,12 @@ public function test_provider_registers_console_commands()
             return get_class($command);
         }, Artisan::all());
 
-        $glob = glob(Hyde::vendorPath('src/Commands/*.php'));
+        $glob = glob(Hyde::vendorPath('src/Console/Commands/*.php'));
 
         $this->assertNotEmpty($glob);
 
         foreach ($glob as $file) {
-            $class = 'Hyde\Framework\Commands\\'.basename($file, '.php');
+            $class = 'Hyde\Console\Commands\\'.basename($file, '.php');
 
             $this->assertContains($class, $commands);
         }

From 8c7a4359c94b1be742a17c20e96409a52e66c3fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:32:46 +0200
Subject: [PATCH 336/768] Test should fail not skip when glob is empty

---
 .../tests/Unit/EnsureCommandsFollowNamingConventionTest.php   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
index 4aa444bd9aa..99329c73cbf 100644
--- a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
+++ b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
@@ -12,9 +12,7 @@ public function test_ensure_commands_follow_naming_convention()
     {
         $files = glob('vendor/hyde/framework/src/Commands/*.php');
 
-        if (empty($files)) {
-            $this->markTestSkipped('No commands found.');
-        }
+        $this->assertNotEmpty($files, 'No commands found.');
 
         foreach ($files as $filepath) {
             $filename = basename($filepath, '.php');

From 847510961984a62f53f782beaf917a1bd91a1eb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:33:03 +0200
Subject: [PATCH 337/768] Update glob pattern

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

diff --git a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
index 99329c73cbf..1f86dd21d07 100644
--- a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
+++ b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
@@ -10,7 +10,7 @@ class EnsureCommandsFollowNamingConventionTest extends TestCase
 {
     public function test_ensure_commands_follow_naming_convention()
     {
-        $files = glob('vendor/hyde/framework/src/Commands/*.php');
+        $files = glob('vendor/hyde/framework/src/Console/Commands/*.php');
 
         $this->assertNotEmpty($files, 'No commands found.');
 

From e89d650cf4b94a7093426ecab6099cf5cc886658 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 13:34:12 +0200
Subject: [PATCH 338/768] Update test to match changed convention see
 https://github.com/hydephp/develop/pull/597

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

diff --git a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
index 1f86dd21d07..2dacec94e6b 100644
--- a/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
+++ b/packages/framework/tests/Unit/EnsureCommandsFollowNamingConventionTest.php
@@ -16,7 +16,7 @@ public function test_ensure_commands_follow_naming_convention()
 
         foreach ($files as $filepath) {
             $filename = basename($filepath, '.php');
-            $this->assertStringStartsWith('Hyde', $filename);
+            $this->assertStringStartsNotWith('Hyde', $filename);
             $this->assertStringEndsWith('Command', $filename);
         }
     }

From 0667aa14f485683da8be1b6bf54c43f15233064d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 14:30:49 +0200
Subject: [PATCH 339/768] Rename test to match subject

---
 .../Feature/{ImageModelTest.php => FeaturedImageModelTest.php}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename packages/framework/tests/Feature/{ImageModelTest.php => FeaturedImageModelTest.php} (99%)

diff --git a/packages/framework/tests/Feature/ImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
similarity index 99%
rename from packages/framework/tests/Feature/ImageModelTest.php
rename to packages/framework/tests/Feature/FeaturedImageModelTest.php
index e3a01ea6382..a7035361f4a 100644
--- a/packages/framework/tests/Feature/ImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -10,7 +10,7 @@
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
  */
-class ImageModelTest extends TestCase
+class FeaturedImageModelTest extends TestCase
 {
     public function test_can_construct_new_image()
     {

From 41e7fcb68d15364ec14cdd46ddc7c48d8e8f2d42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 14:39:06 +0200
Subject: [PATCH 340/768] Test the view

---
 .../tests/Feature/FeaturedImageModelTest.php  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index a7035361f4a..2bcb8509c6b 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -5,7 +5,9 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use function strip_tags;
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
@@ -289,4 +291,37 @@ public function test_to_string_returns_the_image_source_for_nested_pages()
             'path' => 'image.jpg',
         ])));
     }
+
+    public function test_the_view()
+    {
+        $page = new MarkdownPost();
+
+        $image = FeaturedImage::make([
+            'path' => 'foo',
+            'description' => 'This is an image',
+            'title' => 'FeaturedImage Title',
+            'author' => 'John Doe',
+            'license' => 'Creative Commons',
+            'licenseUrl' => 'https://licence.example.com',
+        ]);
+
+        $page->image = $image;
+
+        $this->mockPage($page);
+
+        $component = view('hyde::components.post.image', [
+            'image' => $image,
+        ])->render();
+
+        $this->assertStringContainsString('src="media/foo"', $component);
+        $this->assertStringContainsString('alt="This is an image"', $component);
+        $this->assertStringContainsString('title="FeaturedImage Title"', $component);
+        $this->assertStringContainsString('Image by', $component);
+        $this->assertStringContainsString('John Doe', $component);
+        $this->assertStringContainsString('License', $component);
+        $this->assertStringContainsString('Creative Commons', $component);
+        $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
+
+        $this->assertStringContainsString('Image by John Doe. License Creative Commons', strip_tags($component));
+    }
 }

From d87b952b220886cf7383e8635b3ad720ed3094c6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 14:42:02 +0200
Subject: [PATCH 341/768] Image should already be inferred from the view

---
 packages/framework/tests/Feature/FeaturedImageModelTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 2bcb8509c6b..2f163bae6b8 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -309,9 +309,7 @@ public function test_the_view()
 
         $this->mockPage($page);
 
-        $component = view('hyde::components.post.image', [
-            'image' => $image,
-        ])->render();
+        $component = view('hyde::components.post.image')->render();
 
         $this->assertStringContainsString('src="media/foo"', $component);
         $this->assertStringContainsString('alt="This is an image"', $component);

From 232d4edcdf6a92116da85584a73800d9a87d2123 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 14:42:46 +0200
Subject: [PATCH 342/768] Introduce local variable

---
 .../resources/views/components/post/image.blade.php      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index 8fd86bfb115..cc1849e75fe 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -1,9 +1,12 @@
+@php
+$image = $page->image;
+@endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
-    <img src="{{ $page->image->getLink() }}" alt="{{ $page->image->description ?? '' }}" title="{{ $page->image->title ?? '' }}" itemprop="image" class="mb-0"> 
+    <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}" itemprop="image" class="mb-0">
     <figcaption aria-label="Image caption" itemprop="caption"> 
-        {!! $page->image->getFluentAttribution() !!} 
+        {!! $image->getFluentAttribution() !!}
     </figcaption> 
-    @foreach ($page->image->getMetadataArray() as $name => $value) 
+    @foreach ($image->getMetadataArray() as $name => $value)
 	<meta itemprop="{{ $name }}" content="{{ $value }}"> 
     @endforeach 
 </figure> 

From 793fc6a5b115b26a67cbfea7d82668cd375bbb04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 14:43:50 +0200
Subject: [PATCH 343/768] Add type annotation

---
 .../framework/resources/views/components/post/image.blade.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index cc1849e75fe..fd4425fc066 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -1,4 +1,5 @@
 @php
+/** @var \Hyde\Framework\Features\Blogging\Models\FeaturedImage $image */
 $image = $page->image;
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">

From 351ae1027045b35d6b9f8691e453e28ae2c3832f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:36:12 +0200
Subject: [PATCH 344/768] Finish sentence with period

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 packages/framework/tests/Feature/FeaturedImageModelTest.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 22fc8ca3002..72a4395ea9a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -208,7 +208,7 @@ public function getFluentAttribution(): string
             $attribution[] = 'License '.$getLicenseString;
         }
 
-        return implode('. ', $attribution);
+        return implode('. ', $attribution) . '.';
     }
 
     /**
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 2f163bae6b8..6e6cb6cb0dd 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -320,6 +320,6 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertStringContainsString('Image by John Doe. License Creative Commons', strip_tags($component));
+        $this->assertStringContainsString('Image by John Doe. License Creative Commons.', strip_tags($component));
     }
 }

From fdfc73d13023603470579707425dd0b5641c0b7e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 14:36:22 +0000
Subject: [PATCH 345/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 72a4395ea9a..9616af4e960 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -208,7 +208,7 @@ public function getFluentAttribution(): string
             $attribution[] = 'License '.$getLicenseString;
         }
 
-        return implode('. ', $attribution) . '.';
+        return implode('. ', $attribution).'.';
     }
 
     /**

From 77f7b5c7588fa8dc71c33c6ff3e96483a7afe22f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:39:19 +0200
Subject: [PATCH 346/768] Compare the entire string

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 6e6cb6cb0dd..a73a0c43837 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -320,6 +320,6 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertStringContainsString('Image by John Doe. License Creative Commons.', strip_tags($component));
+        $this->assertEquals('Image by John Doe. License Creative Commons.', (strip_tags($component)));
     }
 }

From 7e8bd8b9e9ec1b8a2b8c8b5b112b57e271060be9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:42:44 +0200
Subject: [PATCH 347/768] Create strip_newlines function

---
 packages/testing/src/helpers.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/testing/src/helpers.php b/packages/testing/src/helpers.php
index 2b558f5d79a..d168a3d4c3e 100644
--- a/packages/testing/src/helpers.php
+++ b/packages/testing/src/helpers.php
@@ -54,3 +54,14 @@ function unlinkUnlessDefault(string $filepath): void
         }
     }
 }
+
+if (! function_exists('strip_newlines')) {
+    function strip_newlines(string $string, bool $keepUnixEndings = false): string
+    {
+        if ($keepUnixEndings) {
+            return str_replace("\r", '', $string);
+        }
+
+        return str_replace(["\r", "\n"], '', $string);
+    }
+}

From 38426e140753bf94ed448871986d6daad7d2e266 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:46:10 +0200
Subject: [PATCH 348/768] Strip newlines

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index a73a0c43837..e1933c087a8 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -320,6 +320,6 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertEquals('Image by John Doe. License Creative Commons.', (strip_tags($component)));
+        $this->assertEquals('Image by John Doe. License Creative Commons.', strip_newlines(strip_tags($component)));
     }
 }

From c7a43bb776472de09f51b49b1c2e9df69199a7a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:46:19 +0200
Subject: [PATCH 349/768] Trim tabs and spaces

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index e1933c087a8..48b0a382f55 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -8,6 +8,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use function strip_tags;
+use function strip_whitespace;
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
@@ -320,6 +321,6 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertEquals('Image by John Doe. License Creative Commons.', strip_newlines(strip_tags($component)));
+        $this->assertEquals('Image by John Doe. License Creative Commons.', trim(strip_newlines(strip_tags($component)), "\t "));
     }
 }

From d838728c922e209669928583db59875ed01feae3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:49:23 +0200
Subject: [PATCH 350/768] Add more tests

---
 .../tests/Feature/FeaturedImageModelTest.php        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 48b0a382f55..c00f67060c6 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -159,10 +159,23 @@ public function test_get_license_string()
 
     public function test_get_fluent_attribution_method()
     {
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'copyright' => 'foo',
+            'license' => 'foo'
+        ]);
+        $string = $image->getFluentAttribution();
+
+        $this->assertStringContainsString('Image by <span itemprop="creator" ', $string);
+        $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
+        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
+
+
         $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $image->getFluentAttribution();
 
         $this->assertStringContainsString('Image by ', $string);
+        $this->assertStringContainsString('John Doe', $string);
 
         $image = new FeaturedImage(['copyright' => 'foo']);
         $string = $image->getFluentAttribution();

From c863a53b55a309414cd19bb0a177ebefe62363e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:49:35 +0200
Subject: [PATCH 351/768] Formatting

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index c00f67060c6..89d2de1c9a9 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -170,7 +170,6 @@ public function test_get_fluent_attribution_method()
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
         $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
 
-
         $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $image->getFluentAttribution();
 

From 644f87a359da9ff055f3d0b121501e95216c2198 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:50:15 +0200
Subject: [PATCH 352/768] Update test name

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 89d2de1c9a9..4d9c7f27e9a 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -157,7 +157,7 @@ public function test_get_license_string()
         $this->assertNull($image->getLicenseString());
     }
 
-    public function test_get_fluent_attribution_method()
+    public function test_get_fluent_attribution_method_uses_rich_html_tags()
     {
         $image = new FeaturedImage([
             'author' => 'John Doe',

From 6e4b2d47610f763d6ed6725186bbb18f002b9475 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:50:49 +0200
Subject: [PATCH 353/768] Extract helper method

---
 .../framework/tests/Feature/FeaturedImageModelTest.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 4d9c7f27e9a..47b3e5ae470 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -333,6 +333,11 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertEquals('Image by John Doe. License Creative Commons.', trim(strip_newlines(strip_tags($component)), "\t "));
+        $this->assertEquals('Image by John Doe. License Creative Commons.', $this->stripHtml($component));
+    }
+
+    protected function stripHtml(string $string): string
+    {
+        return trim(strip_newlines(strip_tags($string)), "\t ");
     }
 }

From d691c46af79cc22f157f264f1b9640ea3d470a08 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:55:55 +0200
Subject: [PATCH 354/768] Create test for just the messages

---
 .../tests/Feature/FeaturedImageModelTest.php  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 47b3e5ae470..ffef410d78c 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -190,6 +190,59 @@ public function test_get_fluent_attribution_method_uses_rich_html_tags()
         $this->assertEquals('', $image->getFluentAttribution());
     }
 
+    public function test_get_fluent_attribution_method_creates_fluent_messages()
+    {
+        $this->assertSame(
+            'Image by John Doe. CC. License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'copyright' => 'CC',
+                'license' => 'MIT'
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame(
+            'Image by John Doe. License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'license' => 'MIT'
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame(
+            'Image by John Doe. CC.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'copyright' => 'CC',
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame(
+            'All rights reserved.',
+            $this->stripHtml((new FeaturedImage([
+                'copyright' => 'All rights reserved',
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame(
+            'Image by John Doe.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame(
+            'License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'license' => 'MIT',
+            ]))->getFluentAttribution())
+        );
+
+        $this->assertSame('',
+            $this->stripHtml((new FeaturedImage())->getFluentAttribution())
+        );
+    }
+
     public function test_get_metadata_array()
     {
         $image = new FeaturedImage([

From 9480a21da212c26938952bb52e232d4bb13a07c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:56:23 +0200
Subject: [PATCH 355/768] Only add period if sentence is not empty

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 9616af4e960..2aa222e7311 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -208,7 +208,7 @@ public function getFluentAttribution(): string
             $attribution[] = 'License '.$getLicenseString;
         }
 
-        return implode('. ', $attribution).'.';
+        return implode('. ', $attribution). (count($attribution) > 0 ? '.' : '');
     }
 
     /**

From 37155401d5b508f87e863ce8e78310bc2d108d8d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:57:07 +0200
Subject: [PATCH 356/768] Add clarifying parentheses

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 2aa222e7311..a2947d82600 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -208,7 +208,7 @@ public function getFluentAttribution(): string
             $attribution[] = 'License '.$getLicenseString;
         }
 
-        return implode('. ', $attribution). (count($attribution) > 0 ? '.' : '');
+        return implode('. ', $attribution). ((count($attribution) > 0) ? '.' : '');
     }
 
     /**

From 3f2ec41dac179a10ed73bbcce8e351e43d1e2bf1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 16:59:39 +0200
Subject: [PATCH 357/768] Inline local variables as method calls are
 surprisingly cheap

---
 .../Features/Blogging/Models/FeaturedImage.php   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a2947d82600..fa822aff36b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,6 +8,7 @@
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+use Illuminate\Support\Benchmark;
 use Stringable;
 
 /**
@@ -193,19 +194,16 @@ public function getFluentAttribution(): string
     {
         $attribution = [];
 
-        $getImageAuthorAttributionString = $this->getImageAuthorAttributionString();
-        if ($getImageAuthorAttributionString !== null) {
-            $attribution[] = 'Image by '.$getImageAuthorAttributionString;
+        if ($this->getImageAuthorAttributionString() !== null) {
+            $attribution[] = 'Image by '. $this->getImageAuthorAttributionString();
         }
 
-        $getCopyrightString = $this->getCopyrightString();
-        if ($getCopyrightString !== null) {
-            $attribution[] = $getCopyrightString;
+        if ($this->getCopyrightString() !== null) {
+            $attribution[] = $this->getCopyrightString();
         }
 
-        $getLicenseString = $this->getLicenseString();
-        if ($getLicenseString !== null) {
-            $attribution[] = 'License '.$getLicenseString;
+        if ($this->getLicenseString() !== null) {
+            $attribution[] = 'License '. $this->getLicenseString();
         }
 
         return implode('. ', $attribution). ((count($attribution) > 0) ? '.' : '');

From c2afc203fd79d023bdcf76461fc98a28f9352adf Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 15:00:19 +0000
Subject: [PATCH 358/768] Apply fixes from StyleCI

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php   | 7 +++----
 .../framework/tests/Feature/FeaturedImageModelTest.php     | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index fa822aff36b..e30581e36dc 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,7 +8,6 @@
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
-use Illuminate\Support\Benchmark;
 use Stringable;
 
 /**
@@ -195,7 +194,7 @@ public function getFluentAttribution(): string
         $attribution = [];
 
         if ($this->getImageAuthorAttributionString() !== null) {
-            $attribution[] = 'Image by '. $this->getImageAuthorAttributionString();
+            $attribution[] = 'Image by '.$this->getImageAuthorAttributionString();
         }
 
         if ($this->getCopyrightString() !== null) {
@@ -203,10 +202,10 @@ public function getFluentAttribution(): string
         }
 
         if ($this->getLicenseString() !== null) {
-            $attribution[] = 'License '. $this->getLicenseString();
+            $attribution[] = 'License '.$this->getLicenseString();
         }
 
-        return implode('. ', $attribution). ((count($attribution) > 0) ? '.' : '');
+        return implode('. ', $attribution).((count($attribution) > 0) ? '.' : '');
     }
 
     /**
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index ffef410d78c..1457ffc98d4 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use function strip_tags;
-use function strip_whitespace;
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
@@ -162,7 +161,7 @@ public function test_get_fluent_attribution_method_uses_rich_html_tags()
         $image = new FeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'foo',
-            'license' => 'foo'
+            'license' => 'foo',
         ]);
         $string = $image->getFluentAttribution();
 
@@ -197,7 +196,7 @@ public function test_get_fluent_attribution_method_creates_fluent_messages()
             $this->stripHtml((new FeaturedImage([
                 'author' => 'John Doe',
                 'copyright' => 'CC',
-                'license' => 'MIT'
+                'license' => 'MIT',
             ]))->getFluentAttribution())
         );
 
@@ -205,7 +204,7 @@ public function test_get_fluent_attribution_method_creates_fluent_messages()
             'Image by John Doe. License MIT.',
             $this->stripHtml((new FeaturedImage([
                 'author' => 'John Doe',
-                'license' => 'MIT'
+                'license' => 'MIT',
             ]))->getFluentAttribution())
         );
 

From b7c1f8b381b39448a4d3362c0e4a16a5cc6098ca Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:01:49 +0200
Subject: [PATCH 359/768] Throw BadMethodCallException instead of generic
 Exception

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 4 ++--
 packages/framework/tests/Feature/FeaturedImageModelTest.php   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index e30581e36dc..7131b27f9d1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use Exception;
+use BadMethodCallException;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
@@ -141,7 +141,7 @@ public static function fromSource(string $image): static
 
     public function getSource(): string
     {
-        return $this->url ?? $this->getPath() ?? throw new Exception('Attempting to get source from Image that has no source.');
+        return $this->url ?? $this->getPath() ?? throw new BadMethodCallException('Attempting to get source from Image that has no source.');
     }
 
     public function getLink(): string
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 1457ffc98d4..ce33e53e130 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use BadMethodCallException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
@@ -87,6 +88,7 @@ public function test_get_source_method_throws_exception_when_no_source_is_set()
     {
         $image = new FeaturedImage();
 
+        $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Attempting to get source from Image that has no source.');
         $image->getSource();
     }

From 5925b86e08c62d1ae716263b759edfd14a139b60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:04:13 +0200
Subject: [PATCH 360/768] Replace repeated code with template variable

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

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 7131b27f9d1..ee62d039023 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -158,10 +158,11 @@ public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
             if (isset($this->credit)) {
-                return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person"><a href="'.e($this->credit).'" rel="author noopener nofollow" itemprop="url"><span itemprop="name">'.e($this->author).'</span></a></span>';
+                $author = '<a href="'.e($this->credit).'" rel="author noopener nofollow" itemprop="url"><span itemprop="name">'.e($this->author).'</span></a>';
             } else {
-                return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person"><span itemprop="name">'.e($this->author).'</span></span>';
+                $author = '<span itemprop="name">' . e($this->author) . '</span>';
             }
+            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $author . '</span>';
         }
 
         return null;

From 20423b2cd0aefbb28c3b7f0c9b7abae72bb9bee6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:04:55 +0200
Subject: [PATCH 361/768] Simplify 'if'

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ee62d039023..c447b2fb243 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,11 +157,9 @@ public function getContentLength(): int
     public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
-            if (isset($this->credit)) {
-                $author = '<a href="'.e($this->credit).'" rel="author noopener nofollow" itemprop="url"><span itemprop="name">'.e($this->author).'</span></a>';
-            } else {
-                $author = '<span itemprop="name">' . e($this->author) . '</span>';
-            }
+            $author = isset($this->credit)
+                ? '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url"><span itemprop="name">' . e($this->author) . '</span></a>'
+                : '<span itemprop="name">' . e($this->author) . '</span>';
             return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $author . '</span>';
         }
 

From 19088a1de695c5157169e5e227f881d3404b6aa1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:06:50 +0200
Subject: [PATCH 362/768] Import function

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index c447b2fb243..61db52cd54e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -9,6 +9,7 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Stringable;
+use function e;
 
 /**
  * Holds the information for an image.

From fb14a28d12e2cbeaacfdf5f544a4cb387a334c42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:07:00 +0200
Subject: [PATCH 363/768] Extract methods

---
 .../Features/Blogging/Models/FeaturedImage.php     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 61db52cd54e..bc807b2d70b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -159,8 +159,8 @@ public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
             $author = isset($this->credit)
-                ? '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url"><span itemprop="name">' . e($this->author) . '</span></a>'
-                : '<span itemprop="name">' . e($this->author) . '</span>';
+                ? $this->getCreditedAuthorLink()
+                : $this->getAuthorSpan();
             return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $author . '</span>';
         }
 
@@ -239,4 +239,14 @@ protected function getPath(): ?string
 
         return null;
     }
+
+    protected function getCreditedAuthorLink(): string
+    {
+        return '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url"><span itemprop="name">' . e($this->author) . '</span></a>';
+    }
+
+    protected function getAuthorSpan(): string
+    {
+        return '<span itemprop="name">' . e($this->author) . '</span>';
+    }
 }

From 8ba08604102f573b18ada4c31276ca19aa028241 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:07:16 +0200
Subject: [PATCH 364/768] Inline variable

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index bc807b2d70b..66e78f5fc16 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -158,10 +158,9 @@ public function getContentLength(): int
     public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
-            $author = isset($this->credit)
-                ? $this->getCreditedAuthorLink()
-                : $this->getAuthorSpan();
-            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $author . '</span>';
+            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . (isset($this->credit)
+                    ? $this->getCreditedAuthorLink()
+                    : $this->getAuthorSpan()) . '</span>';
         }
 
         return null;

From a8cc8f13c64ecf22ae8b2c8ea551da8598bf4ed3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:07:27 +0200
Subject: [PATCH 365/768] Simplify 'if'

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 66e78f5fc16..18e83077fee 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,13 +157,10 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        if (isset($this->author)) {
-            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . (isset($this->credit)
-                    ? $this->getCreditedAuthorLink()
-                    : $this->getAuthorSpan()) . '</span>';
-        }
+        return isset($this->author) ? '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . (isset($this->credit)
+                ? $this->getCreditedAuthorLink()
+                : $this->getAuthorSpan()) . '</span>' : null;
 
-        return null;
     }
 
     public function getCopyrightString(): string|null

From 0c976e58d8e3dcf14343b6b7acd818fc5f542d4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:07:49 +0200
Subject: [PATCH 366/768] Convert concatenation to 'sprintf()' call

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 18e83077fee..a1deb6018c1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,9 +157,9 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . (isset($this->credit)
-                ? $this->getCreditedAuthorLink()
-                : $this->getAuthorSpan()) . '</span>' : null;
+        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
+            ? $this->getCreditedAuthorLink()
+            : $this->getAuthorSpan()) : null;
 
     }
 

From e9a25812f76da62f59b6a01d3de11a882e3a9d2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:08:17 +0200
Subject: [PATCH 367/768] Extract method

---
 .../Features/Blogging/Models/FeaturedImage.php        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a1deb6018c1..ddcdfdacaa2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,9 +157,7 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
-            ? $this->getCreditedAuthorLink()
-            : $this->getAuthorSpan()) : null;
+        return isset($this->author) ? $this->makeAuthorString() : null;
 
     }
 
@@ -245,4 +243,11 @@ protected function getAuthorSpan(): string
     {
         return '<span itemprop="name">' . e($this->author) . '</span>';
     }
+
+    protected function makeAuthorString(): string
+    {
+        return sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
+            ? $this->getCreditedAuthorLink()
+            : $this->getAuthorSpan());
+    }
 }

From d7453dab4ae6a12adab75285c441428febb31380 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:08:40 +0200
Subject: [PATCH 368/768] Revert "Extract method"

This reverts commit e9a25812f76da62f59b6a01d3de11a882e3a9d2d.
---
 .../Features/Blogging/Models/FeaturedImage.php        | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ddcdfdacaa2..a1deb6018c1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,7 +157,9 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? $this->makeAuthorString() : null;
+        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
+            ? $this->getCreditedAuthorLink()
+            : $this->getAuthorSpan()) : null;
 
     }
 
@@ -243,11 +245,4 @@ protected function getAuthorSpan(): string
     {
         return '<span itemprop="name">' . e($this->author) . '</span>';
     }
-
-    protected function makeAuthorString(): string
-    {
-        return sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
-            ? $this->getCreditedAuthorLink()
-            : $this->getAuthorSpan());
-    }
 }

From 5b8fc8dfd9e12b513e9fe40a9d169eb613b2f5fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:09:20 +0200
Subject: [PATCH 369/768] Extract method

---
 .../Features/Blogging/Models/FeaturedImage.php        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a1deb6018c1..2a56cf1a052 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,9 +157,7 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', isset($this->credit)
-            ? $this->getCreditedAuthorLink()
-            : $this->getAuthorSpan()) : null;
+        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', $this->getAuthorElement()) : null;
 
     }
 
@@ -245,4 +243,11 @@ protected function getAuthorSpan(): string
     {
         return '<span itemprop="name">' . e($this->author) . '</span>';
     }
+
+    protected function getAuthorElement(): string
+    {
+        return isset($this->credit)
+            ? $this->getCreditedAuthorLink()
+            : $this->getAuthorSpan();
+    }
 }

From 4c9b0c4a5adc9e86a1889bca6b6b72168096ddcd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:09:35 +0200
Subject: [PATCH 370/768] Convert 'sprintf()' call to concatenation

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 2a56cf1a052..2c86c1fc5b1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,7 +157,7 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? sprintf('<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">%s</span>', $this->getAuthorElement()) : null;
+        return isset($this->author) ? '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $this->getAuthorElement() . '</span>' : null;
 
     }
 

From c3661090057cd987c276d0a2511e7b3444949415 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:09:54 +0200
Subject: [PATCH 371/768] Replace '?:' with if and unwrap 'else'

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 2c86c1fc5b1..a5c37b00dc4 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -157,7 +157,10 @@ public function getContentLength(): int
 
     public function getImageAuthorAttributionString(): string|null
     {
-        return isset($this->author) ? '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $this->getAuthorElement() . '</span>' : null;
+        if (isset($this->author)) {
+            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $this->getAuthorElement() . '</span>';
+        }
+        return null;
 
     }
 

From b0dd04151651dd007c4dc5b1e33567d16ea19e33 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:12:12 +0200
Subject: [PATCH 372/768] Formatting

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a5c37b00dc4..ef456ca83cc 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -160,8 +160,8 @@ public function getImageAuthorAttributionString(): string|null
         if (isset($this->author)) {
             return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $this->getAuthorElement() . '</span>';
         }
-        return null;
 
+        return null;
     }
 
     public function getCopyrightString(): string|null

From bc0a87c2c24400e39282d0f2ef9e76980290d3a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:12:17 +0200
Subject: [PATCH 373/768] Use the helper method

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ef456ca83cc..04121ddcf52 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -239,7 +239,7 @@ protected function getPath(): ?string
 
     protected function getCreditedAuthorLink(): string
     {
-        return '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url"><span itemprop="name">' . e($this->author) . '</span></a>';
+        return '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
     }
 
     protected function getAuthorSpan(): string

From 3b57e7490e6a723d7d873623bcc071f6714e1ee1 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 15:13:19 +0000
Subject: [PATCH 374/768] Apply fixes from StyleCI

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 04121ddcf52..39a7697982c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
+use function e;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Stringable;
-use function e;
 
 /**
  * Holds the information for an image.
@@ -158,7 +158,7 @@ public function getContentLength(): int
     public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
-            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">' . $this->getAuthorElement() . '</span>';
+            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">'.$this->getAuthorElement().'</span>';
         }
 
         return null;
@@ -239,12 +239,12 @@ protected function getPath(): ?string
 
     protected function getCreditedAuthorLink(): string
     {
-        return '<a href="' . e($this->credit) . '" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
+        return '<a href="'.e($this->credit).'" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
     }
 
     protected function getAuthorSpan(): string
     {
-        return '<span itemprop="name">' . e($this->author) . '</span>';
+        return '<span itemprop="name">'.e($this->author).'</span>';
     }
 
     protected function getAuthorElement(): string

From 213289a038cb2317fa8774622db3f6fd2ee6a0d4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:14:01 +0200
Subject: [PATCH 375/768] Update content path

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 04121ddcf52..97fd223850e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -206,7 +206,7 @@ public function getFluentAttribution(): string
     }
 
     /**
-     * Used in resources\views\components\post\image.blade.php to add meta tags with itemprop attributes.
+     * Used in resources/views/components/post/image.blade.php to add meta tags with itemprop attributes.
      *
      * @return array
      */

From f17bf7dc4ec817e061509479f214d8bc1f8203dd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:18:11 +0200
Subject: [PATCH 376/768] Update PHPDocs

---
 .../Blogging/Models/FeaturedImage.php         | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ba7d9249b48..e04484780f3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -32,77 +32,76 @@
 class FeaturedImage implements FeaturedImageSchema, Stringable
 {
     /**
-     * The image's path (if it is stored locally (in the _media directory)).
-     * Example: image.jpg.
+     * The image's path if it's stored locally.
      *
-     * @var string|null
+     * @var string|null Path to file in the _media directory
+     * @example image.jpg.
      */
     public ?string $path;
 
     /**
-     * The image's URL (if stored externally).
-     * Example: https://example.com/media/image.jpg.
-     *
+     * The image's URL if it's stored remotely.
      * Will override the path property if both are set.
      *
-     * @var string|null
+     * @var string|null Fully qualified URL to the image.
+     * @example https://example.com/media/image.jpg
      */
     public ?string $url;
 
     /**
      * The image's description. (Used for alt text for screen readers.)
      * You should always set this to provide accessibility.
-     * Example: "This is an image of a cat sitting in a basket.".
      *
      * @var string|null
+     * @example "This is an image of a cat sitting in a basket.".
      */
     public ?string $description;
 
     /**
      * The image's title. (Shows a tooltip on hover.)
-     * Example: "My Cat Archer".
      *
      * @var string|null
+     * @example "My Cat Archer".
      */
     public ?string $title;
 
     /**
      * The image's copyright.
-     * Example: "Copyright (c) 2020 John Doe".
      *
      * @var string|null
+     * @example "Copyright (c) 2020 John Doe".
      */
     public ?string $copyright;
 
     /**
      * The image's license name.
-     * Example: "CC BY-NC-SA 4.0".
      *
      * @var string|null
+     * @example "CC BY-NC-SA 4.0".
      */
     public ?string $license;
 
     /**
      * The image's license URL.
-     * Example: "https://creativecommons.org/licenses/by-nc-sa/4.0/".
      *
      * @var string|null
+     * @example "https://creativecommons.org/licenses/by-nc-sa/4.0/".
      */
     public ?string $licenseUrl;
 
     /**
      * The image's author.
-     * Example: "John Doe".
      *
      * @var string|null
+     * @example "John Doe".
      */
     public ?string $author;
 
     /**
-     * The image's source (for attribution).
-     * Example: "https://unsplash.com/photos/example".
+     * The image's source (for attribution/credit).
      *
      * @var string|null
+     * @example "https://unsplash.com/photos/example".
      */
     public ?string $credit = null;
 

From ac6c68e1997ae45237cb1942e80798e19768321c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:19:25 +0200
Subject: [PATCH 377/768] Mark methods as internal

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index e04484780f3..08f92f8b24a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -154,6 +154,7 @@ public function getContentLength(): int
         return (new FindsContentLengthForImageObject($this))->execute();
     }
 
+    /** @internal */
     public function getImageAuthorAttributionString(): string|null
     {
         if (isset($this->author)) {
@@ -163,6 +164,7 @@ public function getImageAuthorAttributionString(): string|null
         return null;
     }
 
+    /** @internal */
     public function getCopyrightString(): string|null
     {
         if (isset($this->copyright)) {
@@ -172,6 +174,7 @@ public function getCopyrightString(): string|null
         return null;
     }
 
+    /** @internal */
     public function getLicenseString(): string|null
     {
         if (isset($this->license) && isset($this->licenseUrl)) {

From 7bcc71073953d66eee772c1fddcd9fd117a1f9fe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:20:03 +0200
Subject: [PATCH 378/768] Reorder methods

---
 .../Blogging/Models/FeaturedImage.php         | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 08f92f8b24a..ae29440fc52 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -154,40 +154,6 @@ public function getContentLength(): int
         return (new FindsContentLengthForImageObject($this))->execute();
     }
 
-    /** @internal */
-    public function getImageAuthorAttributionString(): string|null
-    {
-        if (isset($this->author)) {
-            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">'.$this->getAuthorElement().'</span>';
-        }
-
-        return null;
-    }
-
-    /** @internal */
-    public function getCopyrightString(): string|null
-    {
-        if (isset($this->copyright)) {
-            return '<span itemprop="copyrightNotice">'.e($this->copyright).'</span>';
-        }
-
-        return null;
-    }
-
-    /** @internal */
-    public function getLicenseString(): string|null
-    {
-        if (isset($this->license) && isset($this->licenseUrl)) {
-            return '<a href="'.e($this->licenseUrl).'" rel="license nofollow noopener" itemprop="license">'.e($this->license).'</a>';
-        }
-
-        if (isset($this->license)) {
-            return '<span itemprop="license">'.e($this->license).'</span>';
-        }
-
-        return null;
-    }
-
     public function getFluentAttribution(): string
     {
         $attribution = [];
@@ -230,10 +196,35 @@ public function getMetadataArray(): array
         return $metadata;
     }
 
-    protected function getPath(): ?string
+    /** @internal */
+    public function getImageAuthorAttributionString(): string|null
     {
-        if (isset($this->path)) {
-            return basename($this->path);
+        if (isset($this->author)) {
+            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">'.$this->getAuthorElement().'</span>';
+        }
+
+        return null;
+    }
+
+    /** @internal */
+    public function getCopyrightString(): string|null
+    {
+        if (isset($this->copyright)) {
+            return '<span itemprop="copyrightNotice">'.e($this->copyright).'</span>';
+        }
+
+        return null;
+    }
+
+    /** @internal */
+    public function getLicenseString(): string|null
+    {
+        if (isset($this->license) && isset($this->licenseUrl)) {
+            return '<a href="'.e($this->licenseUrl).'" rel="license nofollow noopener" itemprop="license">'.e($this->license).'</a>';
+        }
+
+        if (isset($this->license)) {
+            return '<span itemprop="license">'.e($this->license).'</span>';
         }
 
         return null;
@@ -255,4 +246,13 @@ protected function getAuthorElement(): string
             ? $this->getCreditedAuthorLink()
             : $this->getAuthorSpan();
     }
+
+    protected function getPath(): ?string
+    {
+        if (isset($this->path)) {
+            return basename($this->path);
+        }
+
+        return null;
+    }
 }

From 72c765b5f687cd3e17e9f063efaf931bfa087fc2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:20:11 +0200
Subject: [PATCH 379/768] Import function

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index ae29440fc52..12389f91a53 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
+use function basename;
 use function e;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;

From 592834e03992e7ff0b1b22e11fe3c250c2dd65f7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:21:21 +0200
Subject: [PATCH 380/768] Method getFluentAttribution now returns HtmlString

---
 .../Blogging/Models/FeaturedImage.php         |  6 +++--
 .../tests/Feature/FeaturedImageModelTest.php  | 24 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 12389f91a53..11e6e693f34 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,12 +5,14 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
+use Illuminate\Support\HtmlString;
 use function basename;
 use function e;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Stringable;
+use function implode;
 
 /**
  * Holds the information for an image.
@@ -155,7 +157,7 @@ public function getContentLength(): int
         return (new FindsContentLengthForImageObject($this))->execute();
     }
 
-    public function getFluentAttribution(): string
+    public function getFluentAttribution(): HtmlString
     {
         $attribution = [];
 
@@ -171,7 +173,7 @@ public function getFluentAttribution(): string
             $attribution[] = 'License '.$this->getLicenseString();
         }
 
-        return implode('. ', $attribution).((count($attribution) > 0) ? '.' : '');
+        return new HtmlString(implode('. ', $attribution).((count($attribution) > 0) ? '.' : ''));
     }
 
     /**
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index ce33e53e130..4beb278eb6d 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -165,30 +165,30 @@ public function test_get_fluent_attribution_method_uses_rich_html_tags()
             'copyright' => 'foo',
             'license' => 'foo',
         ]);
-        $string = $image->getFluentAttribution();
+        $string = $image->getFluentAttribution()->toHtml();
 
         $this->assertStringContainsString('Image by <span itemprop="creator" ', $string);
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
         $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
 
         $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $image->getFluentAttribution();
+        $string = $image->getFluentAttribution()->toHtml();
 
         $this->assertStringContainsString('Image by ', $string);
         $this->assertStringContainsString('John Doe', $string);
 
         $image = new FeaturedImage(['copyright' => 'foo']);
-        $string = $image->getFluentAttribution();
+        $string = $image->getFluentAttribution()->toHtml();
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
 
         $image = new FeaturedImage(['license' => 'foo']);
 
-        $string = $image->getFluentAttribution();
+        $string = $image->getFluentAttribution()->toHtml();
         $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
 
         $image = new FeaturedImage();
-        $this->assertEquals('', $image->getFluentAttribution());
+        $this->assertEquals('', $image->getFluentAttribution()->toHtml());
     }
 
     public function test_get_fluent_attribution_method_creates_fluent_messages()
@@ -199,7 +199,7 @@ public function test_get_fluent_attribution_method_creates_fluent_messages()
                 'author' => 'John Doe',
                 'copyright' => 'CC',
                 'license' => 'MIT',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame(
@@ -207,7 +207,7 @@ public function test_get_fluent_attribution_method_creates_fluent_messages()
             $this->stripHtml((new FeaturedImage([
                 'author' => 'John Doe',
                 'license' => 'MIT',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame(
@@ -215,32 +215,32 @@ public function test_get_fluent_attribution_method_creates_fluent_messages()
             $this->stripHtml((new FeaturedImage([
                 'author' => 'John Doe',
                 'copyright' => 'CC',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame(
             'All rights reserved.',
             $this->stripHtml((new FeaturedImage([
                 'copyright' => 'All rights reserved',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame(
             'Image by John Doe.',
             $this->stripHtml((new FeaturedImage([
                 'author' => 'John Doe',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame(
             'License MIT.',
             $this->stripHtml((new FeaturedImage([
                 'license' => 'MIT',
-            ]))->getFluentAttribution())
+            ]))->getFluentAttribution()->toHtml())
         );
 
         $this->assertSame('',
-            $this->stripHtml((new FeaturedImage())->getFluentAttribution())
+            $this->stripHtml((new FeaturedImage())->getFluentAttribution()->toHtml())
         );
     }
 

From 64398a6f4167af9af3c8ddfb9d54bcb7c0bf7651 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:22:39 +0200
Subject: [PATCH 381/768] Update class PHPDoc

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 11e6e693f34..0d38bbfe8e1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -15,7 +15,7 @@
 use function implode;
 
 /**
- * Holds the information for an image.
+ * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
  *
  * $schema = [
  *    'path'         => '?string',

From 2eae0a4048710a66c0721a8035a657ad5ea7b424 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 15:23:02 +0000
Subject: [PATCH 382/768] Apply fixes from StyleCI

---
 .../Features/Blogging/Models/FeaturedImage.php    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0d38bbfe8e1..a4e461af9ae 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,14 +5,14 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
-use Illuminate\Support\HtmlString;
 use function basename;
 use function e;
 use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
-use Stringable;
+use Illuminate\Support\HtmlString;
 use function implode;
+use Stringable;
 
 /**
  * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
@@ -38,6 +38,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's path if it's stored locally.
      *
      * @var string|null Path to file in the _media directory
+     *
      * @example image.jpg.
      */
     public ?string $path;
@@ -47,6 +48,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * Will override the path property if both are set.
      *
      * @var string|null Fully qualified URL to the image.
+     *
      * @example https://example.com/media/image.jpg
      */
     public ?string $url;
@@ -56,14 +58,16 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * You should always set this to provide accessibility.
      *
      * @var string|null
+     *
      * @example "This is an image of a cat sitting in a basket.".
      */
     public ?string $description;
 
     /**
-     * The image's title. (Shows a tooltip on hover.)
+     * The image's title. (Shows a tooltip on hover.).
      *
      * @var string|null
+     *
      * @example "My Cat Archer".
      */
     public ?string $title;
@@ -72,6 +76,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's copyright.
      *
      * @var string|null
+     *
      * @example "Copyright (c) 2020 John Doe".
      */
     public ?string $copyright;
@@ -80,6 +85,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's license name.
      *
      * @var string|null
+     *
      * @example "CC BY-NC-SA 4.0".
      */
     public ?string $license;
@@ -88,6 +94,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's license URL.
      *
      * @var string|null
+     *
      * @example "https://creativecommons.org/licenses/by-nc-sa/4.0/".
      */
     public ?string $licenseUrl;
@@ -96,6 +103,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's author.
      *
      * @var string|null
+     *
      * @example "John Doe".
      */
     public ?string $author;
@@ -104,6 +112,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's source (for attribution/credit).
      *
      * @var string|null
+     *
      * @example "https://unsplash.com/photos/example".
      */
     public ?string $credit = null;

From 3cb49c4c5fc64d7d9757c89a27205546102ff67d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:26:21 +0200
Subject: [PATCH 383/768] Update PHPDocs

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a4e461af9ae..d70b2a2d79f 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -73,7 +73,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     public ?string $title;
 
     /**
-     * The image's copyright.
+     * The image's copyright information.
      *
      * @var string|null
      *
@@ -100,7 +100,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     public ?string $licenseUrl;
 
     /**
-     * The image's author.
+     * The image's author/photographer.
      *
      * @var string|null
      *
@@ -109,7 +109,8 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     public ?string $author;
 
     /**
-     * The image's source (for attribution/credit).
+     * Link to the image author/source (for attribution/credit).
+     * When added, the rendered $author's name will link to this URL.
      *
      * @var string|null
      *

From 8e26593178dfb7b59831cb83e1640d8ce70de410 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:26:45 +0200
Subject: [PATCH 384/768] Remove redundant PHPDocs

---
 .../Features/Blogging/Models/FeaturedImage.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index d70b2a2d79f..0438c2c6671 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -37,8 +37,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's path if it's stored locally.
      *
-     * @var string|null Path to file in the _media directory
-     *
      * @example image.jpg.
      */
     public ?string $path;
@@ -47,8 +45,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's URL if it's stored remotely.
      * Will override the path property if both are set.
      *
-     * @var string|null Fully qualified URL to the image.
-     *
      * @example https://example.com/media/image.jpg
      */
     public ?string $url;
@@ -57,8 +53,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image's description. (Used for alt text for screen readers.)
      * You should always set this to provide accessibility.
      *
-     * @var string|null
-     *
      * @example "This is an image of a cat sitting in a basket.".
      */
     public ?string $description;
@@ -66,8 +60,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's title. (Shows a tooltip on hover.).
      *
-     * @var string|null
-     *
      * @example "My Cat Archer".
      */
     public ?string $title;
@@ -75,8 +67,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's copyright information.
      *
-     * @var string|null
-     *
      * @example "Copyright (c) 2020 John Doe".
      */
     public ?string $copyright;
@@ -84,8 +74,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's license name.
      *
-     * @var string|null
-     *
      * @example "CC BY-NC-SA 4.0".
      */
     public ?string $license;
@@ -93,8 +81,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's license URL.
      *
-     * @var string|null
-     *
      * @example "https://creativecommons.org/licenses/by-nc-sa/4.0/".
      */
     public ?string $licenseUrl;
@@ -102,8 +88,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
     /**
      * The image's author/photographer.
      *
-     * @var string|null
-     *
      * @example "John Doe".
      */
     public ?string $author;
@@ -112,8 +96,6 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * Link to the image author/source (for attribution/credit).
      * When added, the rendered $author's name will link to this URL.
      *
-     * @var string|null
-     *
      * @example "https://unsplash.com/photos/example".
      */
     public ?string $credit = null;

From 70ca382373ab62092818edf6a188733b08203e83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:27:22 +0200
Subject: [PATCH 385/768] Convert braces {!! !!} -> {{ }}

---
 .../framework/resources/views/components/post/image.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index fd4425fc066..d4f9049baad 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -5,7 +5,7 @@
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
     <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}" itemprop="image" class="mb-0">
     <figcaption aria-label="Image caption" itemprop="caption"> 
-        {!! $image->getFluentAttribution() !!}
+        {{ $image->getFluentAttribution() }}
     </figcaption> 
     @foreach ($image->getMetadataArray() as $name => $value)
 	<meta itemprop="{{ $name }}" content="{{ $value }}"> 

From b4da8c82eac15aa25848a87d6076eea8b02579b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:35:18 +0200
Subject: [PATCH 386/768] Breaking: Rename credit property to attributionUrl

---
 docs/creating-content/blog-posts.md            |  2 +-
 .../Features/Blogging/Models/FeaturedImage.php | 13 +++++++------
 .../SubSchemas/FeaturedImageSchema.php         | 18 +++++++++---------
 .../tests/Feature/FeaturedImageModelTest.php   |  2 +-
 .../tests/Unit/SchemaContractsTest.php         | 18 +++++++++---------
 .../fixtures/_posts/typography-front-matter.md |  2 +-
 6 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/docs/creating-content/blog-posts.md b/docs/creating-content/blog-posts.md
index aa77c1a74d2..5a7564c41fe 100644
--- a/docs/creating-content/blog-posts.md
+++ b/docs/creating-content/blog-posts.md
@@ -195,7 +195,7 @@ image:
   copyright: "Copyright (c) 2022"
   license: "CC-BY-SA-4.0"
   licenseUrl: https://example.com/license/
-  credit: https://photographer.example.com/
+  attributionUrl: https://photographer.example.com/
   author: "John Doe"
 ```
 
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0438c2c6671..55378300ae6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -26,7 +26,7 @@
  *    'license'      => '?string',
  *    'licenseUrl'   => '?string',
  *    'author'       => '?string',
- *    'credit'       => '?string'
+ *    'attributionUrl' => '?string'
  * ];
  *
  * @see \Hyde\Framework\Testing\Feature\ImageModelTest
@@ -96,9 +96,10 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * Link to the image author/source (for attribution/credit).
      * When added, the rendered $author's name will link to this URL.
      *
+     * @note This was previously called "credit" but was renamed to "attributionUrl" for clarity.
      * @example "https://unsplash.com/photos/example".
      */
-    public ?string $credit = null;
+    public ?string $attributionUrl = null;
 
     public function __construct(array $data = [])
     {
@@ -225,9 +226,9 @@ public function getLicenseString(): string|null
         return null;
     }
 
-    protected function getCreditedAuthorLink(): string
+    protected function getAuthorLink(): string
     {
-        return '<a href="'.e($this->credit).'" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
+        return '<a href="'.e($this->attributionUrl).'" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
     }
 
     protected function getAuthorSpan(): string
@@ -237,8 +238,8 @@ protected function getAuthorSpan(): string
 
     protected function getAuthorElement(): string
     {
-        return isset($this->credit)
-            ? $this->getCreditedAuthorLink()
+        return isset($this->attributionUrl)
+            ? $this->getAuthorLink()
             : $this->getAuthorSpan();
     }
 
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
index 3b64a3baef1..4731fa3b66e 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
@@ -11,14 +11,14 @@
 interface FeaturedImageSchema
 {
     public const FEATURED_IMAGE_SCHEMA = [
-        'path'         => 'string',
-        'url'          => 'string',
-        'description'  => 'string',
-        'title'        => 'string',
-        'copyright'    => 'string',
-        'license'      => 'string',
-        'licenseUrl'   => 'string',
-        'author'       => 'string',
-        'credit'       => 'string',
+        'path'           => 'string',
+        'url'            => 'string',
+        'description'    => 'string',
+        'title'          => 'string',
+        'copyright'      => 'string',
+        'license'        => 'string',
+        'licenseUrl'     => 'string',
+        'author'         => 'string',
+        'attributionUrl' => 'string',
     ];
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 4beb278eb6d..99be8510e9f 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -111,7 +111,7 @@ public function test_get_image_author_attribution_string_method()
     {
         $image = new FeaturedImage([
             'author' => 'John Doe',
-            'credit' => 'https://example.com/',
+            'attributionUrl' => 'https://example.com/',
         ]);
         $string = $image->getImageAuthorAttributionString();
         $this->assertStringContainsString('itemprop="creator"', $string);
diff --git a/packages/framework/tests/Unit/SchemaContractsTest.php b/packages/framework/tests/Unit/SchemaContractsTest.php
index 0f1d96b02ca..7fc6766e666 100644
--- a/packages/framework/tests/Unit/SchemaContractsTest.php
+++ b/packages/framework/tests/Unit/SchemaContractsTest.php
@@ -51,15 +51,15 @@ public function testSchemasAreNotAccidentallyChanged()
         ], BlogPostSchema::AUTHOR_SCHEMA);
 
         $this->assertEquals([
-            'path'         => 'string',
-            'url'          => 'string',
-            'description'  => 'string',
-            'title'        => 'string',
-            'copyright'    => 'string',
-            'license'      => 'string',
-            'licenseUrl'   => 'string',
-            'author'       => 'string',
-            'credit'       => 'string',
+            'path'           => 'string',
+            'url'            => 'string',
+            'description'    => 'string',
+            'title'          => 'string',
+            'copyright'      => 'string',
+            'license'        => 'string',
+            'licenseUrl'     => 'string',
+            'author'         => 'string',
+            'attributionUrl' => 'string',
         ], BlogPostSchema::FEATURED_IMAGE_SCHEMA);
 
         $this->assertEquals([
diff --git a/tests/fixtures/_posts/typography-front-matter.md b/tests/fixtures/_posts/typography-front-matter.md
index f5f03901204..ae83fe8c704 100644
--- a/tests/fixtures/_posts/typography-front-matter.md
+++ b/tests/fixtures/_posts/typography-front-matter.md
@@ -14,7 +14,7 @@ image:
   license: "the Unsplash License"
   licenseUrl: "https://unsplash.com/license"
   author: "Blake"
-  credit: "https://unsplash.com/photos/GFrBMipOd_E"
+  attributionUrl: "https://unsplash.com/photos/GFrBMipOd_E"
 ---
 
 ## Write something awesome.

From 425a09d6b15ce19bda212dd77f02c429ac44681d Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 15:35:29 +0000
Subject: [PATCH 387/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 55378300ae6..3607dbaf4b9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -97,6 +97,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * When added, the rendered $author's name will link to this URL.
      *
      * @note This was previously called "credit" but was renamed to "attributionUrl" for clarity.
+     *
      * @example "https://unsplash.com/photos/example".
      */
     public ?string $attributionUrl = null;

From 4754e96fbbb6052acd27f7267a842b80fe46d51c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:41:38 +0200
Subject: [PATCH 388/768] Rename trait to InteractsWithFrontMatter

---
 .../{HasFrontMatter.php => InteractsWithFrontMatter.php}      | 2 +-
 .../framework/src/Framework/Factories/BlogPostDataFactory.php | 4 ++--
 packages/framework/src/Pages/Concerns/HydePage.php            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename packages/framework/src/Framework/Concerns/{HasFrontMatter.php => InteractsWithFrontMatter.php} (97%)

diff --git a/packages/framework/src/Framework/Concerns/HasFrontMatter.php b/packages/framework/src/Framework/Concerns/InteractsWithFrontMatter.php
similarity index 97%
rename from packages/framework/src/Framework/Concerns/HasFrontMatter.php
rename to packages/framework/src/Framework/Concerns/InteractsWithFrontMatter.php
index f126f8f4900..0b7f255bc6c 100644
--- a/packages/framework/src/Framework/Concerns/HasFrontMatter.php
+++ b/packages/framework/src/Framework/Concerns/InteractsWithFrontMatter.php
@@ -12,7 +12,7 @@
 /**
  * Adds methods to a class to allow it to fluently interact with the front matter.
  */
-trait HasFrontMatter
+trait InteractsWithFrontMatter
 {
     /**
      * Get a value from the computed page data, or fallback to the page's front matter, then to the default value.
diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index cc7736cd280..2702a601924 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
-use Hyde\Framework\Concerns\HasFrontMatter;
+use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
@@ -24,7 +24,7 @@
  */
 class BlogPostDataFactory extends Concerns\PageDataFactory
 {
-    use HasFrontMatter;
+    use InteractsWithFrontMatter;
 
     /**
      * The front matter properties supported by this factory.
diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index ea01c9c7e13..5bcfe3b7728 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -6,7 +6,7 @@
 
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
-use Hyde\Framework\Concerns\HasFrontMatter;
+use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Factories\Concerns\HasFactory;
 use Hyde\Framework\Features\Metadata\PageMetadataBag;
@@ -38,7 +38,7 @@
 abstract class HydePage implements PageSchema
 {
     use ConstructsPageSchemas;
-    use HasFrontMatter;
+    use InteractsWithFrontMatter;
     use HasFactory;
 
     public static string $sourceDirectory;

From fc9db8f6dbd95e407985e4026cfa8537347ce334 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:43:36 +0200
Subject: [PATCH 389/768] Implement schema provided by class

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 2702a601924..50f21a012dc 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -22,7 +22,7 @@
  * All data can be set using front matter in the page source file. If no front matter is set for the given key,
  * this class will attempt to generate and discover the values based on the page and the project's configuration.
  */
-class BlogPostDataFactory extends Concerns\PageDataFactory
+class BlogPostDataFactory extends Concerns\PageDataFactory implements BlogPostSchema
 {
     use InteractsWithFrontMatter;
 

From f851bb6cc7f9feee0cdbb99c83d2702401c4caea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:43:54 +0200
Subject: [PATCH 390/768] Create HydePageDataFactory.php

---
 .../src/Framework/Factories/HydePageDataFactory.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/framework/src/Framework/Factories/HydePageDataFactory.php

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
new file mode 100644
index 00000000000..117fa08f325
--- /dev/null
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Factories;
+
+class HydePageDataFactory extends Concerns\PageDataFactory
+{
+    public function toArray(): array
+    {
+        // TODO: Implement toArray() method.
+    }
+}

From 515445dff5cfa941256c6ce074cea8247c79aeb5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:44:08 +0200
Subject: [PATCH 391/768] Implements PageSchema

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 117fa08f325..bc39401ff5a 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Factories;
 
-class HydePageDataFactory extends Concerns\PageDataFactory
+use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
+
+class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 {
     public function toArray(): array
     {

From 5fe7475ac567c14682e78141ed952bbf0544676a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:47:31 +0200
Subject: [PATCH 392/768] Add the schema constant

---
 .../src/Framework/Factories/HydePageDataFactory.php          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index bc39401ff5a..69c80645564 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -8,6 +8,11 @@
 
 class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 {
+    /**
+     * The front matter properties supported by this factory.
+     */
+    public const SCHEMA = PageSchema::PAGE_SCHEMA;
+
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 31ed7aa9c5980df4ab0c20792ff6613e2d4cf8bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:49:25 +0200
Subject: [PATCH 393/768] Add the class properties

---
 .../src/Framework/Factories/HydePageDataFactory.php          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 69c80645564..8db106cb1de 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 
 class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
@@ -13,6 +14,10 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
      */
     public const SCHEMA = PageSchema::PAGE_SCHEMA;
 
+    protected readonly string $title;
+    protected readonly ?string $canonicalUrl;
+    protected readonly ?NavigationData $navigation;
+    
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 8cf117e9f176ddf0021b3421a760b84fa5854ab6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:53:28 +0200
Subject: [PATCH 394/768] Add constructor

---
 .../src/Framework/Factories/HydePageDataFactory.php      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 8db106cb1de..16e7055105f 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -17,7 +17,14 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
-    
+
+    public function __construct()
+    {
+        $this->title = $this->makeTitle();
+        $this->canonicalUrl = $this->makeCanonicalUrl();
+        $this->navigation = $this->makeNavigation();
+    }
+
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 56af0f3dcba78a022bcabf50be34e9c2776ed015 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:54:36 +0200
Subject: [PATCH 395/768] Add method stubs

---
 .../Framework/Factories/HydePageDataFactory.php   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 16e7055105f..c9c740c0e84 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -29,4 +29,19 @@ public function toArray(): array
     {
         // TODO: Implement toArray() method.
     }
+
+    protected function makeTitle(): string
+    {
+        // TODO: Implement makeTitle() method.
+    }
+
+    protected function makeCanonicalUrl(): ?string
+    {
+        // TODO: Implement makeCanonicalUrl() method.
+    }
+
+    protected function makeNavigation(): ?NavigationData
+    {
+        // TODO: Implement makeNavigation() method.
+    }
 }

From d0d3783552bd8f4ea7ffb7b2cdd3eda269a764c2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:58:10 +0200
Subject: [PATCH 396/768] Factory needs to know about the front matter and
 markdown

---
 .../src/Framework/Factories/HydePageDataFactory.php    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index c9c740c0e84..6e78815897d 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -6,6 +6,8 @@
 
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
 
 class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 {
@@ -14,12 +16,18 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
      */
     public const SCHEMA = PageSchema::PAGE_SCHEMA;
 
+    private FrontMatter $matter;
+    private Markdown $markdown;
+
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct()
+    public function __construct(FrontMatter $matter, Markdown $markdown)
     {
+        $this->matter = $matter;
+        $this->markdown = $markdown;
+
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From c5443363d2e243900eae2f726a9e7138e358126b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 17:58:36 +0200
Subject: [PATCH 397/768] Implement toArray() method

---
 .../src/Framework/Factories/HydePageDataFactory.php         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 6e78815897d..a3a2367e753 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -35,7 +35,11 @@ public function __construct(FrontMatter $matter, Markdown $markdown)
 
     public function toArray(): array
     {
-        // TODO: Implement toArray() method.
+        return [
+            'title' => $this->title,
+            'canonicalUrl' => $this->canonicalUrl,
+            'navigation' => $this->navigation,
+        ];
     }
 
     protected function makeTitle(): string

From 372556b41385263e4d1694cf182641a504d250cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:00:04 +0200
Subject: [PATCH 398/768] Allow $markdown to be bool to support Blade pages

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index a3a2367e753..9b8bc99b560 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -17,13 +17,13 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     public const SCHEMA = PageSchema::PAGE_SCHEMA;
 
     private FrontMatter $matter;
-    private Markdown $markdown;
+    private Markdown|bool $markdown;
 
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown $markdown)
+    public function __construct(FrontMatter $matter, Markdown|bool $markdown)
     {
         $this->matter = $matter;
         $this->markdown = $markdown;

From 7a0c14dfe8dccc2b960d57d07794530db3cfc321 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:00:22 +0200
Subject: [PATCH 399/768] Narrow down bool type to false

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 9b8bc99b560..3f2f26718b1 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -17,13 +17,13 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     public const SCHEMA = PageSchema::PAGE_SCHEMA;
 
     private FrontMatter $matter;
-    private Markdown|bool $markdown;
+    private Markdown|false $markdown;
 
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown|bool $markdown)
+    public function __construct(FrontMatter $matter, Markdown|false $markdown)
     {
         $this->matter = $matter;
         $this->markdown = $markdown;

From 40e0eac8a4ffb7dc1652a8211a14e29b833c4a51 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:01:31 +0200
Subject: [PATCH 400/768] Use InteractsWithFrontMatter

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 3f2f26718b1..cd29b538a9f 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
@@ -11,6 +12,8 @@
 
 class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 {
+    use InteractsWithFrontMatter;
+
     /**
      * The front matter properties supported by this factory.
      */

From 023c954ddf14a342e08d42c20a47cd3c78570147 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:02:26 +0200
Subject: [PATCH 401/768] Factory needs to know about the identifier

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index cd29b538a9f..5930122360a 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -21,15 +21,17 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 
     private FrontMatter $matter;
     private Markdown|false $markdown;
+    private string $identifier;
 
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown|false $markdown)
+    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier)
     {
         $this->matter = $matter;
         $this->markdown = $markdown;
+        $this->identifier = $identifier;
 
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();

From c395e99bc8f12047d64175e54fcd4d1de938d7fa Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:03:52 +0200
Subject: [PATCH 402/768] Deprecate internal action class FindsTitleForPage

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

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
index f6f893bb27d..055275ff182 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
@@ -11,7 +11,7 @@
 /**
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
  *
- * @internal
+ * @deprecated Refactor to use factories instead.
  */
 final class FindsTitleForPage
 {

From 81ec345c6ae77edb7565ef701778763ef959c0c5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:04:24 +0200
Subject: [PATCH 403/768] Port methods from FindsTitleForPage class

---
 .../Factories/HydePageDataFactory.php         | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 5930122360a..ae29e98f47b 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -6,9 +6,13 @@
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
+use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
+use Hyde\Pages\Concerns\BaseMarkdownPage;
+use function substr;
+use function trim;
 
 class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
 {
@@ -61,4 +65,24 @@ protected function makeNavigation(): ?NavigationData
     {
         // TODO: Implement makeNavigation() method.
     }
+
+    protected function findTitleForPage(): string
+    {
+        return $this->page->matter('title')
+            ?? $this->findTitleFromMarkdownHeadings()
+            ?? Hyde::makeTitle($this->page->identifier);
+    }
+
+    protected function findTitleFromMarkdownHeadings(): ?string
+    {
+        if ($this->page instanceof BaseMarkdownPage) {
+            foreach ($this->page->markdown()->toArray() as $line) {
+                if (str_starts_with($line, '# ')) {
+                    return trim(substr($line, 2), ' ');
+                }
+            }
+        }
+
+        return null;
+    }
 }

From 2bef2a2e5570859297ab7f9c71743cc466448bfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:05:05 +0200
Subject: [PATCH 404/768] Adapt methods to work with the data we have

---
 .../src/Framework/Factories/HydePageDataFactory.php       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index ae29e98f47b..806de3e0231 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -68,15 +68,15 @@ protected function makeNavigation(): ?NavigationData
 
     protected function findTitleForPage(): string
     {
-        return $this->page->matter('title')
+        return $this->matter('title')
             ?? $this->findTitleFromMarkdownHeadings()
-            ?? Hyde::makeTitle($this->page->identifier);
+            ?? Hyde::makeTitle($this->identifier);
     }
 
     protected function findTitleFromMarkdownHeadings(): ?string
     {
-        if ($this->page instanceof BaseMarkdownPage) {
-            foreach ($this->page->markdown()->toArray() as $line) {
+        if ($this->markdown) {
+            foreach ($this->markdown->toArray() as $line) {
                 if (str_starts_with($line, '# ')) {
                     return trim(substr($line, 2), ' ');
                 }

From 75c66934b4be83dd6f88abcb03c0a208434cf01e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:05:17 +0200
Subject: [PATCH 405/768] Use strict type comparison

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 806de3e0231..b8aa8b1cf74 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -75,7 +75,7 @@ protected function findTitleForPage(): string
 
     protected function findTitleFromMarkdownHeadings(): ?string
     {
-        if ($this->markdown) {
+        if ($this->markdown !== false) {
             foreach ($this->markdown->toArray() as $line) {
                 if (str_starts_with($line, '# ')) {
                     return trim(substr($line, 2), ' ');

From 4487f588ae63ac8173ad9eadfbcb08f421a74e4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:05:24 +0200
Subject: [PATCH 406/768] Implement makeTitle() method

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index b8aa8b1cf74..5326b0e475e 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -53,7 +53,7 @@ public function toArray(): array
 
     protected function makeTitle(): string
     {
-        // TODO: Implement makeTitle() method.
+        return trim($this->findTitleForPage());
     }
 
     protected function makeCanonicalUrl(): ?string

From e0a5c78ee87f9db39fd8e85657780cc5c5682368 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:06:11 +0200
Subject: [PATCH 407/768] Deprecate internal action class
 FindsNavigationDataForPage

---
 .../Actions/Constructors/FindsNavigationDataForPage.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index b13994074df..3b141019fb4 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -14,7 +14,7 @@
 /**
  * Helper for HydePages to discover data used for navigation menus and the documentation sidebar.
  *
- * @internal
+ * @deprecated Refactor to use factories instead.
  *
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
  * @see \Hyde\Pages\Concerns\HydePage

From 3f583ae963fa3e39bfeb257cae9a4b4240c99170 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:07:00 +0200
Subject: [PATCH 408/768] Update deprecation notice

---
 .../Actions/Constructors/FindsNavigationDataForPage.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 3b141019fb4..5fd075c6ae9 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -14,7 +14,7 @@
 /**
  * Helper for HydePages to discover data used for navigation menus and the documentation sidebar.
  *
- * @deprecated Refactor to use factories instead.
+ * @deprecated Refactor to use factories instead. As this action is rather complex, it should have its own factory.
  *
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
  * @see \Hyde\Pages\Concerns\HydePage

From ed7efb9dcd571067464905880d1c58a779acec93 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:11:01 +0200
Subject: [PATCH 409/768] Factory needs to know the outputPath

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 5326b0e475e..b1be1092ac2 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -26,16 +26,18 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     private FrontMatter $matter;
     private Markdown|false $markdown;
     private string $identifier;
+    private string $outputPath;
 
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier)
+    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier, string $outputPath)
     {
         $this->matter = $matter;
         $this->markdown = $markdown;
         $this->identifier = $identifier;
+        $this->outputPath = $outputPath;
 
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();

From 8ac6d5de2bf24e27db8e74ad85f0bd19dd9bfdb9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:11:13 +0200
Subject: [PATCH 410/768] Implement makeCanonicalUrl() method

---
 .../Framework/Factories/HydePageDataFactory.php   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index b1be1092ac2..c08dd28786c 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -60,7 +60,7 @@ protected function makeTitle(): string
 
     protected function makeCanonicalUrl(): ?string
     {
-        // TODO: Implement makeCanonicalUrl() method.
+        return $this->getCanonicalUrl();
     }
 
     protected function makeNavigation(): ?NavigationData
@@ -87,4 +87,17 @@ protected function findTitleFromMarkdownHeadings(): ?string
 
         return null;
     }
+
+    protected function getCanonicalUrl(): ?string
+    {
+        if (! empty($this->matter('canonicalUrl'))) {
+            return $this->matter('canonicalUrl');
+        }
+
+        if (Hyde::hasSiteUrl() && ! empty($this->identifier)) {
+            return Hyde::url($this->outputPath);
+        }
+
+        return null;
+    }
 }

From 03ca476e0af7282d27284a5a2a5bf3143e315ec6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:11:50 +0200
Subject: [PATCH 411/768] Adjust class visibility

---
 .../src/Framework/Factories/HydePageDataFactory.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index c08dd28786c..23496f20a81 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -68,14 +68,14 @@ protected function makeNavigation(): ?NavigationData
         // TODO: Implement makeNavigation() method.
     }
 
-    protected function findTitleForPage(): string
+    private function findTitleForPage(): string
     {
         return $this->matter('title')
             ?? $this->findTitleFromMarkdownHeadings()
             ?? Hyde::makeTitle($this->identifier);
     }
 
-    protected function findTitleFromMarkdownHeadings(): ?string
+    private function findTitleFromMarkdownHeadings(): ?string
     {
         if ($this->markdown !== false) {
             foreach ($this->markdown->toArray() as $line) {
@@ -88,7 +88,7 @@ protected function findTitleFromMarkdownHeadings(): ?string
         return null;
     }
 
-    protected function getCanonicalUrl(): ?string
+    private function getCanonicalUrl(): ?string
     {
         if (! empty($this->matter('canonicalUrl'))) {
             return $this->matter('canonicalUrl');

From 81b6d8dc6acf7fea50811d8ff234114a88a7fad1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:13:57 +0200
Subject: [PATCH 412/768] Factory temporarily needs to know the page

---
 .../src/Framework/Factories/HydePageDataFactory.php       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 23496f20a81..dfad6061de1 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Hyde;
@@ -11,6 +12,7 @@
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
 use Hyde\Pages\Concerns\BaseMarkdownPage;
+use Hyde\Pages\Concerns\HydePage;
 use function substr;
 use function trim;
 
@@ -28,17 +30,21 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     private string $identifier;
     private string $outputPath;
 
+    protected HydePage $page;
+
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier, string $outputPath)
+    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier, string $outputPath, HydePage $page)
     {
         $this->matter = $matter;
         $this->markdown = $markdown;
         $this->identifier = $identifier;
         $this->outputPath = $outputPath;
 
+        $this->page = $page;
+
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From dd5d0dece1d5149ef314186e46d4293c56663702 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:14:32 +0200
Subject: [PATCH 413/768] Deprecate temporary property

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index dfad6061de1..d711708e185 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -43,6 +43,7 @@ public function __construct(FrontMatter $matter, Markdown|false $markdown, strin
         $this->identifier = $identifier;
         $this->outputPath = $outputPath;
 
+        /** @deprecated */
         $this->page = $page;
 
         $this->title = $this->makeTitle();

From c7751f67c7f96f44ef6dbc427fa2a02517314cf4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:15:35 +0200
Subject: [PATCH 414/768] Implement makeNavigation() method

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index d711708e185..abdfafca002 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        // TODO: Implement makeNavigation() method.
+        return FindsNavigationDataForPage::run($this->page);
     }
 
     private function findTitleForPage(): string

From 92d6f95d99075c00a32ee4636c49abd8b3488b5a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:15:43 +0200
Subject: [PATCH 415/768] Add placeholder

---
 .../Actions/Constructors/FindsNavigationDataForPage.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 5fd075c6ae9..924467336aa 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -71,7 +71,7 @@ private function findNavigationMenuLabel(): string
             return $this->getNavigationLabelConfig()[$this->page->routeKey];
         }
 
-        return $this->page->matter('title') ?? $this->page->title;
+        return $this->page->matter('title') ?? 'not refactored yet' ?? $this->page->title;
     }
 
     private function findNavigationMenuHidden(): bool

From 4405939bbed95aad281ca3df244152d295838d7f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:16:14 +0200
Subject: [PATCH 416/768] Use the factory to construct the page schema

---
 .../Internal/ConstructsPageSchemas.php         | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 9416fb1ca34..75e7c1f90bd 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -7,6 +7,7 @@
 use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Factories\BlogPostDataFactory;
+use Hyde\Framework\Factories\HydePageDataFactory;
 use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 
@@ -26,21 +27,6 @@ protected function constructPageSchemas(): void
 
     protected function constructPageSchema(): void
     {
-        $this->title = FindsTitleForPage::run($this);
-        $this->navigation = FindsNavigationDataForPage::run($this);
-        $this->canonicalUrl = $this->makeCanonicalUrl();
-    }
-
-    protected function makeCanonicalUrl(): ?string
-    {
-        if (! empty($this->matter('canonicalUrl'))) {
-            return $this->matter('canonicalUrl');
-        }
-
-        if (Hyde::hasSiteUrl() && ! empty($this->identifier)) {
-            return Hyde::url($this->getRoute()->getOutputPath());
-        }
-
-        return null;
+        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this->identifier, $this->getOutputPath(), $this));
     }
 }

From f4e676052090bd76aca02ad84b995a6e0243b911 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:21:12 +0200
Subject: [PATCH 417/768] Create NavigationDataFactory.php

---
 .../Framework/Factories/NavigationDataFactory.php   | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/framework/src/Framework/Factories/NavigationDataFactory.php

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
new file mode 100644
index 00000000000..0e21d6c9ecb
--- /dev/null
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Factories;
+
+class NavigationDataFactory extends Concerns\PageDataFactory
+{
+    public function toArray(): array
+    {
+        // TODO: Implement toArray() method.
+    }
+}

From 82852a9520dd27f51edf975a07895871624a9675 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:21:27 +0200
Subject: [PATCH 418/768] Implements NavigationSchema

---
 .../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 0e21d6c9ecb..f301b21aa93 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Factories;
 
-class NavigationDataFactory extends Concerns\PageDataFactory
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+
+class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
     public function toArray(): array
     {

From 526f135f8acdc82caaa6b27f6db5d00a96571087 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:35:22 +0200
Subject: [PATCH 419/768] Add the schema constant

---
 .../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 f301b21aa93..1772cf7c92a 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -8,6 +8,11 @@
 
 class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
+    /**
+     * The front matter properties supported by this factory.
+     */
+    public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
+
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 51cb56d396fb533509d5aecac6ebdfafd6233a11 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:35:53 +0200
Subject: [PATCH 420/768] Expand PHPDoc

---
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1772cf7c92a..cccc772aa34 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -10,6 +10,8 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
 {
     /**
      * The front matter properties supported by this factory.
+     *
+     * Note that this represents a sub-schema, and is used as part of the page schema.
      */
     public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 

From 35e1bcb05e487c80f8716c6904d078570e9e265f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:37:14 +0200
Subject: [PATCH 421/768] Defer creation to factory

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index abdfafca002..3e1f081eb60 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return FindsNavigationDataForPage::run($this->page);
+        return NavigationData::make((new NavigationDataFactory())->toArray());
     }
 
     private function findTitleForPage(): string

From 3572e64ed98be4fa719efb00b4d4c60911e468a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:38:30 +0200
Subject: [PATCH 422/768] Set up working properties

---
 .../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 cccc772aa34..b8609b1787a 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -15,6 +15,11 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
+    protected readonly ?string $label;
+    protected readonly ?string $group;
+    protected readonly ?bool $hidden;
+    protected readonly ?int $priority;
+
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 825d5ba5bda2f470c9656c399daf8819108a4eb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:38:45 +0200
Subject: [PATCH 423/768] Implement toArray() method

---
 .../src/Framework/Factories/NavigationDataFactory.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index b8609b1787a..9724597660e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -22,6 +22,11 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
 
     public function toArray(): array
     {
-        // TODO: Implement toArray() method.
+        return [
+            'label' => $this->label,
+            'group' => $this->group,
+            'hidden' => $this->hidden,
+            'priority' => $this->priority,
+        ];
     }
 }

From 1fc848ae476b878d55565950ef2d5481ce2348a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:41:51 +0200
Subject: [PATCH 424/768] Set up constructor

---
 .../src/Framework/Factories/NavigationDataFactory.php     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 9724597660e..3927a3f236f 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -20,6 +20,14 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
+    public function __construct()
+    {
+        $this->label = $this->makeLabel();
+        $this->group = $this->makeGroup();
+        $this->hidden = $this->makeHidden();
+        $this->priority = $this->makePriority();
+    }
+
     public function toArray(): array
     {
         return [

From b9d1526962ff70ec1b897aa110138bcdd3afc6ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:43:02 +0200
Subject: [PATCH 425/768] Add method stubs

---
 .../Factories/NavigationDataFactory.php       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 3927a3f236f..dcbed48828b 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -37,4 +37,24 @@ public function toArray(): array
             'priority' => $this->priority,
         ];
     }
+
+    protected function makeLabel(): ?string
+    {
+        //
+    }
+
+    protected function makeGroup(): ?string
+    {
+        //
+    }
+
+    protected function makeHidden(): ?bool
+    {
+        //
+    }
+
+    protected function makePriority(): ?int
+    {
+        //
+    }
 }

From ae84b6836aeb0d33130c052ff3b20e305bc2469b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:44:24 +0200
Subject: [PATCH 426/768] Move over protected constants from legacy action

---
 .../src/Framework/Factories/NavigationDataFactory.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index dcbed48828b..6f1d14c7fe8 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -15,6 +15,9 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
      */
     public const SCHEMA = NavigationSchema::NAVIGATION_SCHEMA;
 
+    protected const FALLBACK_PRIORITY = 999;
+    protected const CONFIG_OFFSET = 500;
+
     protected readonly ?string $label;
     protected readonly ?string $group;
     protected readonly ?bool $hidden;

From 0146607fabf3e4b0a0d07411ef8da3a376a301a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:45:08 +0200
Subject: [PATCH 427/768] Move over methods from legacy action

---
 .../Factories/NavigationDataFactory.php       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 6f1d14c7fe8..563df825170 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -5,6 +5,14 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\MarkdownPost;
+use Illuminate\Support\Str;
+use function array_flip;
+use function array_key_exists;
+use function array_merge;
+use function config;
+use function in_array;
 
 class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
@@ -60,4 +68,82 @@ protected function makePriority(): ?int
     {
         //
     }
+
+    private function findNavigationMenuLabel(): string
+    {
+        if ($this->page->matter('navigation.label') !== null) {
+            return $this->page->matter('navigation.label');
+        }
+
+        if (isset($this->getNavigationLabelConfig()[$this->page->routeKey])) {
+            return $this->getNavigationLabelConfig()[$this->page->routeKey];
+        }
+
+        return $this->page->matter('title') ?? 'not refactored yet' ?? $this->page->title;
+    }
+
+    private function findNavigationMenuHidden(): bool
+    {
+        if ($this->page instanceof MarkdownPost) {
+            return true;
+        }
+
+        if ($this->page->matter('navigation.hidden', false)) {
+            return true;
+        }
+
+        if (in_array($this->page->routeKey, config('hyde.navigation.exclude', ['404']))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function findNavigationMenuPriority(): int
+    {
+        if ($this->page->matter('navigation.priority') !== null) {
+            return $this->page->matter('navigation.priority');
+        }
+
+        // Different default return values are to preserve backwards compatibility
+        return $this->page instanceof DocumentationPage
+            ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
+            : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
+    }
+
+    private function findNavigationMenuPriorityInNavigationConfig(array $config): ?int
+    {
+        return array_key_exists($this->page->routeKey, $config) ? (int) $config[$this->page->routeKey] : null;
+    }
+
+    private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int
+    {
+        // Sidebars uses a special syntax where the keys are just the page identifiers in a flat array
+
+        // Adding 250 makes so that pages with a front matter priority that is lower can be shown first.
+        // It's lower than the fallback of 500 so that the config ones still come first.
+        // This is all to make it easier to mix ways of adding priorities.
+
+        return isset($config[$this->page->identifier])
+            ? $config[$this->page->identifier] + (self::CONFIG_OFFSET)
+            : null;
+    }
+
+    private function getNavigationLabelConfig(): array
+    {
+        return array_merge([
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ], config('hyde.navigation.labels', []));
+    }
+
+    private function getDocumentationPageGroup(): ?string
+    {
+        // If the documentation page is in a subdirectory,
+        return str_contains($this->page->identifier, '/')
+            // then we can use that as the category name.
+            ? Str::before($this->page->identifier, '/')
+            // Otherwise, we look in the front matter.
+            : $this->page->matter('navigation.group', 'other');
+    }
 }

From e0af54e6985c836a934f9f575c7d29a5fb578475 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:47:32 +0200
Subject: [PATCH 428/768] Link methods

---
 .../Framework/Factories/NavigationDataFactory.php    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 563df825170..d679783ee04 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -51,22 +51,26 @@ public function toArray(): array
 
     protected function makeLabel(): ?string
     {
-        //
+        return $this->findNavigationMenuLabel();
     }
 
     protected function makeGroup(): ?string
     {
-        //
+        if ($this->page instanceof DocumentationPage) {
+            return $this->getDocumentationPageGroup();
+        }
+
+        return null;
     }
 
     protected function makeHidden(): ?bool
     {
-        //
+        return $this->findNavigationMenuHidden();
     }
 
     protected function makePriority(): ?int
     {
-        //
+        return $this->findNavigationMenuPriority();
     }
 
     private function findNavigationMenuLabel(): string

From ef49da5e3a63eda2db36e227e8aa86c6ccdb7516 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:47:53 +0200
Subject: [PATCH 429/768] Extract method

---
 .../Framework/Factories/NavigationDataFactory.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d679783ee04..1103baacc10 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -56,11 +56,7 @@ protected function makeLabel(): ?string
 
     protected function makeGroup(): ?string
     {
-        if ($this->page instanceof DocumentationPage) {
-            return $this->getDocumentationPageGroup();
-        }
-
-        return null;
+        return $this->findNavigationMenuGroup();
     }
 
     protected function makeHidden(): ?bool
@@ -150,4 +146,13 @@ private function getDocumentationPageGroup(): ?string
             // Otherwise, we look in the front matter.
             : $this->page->matter('navigation.group', 'other');
     }
+
+    private function findNavigationMenuGroup(): ?string
+    {
+        if ($this->page instanceof DocumentationPage) {
+            return $this->getDocumentationPageGroup();
+        }
+
+        return null;
+    }
 }

From 210d92bc60ff06387c5a87f563ce62316e470fa3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:48:24 +0200
Subject: [PATCH 430/768] Reorder methods according to order

---
 .../Factories/NavigationDataFactory.php        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1103baacc10..e1b1bed3bbe 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -82,6 +82,15 @@ private function findNavigationMenuLabel(): string
         return $this->page->matter('title') ?? 'not refactored yet' ?? $this->page->title;
     }
 
+    private function findNavigationMenuGroup(): ?string
+    {
+        if ($this->page instanceof DocumentationPage) {
+            return $this->getDocumentationPageGroup();
+        }
+
+        return null;
+    }
+
     private function findNavigationMenuHidden(): bool
     {
         if ($this->page instanceof MarkdownPost) {
@@ -146,13 +155,4 @@ private function getDocumentationPageGroup(): ?string
             // Otherwise, we look in the front matter.
             : $this->page->matter('navigation.group', 'other');
     }
-
-    private function findNavigationMenuGroup(): ?string
-    {
-        if ($this->page instanceof DocumentationPage) {
-            return $this->getDocumentationPageGroup();
-        }
-
-        return null;
-    }
 }

From 40e8352034aedf22c54fd0e2317cfb99671639e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:49:28 +0200
Subject: [PATCH 431/768] Factory needs to know about front matter

---
 .../src/Framework/Factories/NavigationDataFactory.php      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index e1b1bed3bbe..9c01c59cbb2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
@@ -26,13 +27,17 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected const FALLBACK_PRIORITY = 999;
     protected const CONFIG_OFFSET = 500;
 
+    private FrontMatter $matter;
+
     protected readonly ?string $label;
     protected readonly ?string $group;
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct()
+    public function __construct(FrontMatter $matter)
     {
+        $this->matter = $matter;
+
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
         $this->hidden = $this->makeHidden();

From a14f3fa78d2ee110b33b9729515e837db18ab972 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:49:42 +0200
Subject: [PATCH 432/768] Use InteractsWithFrontMatter

---
 .../src/Framework/Factories/NavigationDataFactory.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 9c01c59cbb2..94e5bc76248 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\DocumentationPage;
@@ -17,6 +18,8 @@
 
 class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
+    use InteractsWithFrontMatter;
+
     /**
      * The front matter properties supported by this factory.
      *

From cf0fbdac8770c9d5dc7141935885ab603863bdaf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:51:40 +0200
Subject: [PATCH 433/768] Pass along the front matter

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 3e1f081eb60..d60e11e43a8 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationData::make((new NavigationDataFactory())->toArray());
+        return NavigationData::make((new NavigationDataFactory($this->matter))->toArray());
     }
 
     private function findTitleForPage(): string

From a52474fdbfc6e17b2b66ed2bf9895eb62e6d3cdd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:51:52 +0200
Subject: [PATCH 434/768] Call methods on local property

---
 .../Framework/Factories/NavigationDataFactory.php  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 94e5bc76248..8aede585913 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -79,15 +79,15 @@ protected function makePriority(): ?int
 
     private function findNavigationMenuLabel(): string
     {
-        if ($this->page->matter('navigation.label') !== null) {
-            return $this->page->matter('navigation.label');
+        if ($this->matter('navigation.label') !== null) {
+            return $this->matter('navigation.label');
         }
 
         if (isset($this->getNavigationLabelConfig()[$this->page->routeKey])) {
             return $this->getNavigationLabelConfig()[$this->page->routeKey];
         }
 
-        return $this->page->matter('title') ?? 'not refactored yet' ?? $this->page->title;
+        return $this->matter('title') ?? 'not refactored yet' ?? $this->page->title;
     }
 
     private function findNavigationMenuGroup(): ?string
@@ -105,7 +105,7 @@ private function findNavigationMenuHidden(): bool
             return true;
         }
 
-        if ($this->page->matter('navigation.hidden', false)) {
+        if ($this->matter('navigation.hidden', false)) {
             return true;
         }
 
@@ -118,8 +118,8 @@ private function findNavigationMenuHidden(): bool
 
     private function findNavigationMenuPriority(): int
     {
-        if ($this->page->matter('navigation.priority') !== null) {
-            return $this->page->matter('navigation.priority');
+        if ($this->matter('navigation.priority') !== null) {
+            return $this->matter('navigation.priority');
         }
 
         // Different default return values are to preserve backwards compatibility
@@ -161,6 +161,6 @@ private function getDocumentationPageGroup(): ?string
             // then we can use that as the category name.
             ? Str::before($this->page->identifier, '/')
             // Otherwise, we look in the front matter.
-            : $this->page->matter('navigation.group', 'other');
+            : $this->matter('navigation.group', 'other');
     }
 }

From 2b38964d3bf1b0c221b970171a9e8364d0d9d150 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:56:36 +0200
Subject: [PATCH 435/768] Convert to promoted property

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 8aede585913..fa768882422 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -30,17 +30,13 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected const FALLBACK_PRIORITY = 999;
     protected const CONFIG_OFFSET = 500;
 
-    private FrontMatter $matter;
-
     protected readonly ?string $label;
     protected readonly ?string $group;
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(FrontMatter $matter)
+    public function __construct(private FrontMatter $matter)
     {
-        $this->matter = $matter;
-
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
         $this->hidden = $this->makeHidden();

From 0a80b3bbce827ec528ab04feb0f46590a49cac98 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:57:42 +0200
Subject: [PATCH 436/768] Factory needs to know about identifier and route key

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index d60e11e43a8..ef759be70c0 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationData::make((new NavigationDataFactory($this->matter))->toArray());
+        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey))->toArray());
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index fa768882422..28376d582d5 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -35,7 +35,7 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private FrontMatter $matter)
+    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From f25138dad911b36703f3ee91062f9158475327f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 18:58:14 +0200
Subject: [PATCH 437/768] Use class routeKey property

---
 .../src/Framework/Factories/NavigationDataFactory.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 28376d582d5..d94fb9d2414 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -79,8 +79,8 @@ private function findNavigationMenuLabel(): string
             return $this->matter('navigation.label');
         }
 
-        if (isset($this->getNavigationLabelConfig()[$this->page->routeKey])) {
-            return $this->getNavigationLabelConfig()[$this->page->routeKey];
+        if (isset($this->getNavigationLabelConfig()[$this->routeKey])) {
+            return $this->getNavigationLabelConfig()[$this->routeKey];
         }
 
         return $this->matter('title') ?? 'not refactored yet' ?? $this->page->title;
@@ -105,7 +105,7 @@ private function findNavigationMenuHidden(): bool
             return true;
         }
 
-        if (in_array($this->page->routeKey, config('hyde.navigation.exclude', ['404']))) {
+        if (in_array($this->routeKey, config('hyde.navigation.exclude', ['404']))) {
             return true;
         }
 
@@ -126,7 +126,7 @@ private function findNavigationMenuPriority(): int
 
     private function findNavigationMenuPriorityInNavigationConfig(array $config): ?int
     {
-        return array_key_exists($this->page->routeKey, $config) ? (int) $config[$this->page->routeKey] : null;
+        return array_key_exists($this->routeKey, $config) ? (int) $config[$this->routeKey] : null;
     }
 
     private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int

From 05e3c1004185b33591325d5fa62cdd4c300333bc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:00:02 +0200
Subject: [PATCH 438/768] Use class identifier property

---
 .../src/Framework/Factories/NavigationDataFactory.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d94fb9d2414..ff220d1c320 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -137,8 +137,8 @@ private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int
         // It's lower than the fallback of 500 so that the config ones still come first.
         // This is all to make it easier to mix ways of adding priorities.
 
-        return isset($config[$this->page->identifier])
-            ? $config[$this->page->identifier] + (self::CONFIG_OFFSET)
+        return isset($config[$this->identifier])
+            ? $config[$this->identifier] + (self::CONFIG_OFFSET)
             : null;
     }
 
@@ -153,9 +153,9 @@ private function getNavigationLabelConfig(): array
     private function getDocumentationPageGroup(): ?string
     {
         // If the documentation page is in a subdirectory,
-        return str_contains($this->page->identifier, '/')
+        return str_contains($this->identifier, '/')
             // then we can use that as the category name.
-            ? Str::before($this->page->identifier, '/')
+            ? Str::before($this->identifier, '/')
             // Otherwise, we look in the front matter.
             : $this->matter('navigation.group', 'other');
     }

From ca4e19eb1c00ffac6f02d2670e808912622eea50 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:01:27 +0200
Subject: [PATCH 439/768] Revert "Add placeholder"

This reverts commit 92d6f95d99075c00a32ee4636c49abd8b3488b5a.
---
 .../Actions/Constructors/FindsNavigationDataForPage.php         | 2 +-
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 924467336aa..5fd075c6ae9 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -71,7 +71,7 @@ private function findNavigationMenuLabel(): string
             return $this->getNavigationLabelConfig()[$this->page->routeKey];
         }
 
-        return $this->page->matter('title') ?? 'not refactored yet' ?? $this->page->title;
+        return $this->page->matter('title') ?? $this->page->title;
     }
 
     private function findNavigationMenuHidden(): bool
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index ff220d1c320..f52b9d1e417 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -83,7 +83,7 @@ private function findNavigationMenuLabel(): string
             return $this->getNavigationLabelConfig()[$this->routeKey];
         }
 
-        return $this->matter('title') ?? 'not refactored yet' ?? $this->page->title;
+        return $this->matter('title') ?? $this->page->title;
     }
 
     private function findNavigationMenuGroup(): ?string

From 35eb2a52c24482238c3b5798fbd8c44ec3f3a93e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:03:33 +0200
Subject: [PATCH 440/768] Factory needs title

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 2 +-
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index ef759be70c0..67e0cee4deb 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey))->toArray());
+        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey, $this->title))->toArray());
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index f52b9d1e417..f1bc7c5b3b5 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -35,7 +35,7 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey)
+    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey, private string $title)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
@@ -83,7 +83,7 @@ private function findNavigationMenuLabel(): string
             return $this->getNavigationLabelConfig()[$this->routeKey];
         }
 
-        return $this->matter('title') ?? $this->page->title;
+        return $this->matter('title') ?? $this->title;
     }
 
     private function findNavigationMenuGroup(): ?string

From eeb43031238a2a5bb85d3f46a0ae341588a68ac7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:04:11 +0200
Subject: [PATCH 441/768] Factory needs the page class

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 67e0cee4deb..b16dfe15622 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -72,7 +72,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey, $this->title))->toArray());
+        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey, $this->title, $this->page::class))->toArray());
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index f1bc7c5b3b5..c15e56b3850 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -35,7 +35,7 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey, private string $title)
+    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey, private string $title, private string $pageClass)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From 991dfbc908b73f196ae7fff307ab5ecd237bfd00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:09:01 +0200
Subject: [PATCH 442/768] Compare page class constant instead of instanceof

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c15e56b3850..11dfddd5124 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -88,7 +88,7 @@ private function findNavigationMenuLabel(): string
 
     private function findNavigationMenuGroup(): ?string
     {
-        if ($this->page instanceof DocumentationPage) {
+        if ($this->pageClass === DocumentationPage::class) {
             return $this->getDocumentationPageGroup();
         }
 
@@ -97,7 +97,7 @@ private function findNavigationMenuGroup(): ?string
 
     private function findNavigationMenuHidden(): bool
     {
-        if ($this->page instanceof MarkdownPost) {
+        if ($this->pageClass === MarkdownPost::class) {
             return true;
         }
 
@@ -119,7 +119,7 @@ private function findNavigationMenuPriority(): int
         }
 
         // Different default return values are to preserve backwards compatibility
-        return $this->page instanceof DocumentationPage
+        return $this->pageClass === DocumentationPage::class
             ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
             : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
     }

From 516f649b8d41e2fe363b3e437e134f69873be9e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:09:55 +0200
Subject: [PATCH 443/768] Use is_a function to preserve compatibility with
 child classes

---
 .../src/Framework/Factories/NavigationDataFactory.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 11dfddd5124..88f2f9b0001 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -15,6 +15,7 @@
 use function array_merge;
 use function config;
 use function in_array;
+use function is_a;
 
 class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
@@ -88,7 +89,7 @@ private function findNavigationMenuLabel(): string
 
     private function findNavigationMenuGroup(): ?string
     {
-        if ($this->pageClass === DocumentationPage::class) {
+        if (is_a($this->pageClass,  DocumentationPage::class, true)) {
             return $this->getDocumentationPageGroup();
         }
 
@@ -97,7 +98,7 @@ private function findNavigationMenuGroup(): ?string
 
     private function findNavigationMenuHidden(): bool
     {
-        if ($this->pageClass === MarkdownPost::class) {
+        if (is_a($this->pageClass,  MarkdownPost::class, true)) {
             return true;
         }
 
@@ -119,7 +120,7 @@ private function findNavigationMenuPriority(): int
         }
 
         // Different default return values are to preserve backwards compatibility
-        return $this->pageClass === DocumentationPage::class
+        return is_a($this->pageClass, DocumentationPage::class, true)
             ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
             : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
     }

From 2f0b84c975e096fc4b20b66eda655b93336288bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:10:15 +0200
Subject: [PATCH 444/768] Remove outdated comment

---
 .../Actions/Constructors/FindsNavigationDataForPage.php          | 1 -
 .../framework/src/Framework/Factories/NavigationDataFactory.php  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 5fd075c6ae9..19af88d25fd 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -97,7 +97,6 @@ private function findNavigationMenuPriority(): int
             return $this->page->matter('navigation.priority');
         }
 
-        // Different default return values are to preserve backwards compatibility
         return $this->page instanceof DocumentationPage
             ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
             : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 88f2f9b0001..c8ef1901205 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -119,7 +119,6 @@ private function findNavigationMenuPriority(): int
             return $this->matter('navigation.priority');
         }
 
-        // Different default return values are to preserve backwards compatibility
         return is_a($this->pageClass, DocumentationPage::class, true)
             ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
             : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;

From 3b0b8c1ba32c63ebd2b8b976186ea3e6c8eeb378 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:10:36 +0200
Subject: [PATCH 445/768] Add 'readonly' modifiers

---
 .../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 c8ef1901205..ec60fa4368d 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -36,7 +36,7 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private FrontMatter $matter, private string $identifier, private string $routeKey, private string $title, private string $pageClass)
+    public function __construct(private readonly FrontMatter $matter, private readonly string $identifier, private readonly string $routeKey, private readonly string $title, private readonly string $pageClass)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From 36e1246b729c5cb2d76877b60950d70afcbfa720 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:10:43 +0200
Subject: [PATCH 446/768] Split comma-separated values into multiple lines

---
 .../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 ec60fa4368d..baa5e268474 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -36,7 +36,11 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private readonly FrontMatter $matter, private readonly string $identifier, private readonly string $routeKey, private readonly string $title, private readonly string $pageClass)
+    public function __construct(private readonly FrontMatter $matter,
+                                private readonly string      $identifier,
+                                private readonly string      $routeKey,
+                                private readonly string      $title,
+                                private readonly string      $pageClass)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From 5b396d130fd766b797b5b275e390b808501e091b Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 17:11:09 +0000
Subject: [PATCH 447/768] Apply fixes from StyleCI

---
 .../FindsNavigationDataForPage.php            |  1 -
 .../Constructors/FindsTitleForPage.php        |  1 -
 .../Internal/ConstructsPageSchemas.php        |  3 ---
 .../Factories/HydePageDataFactory.php         |  2 --
 .../Factories/NavigationDataFactory.php       | 20 +++++++++----------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
index 19af88d25fd..ec7793cbcb7 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
@@ -15,7 +15,6 @@
  * Helper for HydePages to discover data used for navigation menus and the documentation sidebar.
  *
  * @deprecated Refactor to use factories instead. As this action is rather complex, it should have its own factory.
- *
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
  * @see \Hyde\Pages\Concerns\HydePage
  */
diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
index 055275ff182..5f02352abee 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
@@ -10,7 +10,6 @@
 
 /**
  * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
- *
  * @deprecated Refactor to use factories instead.
  */
 final class FindsTitleForPage
diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 75e7c1f90bd..2da403491f9 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -4,11 +4,8 @@
 
 namespace Hyde\Framework\Concerns\Internal;
 
-use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
-use Hyde\Framework\Actions\Constructors\FindsTitleForPage;
 use Hyde\Framework\Factories\BlogPostDataFactory;
 use Hyde\Framework\Factories\HydePageDataFactory;
-use Hyde\Hyde;
 use Hyde\Pages\MarkdownPost;
 
 /**
diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index b16dfe15622..7c6a20a6c2c 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -4,14 +4,12 @@
 
 namespace Hyde\Framework\Factories;
 
-use Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Pages\Concerns\HydePage;
 use function substr;
 use function trim;
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index baa5e268474..5dc14f5f429 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,16 +4,16 @@
 
 namespace Hyde\Framework\Factories;
 
+use function array_flip;
+use function array_key_exists;
+use function array_merge;
+use function config;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
-use function array_flip;
-use function array_key_exists;
-use function array_merge;
-use function config;
 use function in_array;
 use function is_a;
 
@@ -37,10 +37,10 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?int $priority;
 
     public function __construct(private readonly FrontMatter $matter,
-                                private readonly string      $identifier,
-                                private readonly string      $routeKey,
-                                private readonly string      $title,
-                                private readonly string      $pageClass)
+                                private readonly string $identifier,
+                                private readonly string $routeKey,
+                                private readonly string $title,
+                                private readonly string $pageClass)
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
@@ -93,7 +93,7 @@ private function findNavigationMenuLabel(): string
 
     private function findNavigationMenuGroup(): ?string
     {
-        if (is_a($this->pageClass,  DocumentationPage::class, true)) {
+        if (is_a($this->pageClass, DocumentationPage::class, true)) {
             return $this->getDocumentationPageGroup();
         }
 
@@ -102,7 +102,7 @@ private function findNavigationMenuGroup(): ?string
 
     private function findNavigationMenuHidden(): bool
     {
-        if (is_a($this->pageClass,  MarkdownPost::class, true)) {
+        if (is_a($this->pageClass, MarkdownPost::class, true)) {
             return true;
         }
 

From 73c7db422352fb759aa92c0d4332b454475a9311 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:12:52 +0200
Subject: [PATCH 448/768] Outdent promoted property declarations

---
 .../Framework/Factories/NavigationDataFactory.php    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 5dc14f5f429..55b1475010c 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -36,11 +36,13 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
 
-    public function __construct(private readonly FrontMatter $matter,
-                                private readonly string $identifier,
-                                private readonly string $routeKey,
-                                private readonly string $title,
-                                private readonly string $pageClass)
+    public function __construct(
+        private readonly FrontMatter $matter,
+        private readonly string $identifier,
+        private readonly string $routeKey,
+        private readonly string $title,
+        private readonly string $pageClass
+    )
     {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From 7c5e04cceaaac37022882a5ab444ddb0f1c88c0d Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 17:13:02 +0000
Subject: [PATCH 449/768] Apply fixes from StyleCI

---
 .../src/Framework/Factories/NavigationDataFactory.php          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 55b1475010c..ed24e4a7b1c 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -42,8 +42,7 @@ public function __construct(
         private readonly string $routeKey,
         private readonly string $title,
         private readonly string $pageClass
-    )
-    {
+    ) {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
         $this->hidden = $this->makeHidden();

From 0e9a74485b578b3d4700ba824c2e3021a026f70c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:14:45 +0200
Subject: [PATCH 450/768] Add class description

---
 .../src/Framework/Factories/NavigationDataFactory.php          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index ed24e4a7b1c..8fabcc640b5 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -17,6 +17,9 @@
 use function in_array;
 use function is_a;
 
+/**
+ * Discover data used for navigation menus and the documentation sidebar.
+ */
 class NavigationDataFactory extends Concerns\PageDataFactory implements NavigationSchema
 {
     use InteractsWithFrontMatter;

From dcd61dfca6f3f539c2c820b88edfbaa6e7d7aeef Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:19:12 +0200
Subject: [PATCH 451/768] Add static make shorthand

---
 .../src/Framework/Factories/HydePageDataFactory.php         | 2 +-
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 7c6a20a6c2c..ccb23d89c1b 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -70,7 +70,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationData::make((new NavigationDataFactory($this->matter, $this->identifier, $this->page->routeKey, $this->title, $this->page::class))->toArray());
+        return NavigationDataFactory::make($this->matter, $this->identifier, $this->page->routeKey, $this->title, $this->page::class);
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 8fabcc640b5..968f74ba4f2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Features\Navigation\NavigationData;
 use function array_flip;
 use function array_key_exists;
 use function array_merge;
@@ -62,6 +63,11 @@ public function toArray(): array
         ];
     }
 
+    public static function make(...$args): NavigationData
+    {
+        return NavigationData::make((new self(...$args))->toArray());
+    }
+
     protected function makeLabel(): ?string
     {
         return $this->findNavigationMenuLabel();

From 344c6226dba437137920d6de17b2e761835cc1e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:20:34 +0200
Subject: [PATCH 452/768] Make constructor arguments promoted and readonly

---
 .../Factories/HydePageDataFactory.php         | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index ccb23d89c1b..e22383fe8e9 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -23,26 +23,20 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
      */
     public const SCHEMA = PageSchema::PAGE_SCHEMA;
 
-    private FrontMatter $matter;
-    private Markdown|false $markdown;
-    private string $identifier;
-    private string $outputPath;
-
-    protected HydePage $page;
-
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
 
-    public function __construct(FrontMatter $matter, Markdown|false $markdown, string $identifier, string $outputPath, HydePage $page)
+    public function __construct(
+        private readonly FrontMatter    $matter,
+        private readonly Markdown|false $markdown,
+        private readonly string         $identifier,
+        private readonly string         $outputPath,
+        protected HydePage              $page // @deprecated
+    )
     {
-        $this->matter = $matter;
-        $this->markdown = $markdown;
-        $this->identifier = $identifier;
-        $this->outputPath = $outputPath;
 
         /** @deprecated */
-        $this->page = $page;
 
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();

From 0285bd1559f8ef1911333baeba4a8fe40d96f663 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 17:20:45 +0000
Subject: [PATCH 453/768] Apply fixes from StyleCI

---
 .../src/Framework/Factories/HydePageDataFactory.php  | 12 +++++-------
 .../Framework/Factories/NavigationDataFactory.php    |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index e22383fe8e9..61d7a0d7421 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -28,16 +28,14 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     protected readonly ?NavigationData $navigation;
 
     public function __construct(
-        private readonly FrontMatter    $matter,
+        private readonly FrontMatter $matter,
         private readonly Markdown|false $markdown,
-        private readonly string         $identifier,
-        private readonly string         $outputPath,
-        protected HydePage              $page // @deprecated
-    )
-    {
+        private readonly string $identifier,
+        private readonly string $outputPath,
+        protected HydePage $page // @deprecated
+    ) {
 
         /** @deprecated */
-
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 968f74ba4f2..c7156dddc8a 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Factories;
 
-use Hyde\Framework\Features\Navigation\NavigationData;
 use function array_flip;
 use function array_key_exists;
 use function array_merge;
 use function config;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
+use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\DocumentationPage;

From 4974fea5a133b7fee2aa89f6dd3b207771542593 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:21:42 +0200
Subject: [PATCH 454/768] Remove deprecation marker missed in refactor

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 61d7a0d7421..f0386f600a3 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -34,8 +34,6 @@ public function __construct(
         private readonly string $outputPath,
         protected HydePage $page // @deprecated
     ) {
-
-        /** @deprecated */
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From 9484c6c4158cb7458aa070366f572837c92ca289 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:24:04 +0200
Subject: [PATCH 455/768] Reorder method arguments

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php   | 2 +-
 .../framework/src/Framework/Factories/NavigationDataFactory.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index f0386f600a3..e78838b0ff7 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -60,7 +60,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationDataFactory::make($this->matter, $this->identifier, $this->page->routeKey, $this->title, $this->page::class);
+        return NavigationDataFactory::make($this->matter, $this->identifier, $this->page::class, $this->page->routeKey, $this->title);
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index c7156dddc8a..55d5027a50d 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -43,9 +43,9 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     public function __construct(
         private readonly FrontMatter $matter,
         private readonly string $identifier,
+        private readonly string $pageClass,
         private readonly string $routeKey,
         private readonly string $title,
-        private readonly string $pageClass
     ) {
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From f5f10ca06a299658a6e39a0be758e18d902f21ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:27:41 +0200
Subject: [PATCH 456/768] Replace deprecated property with scoped information

---
 .../Framework/Concerns/Internal/ConstructsPageSchemas.php    | 2 +-
 .../src/Framework/Factories/HydePageDataFactory.php          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 2da403491f9..ae3ec8b11bf 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -24,6 +24,6 @@ protected function constructPageSchemas(): void
 
     protected function constructPageSchema(): void
     {
-        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this->identifier, $this->getOutputPath(), $this));
+        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
     }
 }
diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index e78838b0ff7..f16832e1af6 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -30,9 +30,10 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     public function __construct(
         private readonly FrontMatter $matter,
         private readonly Markdown|false $markdown,
+        private readonly string $pageClass,
         private readonly string $identifier,
         private readonly string $outputPath,
-        protected HydePage $page // @deprecated
+        private readonly string $routeKey,
     ) {
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
@@ -60,7 +61,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationDataFactory::make($this->matter, $this->identifier, $this->page::class, $this->page->routeKey, $this->title);
+        return NavigationDataFactory::make($this->matter, $this->identifier, $this->pageClass, $this->routeKey, $this->title);
     }
 
     private function findTitleForPage(): string

From d4b586d0383fe6cb6bd020a4c1a9397fcedd0d83 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 17:27:50 +0000
Subject: [PATCH 457/768] Apply fixes from StyleCI

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index f16832e1af6..449a058dee1 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -10,7 +10,6 @@
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Markdown\Models\Markdown;
-use Hyde\Pages\Concerns\HydePage;
 use function substr;
 use function trim;
 

From 9f55d13e694d4bc57fa9e950fb3f35e4ef98ac85 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:29:56 +0200
Subject: [PATCH 458/768] Replace unpacking variadic arguments with typed
 properties

Gives for easier refactors and better/proper IDE support
---
 .../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 55d5027a50d..550cea903a5 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -63,9 +63,9 @@ public function toArray(): array
         ];
     }
 
-    public static function make(...$args): NavigationData
+    public static function make(FrontMatter $matter, string $identifier, string $pageClass, string $routeKey, string $title): NavigationData
     {
-        return NavigationData::make((new self(...$args))->toArray());
+        return NavigationData::make((new self($matter, $identifier, $pageClass, $routeKey, $title))->toArray());
     }
 
     protected function makeLabel(): ?string

From b78881134e211a645e9b0d9ccdc2e0d30c215547 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:34:46 +0200
Subject: [PATCH 459/768] Remove unnecessary method name qualifiers

These were useful scopes when this was a trait, but now we know this is for navigation menus
---
 .../Factories/NavigationDataFactory.php       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 550cea903a5..ce9741fca2d 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -70,38 +70,38 @@ public static function make(FrontMatter $matter, string $identifier, string $pag
 
     protected function makeLabel(): ?string
     {
-        return $this->findNavigationMenuLabel();
+        return $this->findLabel();
     }
 
     protected function makeGroup(): ?string
     {
-        return $this->findNavigationMenuGroup();
+        return $this->findGroup();
     }
 
     protected function makeHidden(): ?bool
     {
-        return $this->findNavigationMenuHidden();
+        return $this->findHidden();
     }
 
     protected function makePriority(): ?int
     {
-        return $this->findNavigationMenuPriority();
+        return $this->findPriority();
     }
 
-    private function findNavigationMenuLabel(): string
+    private function findLabel(): string
     {
         if ($this->matter('navigation.label') !== null) {
             return $this->matter('navigation.label');
         }
 
-        if (isset($this->getNavigationLabelConfig()[$this->routeKey])) {
-            return $this->getNavigationLabelConfig()[$this->routeKey];
+        if (isset($this->getLabelConfig()[$this->routeKey])) {
+            return $this->getLabelConfig()[$this->routeKey];
         }
 
         return $this->matter('title') ?? $this->title;
     }
 
-    private function findNavigationMenuGroup(): ?string
+    private function findGroup(): ?string
     {
         if (is_a($this->pageClass, DocumentationPage::class, true)) {
             return $this->getDocumentationPageGroup();
@@ -110,7 +110,7 @@ private function findNavigationMenuGroup(): ?string
         return null;
     }
 
-    private function findNavigationMenuHidden(): bool
+    private function findHidden(): bool
     {
         if (is_a($this->pageClass, MarkdownPost::class, true)) {
             return true;
@@ -127,23 +127,23 @@ private function findNavigationMenuHidden(): bool
         return false;
     }
 
-    private function findNavigationMenuPriority(): int
+    private function findPriority(): int
     {
         if ($this->matter('navigation.priority') !== null) {
             return $this->matter('navigation.priority');
         }
 
         return is_a($this->pageClass, DocumentationPage::class, true)
-            ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
-            : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
+            ? $this->findPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
+            : $this->findPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
     }
 
-    private function findNavigationMenuPriorityInNavigationConfig(array $config): ?int
+    private function findPriorityInNavigationConfig(array $config): ?int
     {
         return array_key_exists($this->routeKey, $config) ? (int) $config[$this->routeKey] : null;
     }
 
-    private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int
+    private function findPriorityInSidebarConfig(array $config): ?int
     {
         // Sidebars uses a special syntax where the keys are just the page identifiers in a flat array
 
@@ -156,7 +156,7 @@ private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int
             : null;
     }
 
-    private function getNavigationLabelConfig(): array
+    private function getLabelConfig(): array
     {
         return array_merge([
             'index' => 'Home',

From b34d5b90fc5f18b82eb98266a92271d707fadc3a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:38:28 +0200
Subject: [PATCH 460/768] Extract more readable helper method

---
 .../src/Framework/Factories/NavigationDataFactory.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index ce9741fca2d..529e5c48fa2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -103,7 +103,7 @@ private function findLabel(): string
 
     private function findGroup(): ?string
     {
-        if (is_a($this->pageClass, DocumentationPage::class, true)) {
+        if ($this->isInstanceOf(DocumentationPage::class)) {
             return $this->getDocumentationPageGroup();
         }
 
@@ -112,7 +112,7 @@ private function findGroup(): ?string
 
     private function findHidden(): bool
     {
-        if (is_a($this->pageClass, MarkdownPost::class, true)) {
+        if ($this->isInstanceOf(MarkdownPost::class)) {
             return true;
         }
 
@@ -133,7 +133,7 @@ private function findPriority(): int
             return $this->matter('navigation.priority');
         }
 
-        return is_a($this->pageClass, DocumentationPage::class, true)
+        return $this->isInstanceOf(DocumentationPage::class)
             ? $this->findPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
             : $this->findPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
     }
@@ -173,4 +173,9 @@ private function getDocumentationPageGroup(): ?string
             // Otherwise, we look in the front matter.
             : $this->matter('navigation.group', 'other');
     }
+
+    protected function isInstanceOf(string $class): bool
+    {
+        return is_a($this->pageClass, $class, true);
+    }
 }

From 718574eaf92cb8ac50cb6eaa6585ec329b6464ac Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:40:28 +0200
Subject: [PATCH 461/768] Inline unnecessary transient forwarding methods

---
 .../Factories/NavigationDataFactory.php       | 26 +++----------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 529e5c48fa2..089c13f2523 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -69,26 +69,6 @@ public static function make(FrontMatter $matter, string $identifier, string $pag
     }
 
     protected function makeLabel(): ?string
-    {
-        return $this->findLabel();
-    }
-
-    protected function makeGroup(): ?string
-    {
-        return $this->findGroup();
-    }
-
-    protected function makeHidden(): ?bool
-    {
-        return $this->findHidden();
-    }
-
-    protected function makePriority(): ?int
-    {
-        return $this->findPriority();
-    }
-
-    private function findLabel(): string
     {
         if ($this->matter('navigation.label') !== null) {
             return $this->matter('navigation.label');
@@ -101,7 +81,7 @@ private function findLabel(): string
         return $this->matter('title') ?? $this->title;
     }
 
-    private function findGroup(): ?string
+    protected function makeGroup(): ?string
     {
         if ($this->isInstanceOf(DocumentationPage::class)) {
             return $this->getDocumentationPageGroup();
@@ -110,7 +90,7 @@ private function findGroup(): ?string
         return null;
     }
 
-    private function findHidden(): bool
+    protected function makeHidden(): ?bool
     {
         if ($this->isInstanceOf(MarkdownPost::class)) {
             return true;
@@ -127,7 +107,7 @@ private function findHidden(): bool
         return false;
     }
 
-    private function findPriority(): int
+    protected function makePriority(): ?int
     {
         if ($this->matter('navigation.priority') !== null) {
             return $this->matter('navigation.priority');

From c671b15a414450a351a5b69f4d8341b9f34542a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:42:17 +0200
Subject: [PATCH 462/768] Introduce local variable

---
 .../src/Framework/Factories/NavigationDataFactory.php        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 089c13f2523..1423af31303 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -74,8 +74,9 @@ protected function makeLabel(): ?string
             return $this->matter('navigation.label');
         }
 
-        if (isset($this->getLabelConfig()[$this->routeKey])) {
-            return $this->getLabelConfig()[$this->routeKey];
+        $labelConfig = $this->getLabelConfig();
+        if (isset($labelConfig[$this->routeKey])) {
+            return $labelConfig[$this->routeKey];
         }
 
         return $this->matter('title') ?? $this->title;

From e17a638bcf83ff727e7d5a423a1dc282fb169ad9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:42:35 +0200
Subject: [PATCH 463/768] Inline method

---
 .../Framework/Factories/NavigationDataFactory.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1423af31303..52328e9b8ab 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -15,6 +15,7 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
+use function config as config1;
 use function in_array;
 use function is_a;
 
@@ -74,7 +75,11 @@ protected function makeLabel(): ?string
             return $this->matter('navigation.label');
         }
 
-        $labelConfig = $this->getLabelConfig();
+        $labelConfig = array_merge([
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ], config1('hyde.navigation.labels', []));
+
         if (isset($labelConfig[$this->routeKey])) {
             return $labelConfig[$this->routeKey];
         }
@@ -137,14 +142,6 @@ private function findPriorityInSidebarConfig(array $config): ?int
             : null;
     }
 
-    private function getLabelConfig(): array
-    {
-        return array_merge([
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ], config('hyde.navigation.labels', []));
-    }
-
     private function getDocumentationPageGroup(): ?string
     {
         // If the documentation page is in a subdirectory,

From 8195a3ddac1be7edec528920306ed99938d7d340 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 17:42:46 +0000
Subject: [PATCH 464/768] Apply fixes from StyleCI

---
 .../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 52328e9b8ab..5da55546cfd 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -8,6 +8,7 @@
 use function array_key_exists;
 use function array_merge;
 use function config;
+use function config as config1;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
@@ -15,7 +16,6 @@
 use Hyde\Pages\DocumentationPage;
 use Hyde\Pages\MarkdownPost;
 use Illuminate\Support\Str;
-use function config as config1;
 use function in_array;
 use function is_a;
 

From bc967c18b10c83ce26e9557659d7abd2d01c5bb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:50:41 +0200
Subject: [PATCH 465/768] Inline alias

---
 .../src/Framework/Factories/NavigationDataFactory.php          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 5da55546cfd..2bc4321b87e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -8,7 +8,6 @@
 use function array_key_exists;
 use function array_merge;
 use function config;
-use function config as config1;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
@@ -78,7 +77,7 @@ protected function makeLabel(): ?string
         $labelConfig = array_merge([
             'index' => 'Home',
             'docs/index' => 'Docs',
-        ], config1('hyde.navigation.labels', []));
+        ], config('hyde.navigation.labels', []));
 
         if (isset($labelConfig[$this->routeKey])) {
             return $labelConfig[$this->routeKey];

From c71796356b9fc7d15c01f09976f562f4e92db29b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:53:31 +0200
Subject: [PATCH 466/768] Extract method

---
 .../Factories/NavigationDataFactory.php       | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 2bc4321b87e..d919e53ac61 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -74,16 +74,7 @@ protected function makeLabel(): ?string
             return $this->matter('navigation.label');
         }
 
-        $labelConfig = array_merge([
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ], config('hyde.navigation.labels', []));
-
-        if (isset($labelConfig[$this->routeKey])) {
-            return $labelConfig[$this->routeKey];
-        }
-
-        return $this->matter('title') ?? $this->title;
+        return $this->searchForLabelInConfig() ?? $this->matter('title') ?? $this->title;
     }
 
     protected function makeGroup(): ?string
@@ -155,4 +146,18 @@ protected function isInstanceOf(string $class): bool
     {
         return is_a($this->pageClass, $class, true);
     }
+
+    protected function searchForLabelInConfig(): ?string
+    {
+        $labelConfig = array_merge([
+            'index' => 'Home',
+            'docs/index' => 'Docs',
+        ], config('hyde.navigation.labels', []));
+
+        if (isset($labelConfig[$this->routeKey])) {
+            return $labelConfig[$this->routeKey];
+        }
+
+        return null;
+    }
 }

From 7a479822b7c68d336c2766691aa232ec1b6ceeee Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:54:04 +0200
Subject: [PATCH 467/768] Replace if-block with null coalesce

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index d919e53ac61..88c9bdbc224 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -70,11 +70,7 @@ public static function make(FrontMatter $matter, string $identifier, string $pag
 
     protected function makeLabel(): ?string
     {
-        if ($this->matter('navigation.label') !== null) {
-            return $this->matter('navigation.label');
-        }
-
-        return $this->searchForLabelInConfig() ?? $this->matter('title') ?? $this->title;
+        return $this->matter('navigation.label') ?? $this->searchForLabelInConfig() ?? $this->matter('title') ?? $this->title;
     }
 
     protected function makeGroup(): ?string

From f95002dbe1f9ec4d0aa1c9e20492b00bd8bfbbb4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:54:32 +0200
Subject: [PATCH 468/768] Wrap long coalesce chain to multiple lines

---
 .../src/Framework/Factories/NavigationDataFactory.php        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 88c9bdbc224..85a09ef5cdc 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -70,7 +70,10 @@ public static function make(FrontMatter $matter, string $identifier, string $pag
 
     protected function makeLabel(): ?string
     {
-        return $this->matter('navigation.label') ?? $this->searchForLabelInConfig() ?? $this->matter('title') ?? $this->title;
+        return $this->matter('navigation.label')
+            ?? $this->searchForLabelInConfig()
+            ?? $this->matter('title')
+            ?? $this->title;
     }
 
     protected function makeGroup(): ?string

From 8a7821ff81db91b4c531bae11750c1e9aa08ba32 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:55:00 +0200
Subject: [PATCH 469/768] Format code

---
 .../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 85a09ef5cdc..64594879866 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -65,7 +65,9 @@ public function toArray(): array
 
     public static function make(FrontMatter $matter, string $identifier, string $pageClass, string $routeKey, string $title): NavigationData
     {
-        return NavigationData::make((new self($matter, $identifier, $pageClass, $routeKey, $title))->toArray());
+        return NavigationData::make(
+            (new self($matter, $identifier, $pageClass, $routeKey, $title))->toArray()
+        );
     }
 
     protected function makeLabel(): ?string

From 4d72f9a4cf08ad278f0c7b30339765b032791d38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:55:08 +0200
Subject: [PATCH 470/768] Return new static

---
 .../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 64594879866..f9584e02f4a 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -66,7 +66,7 @@ public function toArray(): array
     public static function make(FrontMatter $matter, string $identifier, string $pageClass, string $routeKey, string $title): NavigationData
     {
         return NavigationData::make(
-            (new self($matter, $identifier, $pageClass, $routeKey, $title))->toArray()
+            (new static($matter, $identifier, $pageClass, $routeKey, $title))->toArray()
         );
     }
 

From 23b53dd1d95074993071e624ca74bd93b0c28e6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 19:56:07 +0200
Subject: [PATCH 471/768] Reorder helper methods

---
 .../src/Framework/Factories/NavigationDataFactory.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index f9584e02f4a..1861af69c87 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -143,11 +143,6 @@ private function getDocumentationPageGroup(): ?string
             : $this->matter('navigation.group', 'other');
     }
 
-    protected function isInstanceOf(string $class): bool
-    {
-        return is_a($this->pageClass, $class, true);
-    }
-
     protected function searchForLabelInConfig(): ?string
     {
         $labelConfig = array_merge([
@@ -161,4 +156,9 @@ protected function searchForLabelInConfig(): ?string
 
         return null;
     }
+
+    protected function isInstanceOf(string $class): bool
+    {
+        return is_a($this->pageClass, $class, true);
+    }
 }

From 2d5c8fd4375aa4a3860725c77e2a7bb39b21d52b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:03:31 +0200
Subject: [PATCH 472/768] Delete FindsNavigationDataForPage.php

---
 .../FindsNavigationDataForPage.php            | 139 ------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
deleted file mode 100644
index ec7793cbcb7..00000000000
--- a/packages/framework/src/Framework/Actions/Constructors/FindsNavigationDataForPage.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions\Constructors;
-
-use Hyde\Framework\Features\Navigation\NavigationData;
-use Hyde\Markdown\Contracts\FrontMatter\DocumentationPageSchema;
-use Hyde\Pages\Concerns\HydePage;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Pages\MarkdownPost;
-use Illuminate\Support\Str;
-
-/**
- * Helper for HydePages to discover data used for navigation menus and the documentation sidebar.
- *
- * @deprecated Refactor to use factories instead. As this action is rather complex, it should have its own factory.
- * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
- * @see \Hyde\Pages\Concerns\HydePage
- */
-final class FindsNavigationDataForPage
-{
-    protected const FALLBACK_PRIORITY = 999;
-    protected const CONFIG_OFFSET = 500;
-
-    public static function run(HydePage $page): NavigationData
-    {
-        return (new self($page))->constructNavigationData();
-    }
-
-    protected function __construct(protected HydePage $page)
-    {
-    }
-
-    protected function constructNavigationData(): NavigationData
-    {
-        if ($this->page instanceof DocumentationPageSchema) {
-            return $this->makeNavigationData(
-                $this->findNavigationMenuLabel(),
-                $this->findNavigationMenuHidden(),
-                $this->page->matter('navigation.priority', $this->findNavigationMenuPriority()),
-                $this->getDocumentationPageGroup()
-            );
-        }
-
-        return $this->makeNavigationData(
-            $this->findNavigationMenuLabel(),
-            $this->findNavigationMenuHidden(),
-            $this->findNavigationMenuPriority(),
-        );
-    }
-
-    private function makeNavigationData(string $label, bool $hidden, int $priority, ?string $group = null): NavigationData
-    {
-        return NavigationData::make([
-            'label' => $label,
-            'group' => $group,
-            'hidden' => $hidden,
-            'priority' => $priority,
-        ]);
-    }
-
-    private function findNavigationMenuLabel(): string
-    {
-        if ($this->page->matter('navigation.label') !== null) {
-            return $this->page->matter('navigation.label');
-        }
-
-        if (isset($this->getNavigationLabelConfig()[$this->page->routeKey])) {
-            return $this->getNavigationLabelConfig()[$this->page->routeKey];
-        }
-
-        return $this->page->matter('title') ?? $this->page->title;
-    }
-
-    private function findNavigationMenuHidden(): bool
-    {
-        if ($this->page instanceof MarkdownPost) {
-            return true;
-        }
-
-        if ($this->page->matter('navigation.hidden', false)) {
-            return true;
-        }
-
-        if (in_array($this->page->routeKey, config('hyde.navigation.exclude', ['404']))) {
-            return true;
-        }
-
-        return false;
-    }
-
-    private function findNavigationMenuPriority(): int
-    {
-        if ($this->page->matter('navigation.priority') !== null) {
-            return $this->page->matter('navigation.priority');
-        }
-
-        return $this->page instanceof DocumentationPage
-            ? $this->findNavigationMenuPriorityInSidebarConfig(array_flip(config('docs.sidebar_order', []))) ?? self::FALLBACK_PRIORITY
-            : $this->findNavigationMenuPriorityInNavigationConfig(config('hyde.navigation.order', [])) ?? self::FALLBACK_PRIORITY;
-    }
-
-    private function findNavigationMenuPriorityInNavigationConfig(array $config): ?int
-    {
-        return array_key_exists($this->page->routeKey, $config) ? (int) $config[$this->page->routeKey] : null;
-    }
-
-    private function findNavigationMenuPriorityInSidebarConfig(array $config): ?int
-    {
-        // Sidebars uses a special syntax where the keys are just the page identifiers in a flat array
-
-        // Adding 250 makes so that pages with a front matter priority that is lower can be shown first.
-        // It's lower than the fallback of 500 so that the config ones still come first.
-        // This is all to make it easier to mix ways of adding priorities.
-
-        return isset($config[$this->page->identifier])
-            ? $config[$this->page->identifier] + (self::CONFIG_OFFSET)
-            : null;
-    }
-
-    private function getNavigationLabelConfig(): array
-    {
-        return array_merge([
-            'index' => 'Home',
-            'docs/index' => 'Docs',
-        ], config('hyde.navigation.labels', []));
-    }
-
-    private function getDocumentationPageGroup(): ?string
-    {
-        // If the documentation page is in a subdirectory,
-        return str_contains($this->page->identifier, '/')
-            // then we can use that as the category name.
-            ? Str::before($this->page->identifier, '/')
-            // Otherwise, we look in the front matter.
-            : $this->page->matter('navigation.group', 'other');
-    }
-}

From b96d26d4270077018a7fdcd6be5b6fe321ef6791 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:03:36 +0200
Subject: [PATCH 473/768] Update covers tags

---
 packages/framework/tests/Feature/HydePageTest.php              | 2 +-
 packages/framework/tests/Feature/PageModelConstructorsTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 60f86553593..aa34be2ca3f 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -26,7 +26,7 @@
  * @covers \Hyde\Pages\Concerns\BaseMarkdownPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
- * @covers \Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class HydePageTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index c55f6098d9c..228662d47a2 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -13,8 +13,8 @@
  * Test the constructor actions and schema constructors for page models.
  *
  * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
- * @covers \Hyde\Framework\Actions\Constructors\FindsNavigationDataForPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class PageModelConstructorsTest extends TestCase
 {

From eac6fe2ac7bf2365160ba6f7c949659f289bb671 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:06:39 +0200
Subject: [PATCH 474/768] Delete FindsTitleForPage.php

---
 .../Constructors/FindsTitleForPage.php        | 45 -------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php b/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
deleted file mode 100644
index 5f02352abee..00000000000
--- a/packages/framework/src/Framework/Actions/Constructors/FindsTitleForPage.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions\Constructors;
-
-use Hyde\Hyde;
-use Hyde\Pages\Concerns\BaseMarkdownPage;
-use Hyde\Pages\Concerns\HydePage;
-
-/**
- * @see \Hyde\Framework\Testing\Feature\PageModelConstructorsTest
- * @deprecated Refactor to use factories instead.
- */
-final class FindsTitleForPage
-{
-    public static function run(HydePage $page): string
-    {
-        return trim((new self($page))->findTitleForPage());
-    }
-
-    protected function __construct(protected HydePage $page)
-    {
-    }
-
-    protected function findTitleForPage(): string
-    {
-        return $this->page->matter('title')
-                ?? $this->findTitleFromMarkdownHeadings()
-                ?? Hyde::makeTitle($this->page->identifier);
-    }
-
-    protected function findTitleFromMarkdownHeadings(): ?string
-    {
-        if ($this->page instanceof BaseMarkdownPage) {
-            foreach ($this->page->markdown()->toArray() as $line) {
-                if (str_starts_with($line, '# ')) {
-                    return trim(substr($line, 2), ' ');
-                }
-            }
-        }
-
-        return null;
-    }
-}

From d682d025b674fd3cb6a4822397e580e70c42bd4e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:06:46 +0200
Subject: [PATCH 475/768] Update covers tags

---
 packages/framework/tests/Feature/HydePageTest.php              | 2 +-
 packages/framework/tests/Feature/PageModelConstructorsTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index aa34be2ca3f..2807803ecae 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -25,8 +25,8 @@
  * @covers \Hyde\Pages\Concerns\HydePage
  * @covers \Hyde\Pages\Concerns\BaseMarkdownPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
- * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Factories\PageDataFactory
  */
 class HydePageTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index 228662d47a2..88926eb52f0 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -12,9 +12,9 @@
 /**
  * Test the constructor actions and schema constructors for page models.
  *
- * @covers \Hyde\Framework\Actions\Constructors\FindsTitleForPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
+ * @covers \Hyde\Framework\Factories\PageDataFactory
  */
 class PageModelConstructorsTest extends TestCase
 {

From 9abc5c97775de56f71d7ae0cfb9d870a4561c775 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:08:41 +0200
Subject: [PATCH 476/768] Add todo

---
 .../Actions/Constructors/FindsContentLengthForImageObject.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
index be4b4c4fa93..9dc95f9e95a 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
@@ -12,6 +12,9 @@
 
 /**
  * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
+ *
+ * @todo Refactor output to buffer into the service container, so output can be controlled better,
+ *       for example by grouping all warnings at the end of a build (with options to fail on warning, useful for CI setups).
  */
 class FindsContentLengthForImageObject
 {

From 3d4e430593becd2fbcec52b11b05edfd29dcc769 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:15:43 +0200
Subject: [PATCH 477/768] Implement tested behaviour

---
 packages/framework/src/Support/Models/File.php |  4 ++++
 packages/framework/tests/Feature/FileTest.php  | 16 +++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index f216e0c5730..ee4b9b96e15 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -145,7 +145,11 @@ public function getExtension(): string
     public function toArray(): array
     {
         return [
+            'name' => $this->getName(),
             'path' => $this->path,
+            'contents' => $this->getContents(),
+            'length' => $this->getContentLength(),
+            'mimeType' => $this->getMimeType(),
             'model' => $this->belongsTo,
         ];
     }
diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 6942a33d073..7fc7da3b52e 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -137,13 +137,15 @@ public function test_get_mime_type_returns_text_plain_if_file_does_not_exist_and
     public function test_to_array_returns_array_of_file_properties()
     {
         $this->file('foo.txt', 'foo bar');
-        // $this->assertSame([
-        //     'name'     => 'foo.txt',
-        //     'path'     => 'foo.txt',
-        //     'contents' => 'foo bar',
-        //     'length'   => 7,
-        //     'mimeType' => 'text/plain',
-        // ], File::make('foo.txt')->toArray());
+
+        $this->assertSame([
+         'name'     => 'foo.txt',
+         'path'     => 'foo.txt',
+         'contents' => 'foo bar',
+         'length'   => 7,
+         'mimeType' => 'text/plain',
+         'model'    => null,
+        ], File::make('foo.txt')->toArray());
 
         $this->assertSame([
             'path' => 'foo',

From abcd7c49c31f8160fd5657e0b88ddeb31a6ae3fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:21:17 +0200
Subject: [PATCH 478/768] Split out test into multiple test methods

---
 packages/framework/tests/Feature/FileTest.php | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 7fc7da3b52e..3c73927793b 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -8,6 +8,10 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\File;
 use Hyde\Testing\TestCase;
+use function mkdir;
+use function rmdir;
+use function touch;
+use function unlink;
 
 /**
  * @covers \Hyde\Support\Models\File
@@ -146,16 +150,35 @@ public function test_to_array_returns_array_of_file_properties()
          'mimeType' => 'text/plain',
          'model'    => null,
         ], File::make('foo.txt')->toArray());
+    }
 
+    public function test_to_array_with_empty_file_with_no_extension()
+    {
+        $this->file('foo');
         $this->assertSame([
+            'name' => 'foo',
             'path' => 'foo',
-            'model'    => null,
+            'contents' => '',
+            'length' => 0,
+            'mimeType' => 'application/x-empty',
+            'model' => null,
         ], File::make('foo')->toArray());
+    }
 
+    public function test_to_array_with_file_in_subdirectory()
+    {
+        mkdir(Hyde::path('foo'));
+        touch(Hyde::path('foo/bar.txt'));
         $this->assertSame([
+            'name' => 'bar.txt',
             'path' => 'foo/bar.txt',
-            'model'    => 'baz',
+            'contents' => '',
+            'length' => 0,
+            'mimeType' => 'text/plain',
+            'model' => 'baz',
         ], File::make('foo/bar.txt', 'baz')->toArray());
+        unlink(Hyde::path('foo/bar.txt'));
+        rmdir(Hyde::path('foo'));
     }
 
     public function test_without_directory_prefix_returns_file_without_directory_prefix()

From e3c2d3e14f3ff3968f4f9f33dad4932d9884f028 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:24:44 +0200
Subject: [PATCH 479/768] Use method for consistency

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

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index ee4b9b96e15..06ee67a04af 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -146,7 +146,7 @@ public function toArray(): array
     {
         return [
             'name' => $this->getName(),
-            'path' => $this->path,
+            'path' => $this->getPath(),
             'contents' => $this->getContents(),
             'length' => $this->getContentLength(),
             'mimeType' => $this->getMimeType(),

From 96d991186ffbc984f79dcb590795283f4b4821ec Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 18:25:32 +0000
Subject: [PATCH 480/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/FileTest.php b/packages/framework/tests/Feature/FileTest.php
index 3c73927793b..0fc207fcd5a 100644
--- a/packages/framework/tests/Feature/FileTest.php
+++ b/packages/framework/tests/Feature/FileTest.php
@@ -143,12 +143,12 @@ public function test_to_array_returns_array_of_file_properties()
         $this->file('foo.txt', 'foo bar');
 
         $this->assertSame([
-         'name'     => 'foo.txt',
-         'path'     => 'foo.txt',
-         'contents' => 'foo bar',
-         'length'   => 7,
-         'mimeType' => 'text/plain',
-         'model'    => null,
+            'name'     => 'foo.txt',
+            'path'     => 'foo.txt',
+            'contents' => 'foo bar',
+            'length'   => 7,
+            'mimeType' => 'text/plain',
+            'model'    => null,
         ], File::make('foo.txt')->toArray());
     }
 

From 9767915ee4aa2e1946f8cde90db769b96b6e588e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:27:27 +0200
Subject: [PATCH 481/768] Update PHPDoc comment for changed namespace

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

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index 06ee67a04af..97bc25527b5 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -34,9 +34,9 @@ class File implements Arrayable, JsonSerializable, Stringable
     public ?string $belongsTo = null;
 
     /**
-     * @param  string  $path  The path relative to the project root.
-     * @param  class-string<\Hyde\Pages\Concerns\HydePage>|null  $belongsToClass
-     * @return \Hyde\Framework\Models\Support\File
+     * @param string $path The path relative to the project root.
+     * @param class-string<\Hyde\Pages\Concerns\HydePage>|null $belongsToClass
+     * @return \Hyde\Support\Models\File
      */
     public static function make(string $path, ?string $belongsToClass = null): static
     {

From b8dc36404829c7c71cffa94ee1b8cf7767cc59ab Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:29:03 +0200
Subject: [PATCH 482/768] Change type to class-string

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

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index 97bc25527b5..c219957551a 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -29,7 +29,7 @@ class File implements Arrayable, JsonSerializable, Stringable
     /**
      * If the file is associated with a page, the class can be specified here.
      *
-     * @var string<\Hyde\Pages\Concerns\HydePage>|null
+     * @var class-string<\Hyde\Pages\Concerns\HydePage>|null
      */
     public ?string $belongsTo = null;
 

From 7390fb44f6ecfc58d1b89a34e1781b45d9697723 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:29:16 +0200
Subject: [PATCH 483/768] Use strict comparison

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

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index c219957551a..5163706d4d2 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -156,7 +156,7 @@ public function toArray(): array
 
     public function withoutDirectoryPrefix(): string
     {
-        if ($this->belongsTo) {
+        if ($this->belongsTo !== null) {
             // If a model is set, use that to remove the directory, so any subdirectories within is retained
             return substr($this->__toString(), strlen($this->belongsTo::$sourceDirectory) + 1);
         }

From 700547fa7c5e3358e9fec5a92ef61bff8f6b466a Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 18:29:26 +0000
Subject: [PATCH 484/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index 5163706d4d2..727ec58396b 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -34,8 +34,8 @@ class File implements Arrayable, JsonSerializable, Stringable
     public ?string $belongsTo = null;
 
     /**
-     * @param string $path The path relative to the project root.
-     * @param class-string<\Hyde\Pages\Concerns\HydePage>|null $belongsToClass
+     * @param  string  $path  The path relative to the project root.
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>|null  $belongsToClass
      * @return \Hyde\Support\Models\File
      */
     public static function make(string $path, ?string $belongsToClass = null): static

From a7f3f5081d0930fe8259ca286005d8d0f72994b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:30:22 +0200
Subject: [PATCH 485/768] Create Session.php

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

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

From b7261ecccd7edf5ed45e7f026ee4c6777fdb0cfe Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:31:41 +0200
Subject: [PATCH 486/768] Create SessionTest.php

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

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

From 89abb4862d5a5d5f3bb13e4af4242a52e719be4d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:31:36 +0200
Subject: [PATCH 487/768] Create SessionServiceProvider.php

---
 .../Session/SessionServiceProvider.php        | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/framework/src/Framework/Features/Session/SessionServiceProvider.php

diff --git a/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php b/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php
new file mode 100644
index 00000000000..a694cda92be
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Session;
+
+use Illuminate\Support\ServiceProvider;
+
+class SessionServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        //
+    }
+
+    public function boot()
+    {
+        //
+    }
+}

From 3ffc904810576e6aa30526f19de381adc942784f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:32:03 +0200
Subject: [PATCH 488/768] Covers SessionServiceProvider

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

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 6d001d1efb6..f5a3ada37a4 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -9,6 +9,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Session\Session
+ * @covers \Hyde\Framework\Features\Session\SessionServiceProvider
  */
 class SessionTest extends TestCase
 {

From 5ea455cc9b865ae1cdc0a28d0fdca8e98e060438 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:32:26 +0200
Subject: [PATCH 489/768] Register SessionServiceProvider

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

diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 97b63a88ff6..a793558d5b7 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -8,6 +8,7 @@
 use Hyde\Foundation\HydeKernel;
 use Hyde\Framework\Concerns\RegistersFileLocations;
 use Hyde\Framework\Features\DataCollections\DataCollectionServiceProvider;
+use Hyde\Framework\Features\Session\SessionServiceProvider;
 use Hyde\Framework\Services\AssetService;
 use Hyde\Framework\Services\YamlConfigurationService;
 use Hyde\Framework\Views\Components\LinkComponent;
@@ -109,6 +110,7 @@ protected function initializeConfiguration()
      */
     protected function registerModuleServiceProviders(): void
     {
+        $this->app->register(SessionServiceProvider::class);
         $this->app->register(HydeConsoleServiceProvider::class);
         $this->app->register(DataCollectionServiceProvider::class);
     }

From 036b8352b2b812fc173dbb2578d2493bfa283bbb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:32:49 +0200
Subject: [PATCH 490/768] Register Session class as Singleton

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

diff --git a/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php b/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php
index a694cda92be..aae696831c9 100644
--- a/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php
+++ b/packages/framework/src/Framework/Features/Session/SessionServiceProvider.php
@@ -10,7 +10,7 @@ class SessionServiceProvider extends ServiceProvider
 {
     public function register()
     {
-        //
+        $this->app->singleton(Session::class, Session::class);
     }
 
     public function boot()

From 717eaafc8e187edf42bd982a7c534104e84abf3e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:34:18 +0200
Subject: [PATCH 491/768] Test session is bound to service container as
 singleton

---
 packages/framework/tests/Framework/Feature/SessionTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index f5a3ada37a4..28ceb5c8355 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -6,6 +6,7 @@
 
 use Hyde\Framework\Features\Session\Session;
 use Hyde\Testing\TestCase;
+use function app;
 
 /**
  * @covers \Hyde\Framework\Features\Session\Session
@@ -13,5 +14,9 @@
  */
 class SessionTest extends TestCase
 {
-    //
+    public function test_session_is_bound_to_service_container_as_singleton()
+    {
+        $this->assertInstanceOf(Session::class, $this->app->make(Session::class));
+        $this->assertSame(app(Session::class), $this->app->make(Session::class));
+    }
 }

From 9ae0ef6c23be6c5ca657b7b85b6fddcbbf84652d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:36:36 +0200
Subject: [PATCH 492/768] Add feature to add warnings to the session

---
 .../src/Framework/Features/Session/Session.php       | 12 +++++++++++-
 .../tests/Framework/Feature/SessionTest.php          |  9 +++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index ed418c774c8..b4056d85ee2 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -6,5 +6,15 @@
 
 class Session
 {
-    //
+    protected array $warnings = [];
+
+    public function addWarning(string $warning): void
+    {
+        $this->warnings[] = $warning;
+    }
+
+    public function getWarnings(): array
+    {
+        return $this->warnings;
+    }
 }
diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 28ceb5c8355..a2c0f61388f 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -19,4 +19,13 @@ public function test_session_is_bound_to_service_container_as_singleton()
         $this->assertInstanceOf(Session::class, $this->app->make(Session::class));
         $this->assertSame(app(Session::class), $this->app->make(Session::class));
     }
+
+    public function test_session_can_add_warning()
+    {
+        $session = app(Session::class);
+
+        $session->addWarning('warning');
+
+        $this->assertSame(['warning'], $session->getWarnings());
+    }
 }

From cc49ee3e2ba98e4fa5f236420895865192757bb7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:37:03 +0200
Subject: [PATCH 493/768] Test session is not persisted

---
 packages/framework/tests/Framework/Feature/SessionTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index a2c0f61388f..00d667aa678 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -28,4 +28,9 @@ public function test_session_can_add_warning()
 
         $this->assertSame(['warning'], $session->getWarnings());
     }
+
+    public function test_session_is_not_persisted()
+    {
+        $this->assertSame([], app(Session::class)->getWarnings());
+    }
 }

From 6971fc1fe6bb76777b224126f5153fd586fdd824 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:40:51 +0200
Subject: [PATCH 494/768] Add class PHPDoc

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index b4056d85ee2..98d2d56dc40 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -4,6 +4,11 @@
 
 namespace Hyde\Framework\Features\Session;
 
+/**
+ * Adds a simple session handler, arguably most useful to defer messages, for example,
+ * to asynchronously add warnings to be used at a later point in the request lifecycle.
+ * It's bound into the service container as a singleton and is not persisted.
+ */
 class Session
 {
     protected array $warnings = [];

From 36dce589e2b4fe13e78a23478101e56b60c484d5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:40:56 +0200
Subject: [PATCH 495/768] Formatting

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 98d2d56dc40..00350bf9b30 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -7,6 +7,7 @@
 /**
  * Adds a simple session handler, arguably most useful to defer messages, for example,
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
+ *
  * It's bound into the service container as a singleton and is not persisted.
  */
 class Session

From 8fe2989df6700acb00c923bdef1f115fb6ab83b8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:41:04 +0200
Subject: [PATCH 496/768] Add example

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 00350bf9b30..6fd833c6ee0 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -9,6 +9,7 @@
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
  * It's bound into the service container as a singleton and is not persisted.
+ * @example app(Session::class)->addWarning('warning');
  */
 class Session
 {

From 823ca5c5d15c917fbf5e5ca57205126c133686ce Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:41:34 +0200
Subject: [PATCH 497/768] Add hasWarnings helper

---
 .../src/Framework/Features/Session/Session.php        |  5 +++++
 .../framework/tests/Framework/Feature/SessionTest.php | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 6fd833c6ee0..8ec5d2d8067 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -24,4 +24,9 @@ public function getWarnings(): array
     {
         return $this->warnings;
     }
+
+    public function hasWarnings(): bool
+    {
+        return ! empty($this->warnings);
+    }
 }
diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 00d667aa678..efa06ec5eb6 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -33,4 +33,15 @@ public function test_session_is_not_persisted()
     {
         $this->assertSame([], app(Session::class)->getWarnings());
     }
+
+    public function test_session_can_check_if_warnings_are_present()
+    {
+        $session = app(Session::class);
+
+        $this->assertFalse($session->hasWarnings());
+
+        $session->addWarning('warning');
+
+        $this->assertTrue($session->hasWarnings());
+    }
 }

From 6181c8331f67bf6ad49ae3562a377d3e17395a73 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 18:45:06 +0000
Subject: [PATCH 498/768] Apply fixes from StyleCI

---
 packages/framework/src/Framework/Features/Session/Session.php | 1 +
 packages/framework/src/Support/Models/File.php                | 4 ++--
 packages/framework/tests/Framework/Feature/SessionTest.php    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 8ec5d2d8067..cb72d8fd300 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -9,6 +9,7 @@
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
  * It's bound into the service container as a singleton and is not persisted.
+ *
  * @example app(Session::class)->addWarning('warning');
  */
 class Session
diff --git a/packages/framework/src/Support/Models/File.php b/packages/framework/src/Support/Models/File.php
index 5163706d4d2..727ec58396b 100644
--- a/packages/framework/src/Support/Models/File.php
+++ b/packages/framework/src/Support/Models/File.php
@@ -34,8 +34,8 @@ class File implements Arrayable, JsonSerializable, Stringable
     public ?string $belongsTo = null;
 
     /**
-     * @param string $path The path relative to the project root.
-     * @param class-string<\Hyde\Pages\Concerns\HydePage>|null $belongsToClass
+     * @param  string  $path  The path relative to the project root.
+     * @param  class-string<\Hyde\Pages\Concerns\HydePage>|null  $belongsToClass
      * @return \Hyde\Support\Models\File
      */
     public static function make(string $path, ?string $belongsToClass = null): static
diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index efa06ec5eb6..e8463600d69 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Framework\Testing\Framework\Feature;
 
+use function app;
 use Hyde\Framework\Features\Session\Session;
 use Hyde\Testing\TestCase;
-use function app;
 
 /**
  * @covers \Hyde\Framework\Features\Session\Session

From 87a9b42e544ab55cedd9444fdb61a4d5d7bec8c9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 20:48:02 +0200
Subject: [PATCH 499/768] Inline variable

---
 packages/framework/tests/Framework/Feature/SessionTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index e8463600d69..a8de95fbff2 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -22,11 +22,9 @@ public function test_session_is_bound_to_service_container_as_singleton()
 
     public function test_session_can_add_warning()
     {
-        $session = app(Session::class);
-
-        $session->addWarning('warning');
+        app(Session::class)->addWarning('warning');
 
-        $this->assertSame(['warning'], $session->getWarnings());
+        $this->assertSame(['warning'], app(Session::class)->getWarnings());
     }
 
     public function test_session_is_not_persisted()

From 305fd3b8a1aafeaf295d2568947fe70d517cf134 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:04:31 +0200
Subject: [PATCH 500/768] Move class namespace

---
 .../FindsContentLengthForImageObject.php                  | 3 ++-
 .../Framework/Features/Blogging/Models/FeaturedImage.php  | 8 ++++----
 .../Feature/FindsContentLengthForImageObjectTest.php      | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename packages/framework/src/Framework/Actions/{Constructors => }/FindsContentLengthForImageObject.php (96%)

diff --git a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
similarity index 96%
rename from packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
rename to packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 9dc95f9e95a..f85b6bb6f44 100644
--- a/packages/framework/src/Framework/Actions/Constructors/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Hyde\Framework\Actions\Constructors;
+namespace Hyde\Framework\Actions;
 
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use function Hyde\Framework\Actions\Constructors\str_starts_with;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 3607dbaf4b9..544ddc5f52c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,14 +5,14 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
-use function basename;
-use function e;
-use Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject;
+use Hyde\Framework\Actions\FindsContentLengthForImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Illuminate\Support\HtmlString;
-use function implode;
 use Stringable;
+use function basename;
+use function e;
+use function implode;
 
 /**
  * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index 1c5ccfc4810..bd8f52d9ead 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\Http;
 
 /**
- * @covers \Hyde\Framework\Actions\Constructors\FindsContentLengthForImageObject
+ * @covers \Hyde\Framework\Actions\FindsContentLengthForImageObject
  */
 class FindsContentLengthForImageObjectTest extends TestCase
 {

From ae910364a0b2e1708fce34311dcf9e6785cd0e45 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:04:54 +0200
Subject: [PATCH 501/768] Fix use function statement

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

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index f85b6bb6f44..171774255d8 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
 use Symfony\Component\Console\Output\OutputInterface;
-use function Hyde\Framework\Actions\Constructors\str_starts_with;
+use function str_starts_with;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest

From 2e673def4469a7e692456891387c9b3a81af87e0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:12:18 +0200
Subject: [PATCH 502/768] Merge multiple method calls into concatenation

---
 .../Actions/FindsContentLengthForImageObject.php       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 171774255d8..2fd4369da89 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -61,9 +61,9 @@ protected function fetchRemoteImageInformation(): int
             return (int) key(array_flip($headers['Content-Length']));
         }
 
-        $this->write(' > <comment>Warning:</comment> Could not find content length in headers for '.basename($this->image->getSource().'!'));
-        $this->write('           <fg=gray> Using default content length of 0. '.'</>');
-        $this->write('           <fg=gray> Is the image path valid? '.($this->image->getSource()).'</>');
+        $this->write(' > <comment>Warning:</comment> Could not find content length in headers for '.basename($this->image->getSource().'!')
+        .PHP_EOL.'           <fg=gray> Using default content length of 0. '.'</>'
+        .PHP_EOL.'           <fg=gray> Is the image path valid? '.($this->image->getSource()).'</>');
 
         return 0;
     }
@@ -73,8 +73,8 @@ protected function fetchLocalImageInformation(): int
         $path = Hyde::path('_media/'.$this->image->getSource());
 
         if (! file_exists($path)) {
-            $this->write(' > <comment>Warning:</comment> Could not find image file at '.$path.'!');
-            $this->write('         <fg=gray>   Using default content length of 0. '.'</>');
+            $this->write(' > <comment>Warning:</comment> Could not find image file at '.$path.'!'
+            .PHP_EOL.'         <fg=gray>   Using default content length of 0. '.'</>');
 
             return 0;
         }

From 47a5de054ef84d4a399035c00187129c67fd1823 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:12:57 +0200
Subject: [PATCH 503/768] First output message needs newline

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

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 2fd4369da89..e772064d156 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -49,7 +49,7 @@ protected function isImageStoredRemotely(): bool
 
     protected function fetchRemoteImageInformation(): int
     {
-        $this->write('<fg=gray> ></> <fg=gray>Fetching remote image information for '.basename($this->image->getSource()).'...</>');
+        $this->write(PHP_EOL.'<fg=gray> ></> <fg=gray>Fetching remote image information for '.basename($this->image->getSource()).'...</>');
 
         $response = Http::withHeaders([
             'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),

From 02bae6e33b867a39163d40a04054e19e8b1b06cc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:16:55 +0200
Subject: [PATCH 504/768] Allow arbitrary data to be set in the session

---
 .../Framework/Features/Session/Session.php    | 19 +++++++++++++++++++
 .../tests/Framework/Feature/SessionTest.php   | 10 ++++++++++
 2 files changed, 29 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index cb72d8fd300..637a6113944 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Features\Session;
 
+use function array_key_exists;
+
 /**
  * Adds a simple session handler, arguably most useful to defer messages, for example,
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
@@ -14,8 +16,25 @@
  */
 class Session
 {
+    protected array $session = [];
+
     protected array $warnings = [];
 
+    public function put(string $key, mixed $value): void
+    {
+        $this->session[$key] = $value;
+    }
+
+    public function get(string $key): mixed
+    {
+        return $this->session[$key] ?? null;
+    }
+
+    public function has(string $key): bool
+    {
+        return array_key_exists($key, $this->session);
+    }
+
     public function addWarning(string $warning): void
     {
         $this->warnings[] = $warning;
diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index a8de95fbff2..2249631c28d 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -20,6 +20,16 @@ public function test_session_is_bound_to_service_container_as_singleton()
         $this->assertSame(app(Session::class), $this->app->make(Session::class));
     }
 
+    public function test_it_can_store_and_retrieve_data()
+    {
+        $this->assertFalse(app(Session::class)->has('foo'));
+
+        app(Session::class)->put('foo', 'bar');
+
+        $this->assertTrue(app(Session::class)->has('foo'));
+        $this->assertEquals('bar', app(Session::class)->get('foo'));
+    }
+
     public function test_session_can_add_warning()
     {
         app(Session::class)->addWarning('warning');

From 7ae0733238a431c45ba98aa2410663a816eb627e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:19:06 +0200
Subject: [PATCH 505/768] Retrieve output from session

---
 .../Actions/FindsContentLengthForImageObject.php    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index e772064d156..40cca2f0715 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Actions;
 
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Session\Session;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
 use Symfony\Component\Console\Output\ConsoleOutput;
@@ -24,13 +25,17 @@ class FindsContentLengthForImageObject
     /**
      * Testing adding console debug output.
      */
-    protected OutputInterface $output;
+    protected OutputInterface|false $output;
 
     public function __construct(FeaturedImage $image)
     {
         $this->image = $image;
 
-        $this->output = new ConsoleOutput();
+        if (app(Session::class)->has('output')) {
+            $this->output = app(Session::class)->get('output');
+        } else {
+            $this->output = false;
+        }
     }
 
     public function execute(): int
@@ -84,6 +89,8 @@ protected function fetchLocalImageInformation(): int
 
     protected function write(string $string): void
     {
-        $this->output->writeln($string);
+        if ($this->output !== false) {
+            $this->output->writeln($string);
+        }
     }
 }

From aa9cccc1ec1a6afe2fe6f53d48ac85ca5e19582d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:19:21 +0200
Subject: [PATCH 506/768] Set default value to false

---
 .../Framework/Actions/FindsContentLengthForImageObject.php    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 40cca2f0715..62ccfe549fd 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -25,7 +25,7 @@ class FindsContentLengthForImageObject
     /**
      * Testing adding console debug output.
      */
-    protected OutputInterface|false $output;
+    protected OutputInterface|false $output = false;
 
     public function __construct(FeaturedImage $image)
     {
@@ -33,8 +33,6 @@ public function __construct(FeaturedImage $image)
 
         if (app(Session::class)->has('output')) {
             $this->output = app(Session::class)->get('output');
-        } else {
-            $this->output = false;
         }
     }
 

From 121335b384e01fb63a106e969afc24f3b074ca0e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:20:50 +0200
Subject: [PATCH 507/768] Add helper to forget session data

---
 .../framework/src/Framework/Features/Session/Session.php | 5 +++++
 .../framework/tests/Framework/Feature/SessionTest.php    | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 637a6113944..334d3e3c5a4 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -35,6 +35,11 @@ public function has(string $key): bool
         return array_key_exists($key, $this->session);
     }
 
+    public function forget(string $key): void
+    {
+        unset($this->session[$key]);
+    }
+
     public function addWarning(string $warning): void
     {
         $this->warnings[] = $warning;
diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 2249631c28d..417b500971f 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -30,6 +30,15 @@ public function test_it_can_store_and_retrieve_data()
         $this->assertEquals('bar', app(Session::class)->get('foo'));
     }
 
+    public function test_it_can_forget_data()
+    {
+        app(Session::class)->put('foo', 'bar');
+        $this->assertTrue(app(Session::class)->has('foo'));
+
+        app(Session::class)->forget('foo');
+        $this->assertFalse(app(Session::class)->has('foo'));
+    }
+
     public function test_session_can_add_warning()
     {
         app(Session::class)->addWarning('warning');

From 5e309d600f6090c03a44590114aa475b4a1a6166 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:21:02 +0200
Subject: [PATCH 508/768] Update test method names

---
 packages/framework/tests/Framework/Feature/SessionTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 417b500971f..d28803d3a51 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -20,7 +20,7 @@ public function test_session_is_bound_to_service_container_as_singleton()
         $this->assertSame(app(Session::class), $this->app->make(Session::class));
     }
 
-    public function test_it_can_store_and_retrieve_data()
+    public function test_session_can_store_and_retrieve_data()
     {
         $this->assertFalse(app(Session::class)->has('foo'));
 
@@ -30,7 +30,7 @@ public function test_it_can_store_and_retrieve_data()
         $this->assertEquals('bar', app(Session::class)->get('foo'));
     }
 
-    public function test_it_can_forget_data()
+    public function test_session_can_forget_data()
     {
         app(Session::class)->put('foo', 'bar');
         $this->assertTrue(app(Session::class)->has('foo'));

From 587757a74ddc0e8dcc484b548066a8c7cdbb4ec2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:29:34 +0200
Subject: [PATCH 509/768] Set the console output in session so it can be used
 by actions

---
 .../framework/src/Console/Commands/BuildSiteCommand.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 403ff4c6cf2..491e2a63727 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -8,12 +8,14 @@
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap;
+use Hyde\Framework\Features\Session\Session;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use LaravelZero\Framework\Commands\Command;
+use function app;
 
 /**
  * Hyde Command to run the Build Process.
@@ -95,11 +97,15 @@ public function runPostBuildActions(): void
             $this->runNodeCommand('npm run prod', 'Building frontend assets for production!');
         }
 
+        app(Session::class)->put('console-output', $this->output);
+
         $service->runIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $service->runIf(GenerateRssFeed::class, $this->canGenerateFeed());
         $service->runIf(GenerateSearch::class, $this->canGenerateSearch());
 
         $service->runPostBuildTasks();
+
+        app(Session::class)->forget('console-output');
     }
 
     protected function printFinishMessage(float $time_start): void

From 4087642f36eac1312f8113520f591d1daa42e448 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:29:38 +0200
Subject: [PATCH 510/768] Revert "Set the console output in session so it can
 be used by actions"

This reverts commit 587757a74ddc0e8dcc484b548066a8c7cdbb4ec2.
---
 .../framework/src/Console/Commands/BuildSiteCommand.php     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 491e2a63727..403ff4c6cf2 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -8,14 +8,12 @@
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Features\BuildTasks\PostBuildTasks\GenerateSitemap;
-use Hyde\Framework\Features\Session\Session;
 use Hyde\Framework\Services\BuildService;
 use Hyde\Framework\Services\BuildTaskService;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Config;
 use LaravelZero\Framework\Commands\Command;
-use function app;
 
 /**
  * Hyde Command to run the Build Process.
@@ -97,15 +95,11 @@ public function runPostBuildActions(): void
             $this->runNodeCommand('npm run prod', 'Building frontend assets for production!');
         }
 
-        app(Session::class)->put('console-output', $this->output);
-
         $service->runIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $service->runIf(GenerateRssFeed::class, $this->canGenerateFeed());
         $service->runIf(GenerateSearch::class, $this->canGenerateSearch());
 
         $service->runPostBuildTasks();
-
-        app(Session::class)->forget('console-output');
     }
 
     protected function printFinishMessage(float $time_start): void

From d02d1e5b52c84cd10685b8f03d37b2b66b00bb2a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:31:24 +0200
Subject: [PATCH 511/768] Put warnings in session

---
 .../Actions/FindsContentLengthForImageObject.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 62ccfe549fd..2f853499645 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -14,26 +14,14 @@
 
 /**
  * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
- *
- * @todo Refactor output to buffer into the service container, so output can be controlled better,
- *       for example by grouping all warnings at the end of a build (with options to fail on warning, useful for CI setups).
  */
 class FindsContentLengthForImageObject
 {
     protected FeaturedImage $image;
 
-    /**
-     * Testing adding console debug output.
-     */
-    protected OutputInterface|false $output = false;
-
     public function __construct(FeaturedImage $image)
     {
         $this->image = $image;
-
-        if (app(Session::class)->has('output')) {
-            $this->output = app(Session::class)->get('output');
-        }
     }
 
     public function execute(): int
@@ -87,8 +75,6 @@ protected function fetchLocalImageInformation(): int
 
     protected function write(string $string): void
     {
-        if ($this->output !== false) {
-            $this->output->writeln($string);
-        }
+        app(Session::class)->addWarning($string);
     }
 }

From c8aa6f723eda8e25640b28697ae268a3a8bf1550 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 21:54:12 +0200
Subject: [PATCH 512/768] Aggressively simplify action

---
 .../FindsContentLengthForImageObject.php      | 56 +++++++++----------
 .../FindsContentLengthForImageObjectTest.php  | 16 ++++++
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
index 2f853499645..424c00c1d21 100644
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
@@ -5,12 +5,15 @@
 namespace Hyde\Framework\Actions;
 
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Hyde\Framework\Features\Session\Session;
 use Hyde\Hyde;
 use Illuminate\Support\Facades\Http;
-use Symfony\Component\Console\Output\ConsoleOutput;
-use Symfony\Component\Console\Output\OutputInterface;
-use function str_starts_with;
+use RuntimeException;
+use function array_flip;
+use function array_key_exists;
+use function config;
+use function file_exists;
+use function filesize;
+use function key;
 
 /**
  * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
@@ -18,19 +21,20 @@
 class FindsContentLengthForImageObject
 {
     protected FeaturedImage $image;
+    protected bool $shouldThrow;
 
     public function __construct(FeaturedImage $image)
     {
         $this->image = $image;
+
+        $this->shouldThrow = config('hyde.throw_on_missing_image', false);
     }
 
     public function execute(): int
     {
-        if ($this->isImageStoredRemotely()) {
-            return $this->fetchRemoteImageInformation();
-        }
-
-        return $this->fetchLocalImageInformation();
+        return $this->isImageStoredRemotely()
+            ? $this->fetchRemoteImageInformation()
+            : $this->fetchLocalImageInformation();
     }
 
     protected function isImageStoredRemotely(): bool
@@ -40,41 +44,35 @@ protected function isImageStoredRemotely(): bool
 
     protected function fetchRemoteImageInformation(): int
     {
-        $this->write(PHP_EOL.'<fg=gray> ></> <fg=gray>Fetching remote image information for '.basename($this->image->getSource()).'...</>');
-
-        $response = Http::withHeaders([
+        $headers = Http::withHeaders([
             'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
-        ])->head($this->image->getSource());
-
-        $headers = $response->headers();
+        ])->head($this->image->getSource())->headers();
 
         if (array_key_exists('Content-Length', $headers)) {
             return (int) key(array_flip($headers['Content-Length']));
         }
 
-        $this->write(' > <comment>Warning:</comment> Could not find content length in headers for '.basename($this->image->getSource().'!')
-        .PHP_EOL.'           <fg=gray> Using default content length of 0. '.'</>'
-        .PHP_EOL.'           <fg=gray> Is the image path valid? '.($this->image->getSource()).'</>');
-
-        return 0;
+        return $this->handleFailure('remote');
     }
 
     protected function fetchLocalImageInformation(): int
     {
-        $path = Hyde::path('_media/'.$this->image->getSource());
-
-        if (! file_exists($path)) {
-            $this->write(' > <comment>Warning:</comment> Could not find image file at '.$path.'!'
-            .PHP_EOL.'         <fg=gray>   Using default content length of 0. '.'</>');
+        return file_exists($this->getLocalPath())
+            ? filesize($this->getLocalPath())
+            : $this->handleFailure('local');
+    }
 
-            return 0;
+    protected function handleFailure(string $location): int
+    {
+        if ($this->shouldThrow) {
+            throw new RuntimeException("Could not find Content-Length header for $location image {$this->image->getSource()}");
         }
 
-        return filesize($path);
+        return 0;
     }
 
-    protected function write(string $string): void
+    protected function getLocalPath(): string
     {
-        app(Session::class)->addWarning($string);
+        return Hyde::path('_media/' . $this->image->getSource());
     }
 }
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index bd8f52d9ead..141f37f01f3 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -7,6 +7,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
+use RuntimeException;
 
 /**
  * @covers \Hyde\Framework\Actions\FindsContentLengthForImageObject
@@ -77,4 +78,19 @@ public function test_it_returns_0_if_remote_image_is_missing()
             0, $image->getContentLength()
         );
     }
+
+    public function test_it_throws_exception_on_fail_if_configured()
+    {
+        config(['hyde.throw_on_missing_image' => true]);
+
+        Http::fake(function () {
+            return Http::response(null, 404);
+        });
+
+        $this->expectException(RuntimeException::class);
+
+        $image = new FeaturedImage();
+        $image->url = 'https://hyde.test/static/image.png';
+        $image->getContentLength();
+    }
 }

From a875b946b089645fd02679d6f4f6c59925024b72 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:01:40 +0200
Subject: [PATCH 513/768] Aggressively simplify action even more

Since we don't validate if other links are valid, why should we here?
---
 .../FindsContentLengthForImageObject.php      | 78 -------------------
 ...FindsContentLengthForRemoteImageObject.php | 39 ++++++++++
 .../Blogging/Models/FeaturedImage.php         |  4 +-
 .../FindsContentLengthForImageObjectTest.php  |  2 +-
 4 files changed, 42 insertions(+), 81 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
 create mode 100644 packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
deleted file mode 100644
index 424c00c1d21..00000000000
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForImageObject.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions;
-
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Hyde\Hyde;
-use Illuminate\Support\Facades\Http;
-use RuntimeException;
-use function array_flip;
-use function array_key_exists;
-use function config;
-use function file_exists;
-use function filesize;
-use function key;
-
-/**
- * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
- */
-class FindsContentLengthForImageObject
-{
-    protected FeaturedImage $image;
-    protected bool $shouldThrow;
-
-    public function __construct(FeaturedImage $image)
-    {
-        $this->image = $image;
-
-        $this->shouldThrow = config('hyde.throw_on_missing_image', false);
-    }
-
-    public function execute(): int
-    {
-        return $this->isImageStoredRemotely()
-            ? $this->fetchRemoteImageInformation()
-            : $this->fetchLocalImageInformation();
-    }
-
-    protected function isImageStoredRemotely(): bool
-    {
-        return str_starts_with($this->image->getSource(), 'http');
-    }
-
-    protected function fetchRemoteImageInformation(): int
-    {
-        $headers = Http::withHeaders([
-            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
-        ])->head($this->image->getSource())->headers();
-
-        if (array_key_exists('Content-Length', $headers)) {
-            return (int) key(array_flip($headers['Content-Length']));
-        }
-
-        return $this->handleFailure('remote');
-    }
-
-    protected function fetchLocalImageInformation(): int
-    {
-        return file_exists($this->getLocalPath())
-            ? filesize($this->getLocalPath())
-            : $this->handleFailure('local');
-    }
-
-    protected function handleFailure(string $location): int
-    {
-        if ($this->shouldThrow) {
-            throw new RuntimeException("Could not find Content-Length header for $location image {$this->image->getSource()}");
-        }
-
-        return 0;
-    }
-
-    protected function getLocalPath(): string
-    {
-        return Hyde::path('_media/' . $this->image->getSource());
-    }
-}
diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php
new file mode 100644
index 00000000000..796146685d2
--- /dev/null
+++ b/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Actions;
+
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Illuminate\Support\Facades\Http;
+use RuntimeException;
+use function array_flip;
+use function array_key_exists;
+use function config;
+use function key;
+
+/**
+ * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
+ */
+class FindsContentLengthForRemoteImageObject
+{
+    protected FeaturedImage $image;
+
+    public function __construct(FeaturedImage $image)
+    {
+        $this->image = $image;
+    }
+
+    public function execute(): int
+    {
+        $headers = Http::withHeaders([
+            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
+        ])->head($this->image->getSource())->headers();
+
+        if (array_key_exists('Content-Length', $headers)) {
+            return (int) key(array_flip($headers['Content-Length']));
+        }
+
+        throw new RuntimeException('Could not find Content-Length header for ' . $this->image->getSource());
+    }
+}
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 544ddc5f52c..2af814fffe9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
-use Hyde\Framework\Actions\FindsContentLengthForImageObject;
+use Hyde\Framework\Actions\FindsContentLengthForRemoteImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Illuminate\Support\HtmlString;
@@ -148,7 +148,7 @@ public function getLink(): string
 
     public function getContentLength(): int
     {
-        return (new FindsContentLengthForImageObject($this))->execute();
+        return (new FindsContentLengthForRemoteImageObject($this))->execute();
     }
 
     public function getFluentAttribution(): HtmlString
diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
index 141f37f01f3..e830669ec3e 100644
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
@@ -10,7 +10,7 @@
 use RuntimeException;
 
 /**
- * @covers \Hyde\Framework\Actions\FindsContentLengthForImageObject
+ * @covers \Hyde\Framework\Actions\FindsContentLengthForRemoteImageObject
  */
 class FindsContentLengthForImageObjectTest extends TestCase
 {

From 55529e7760d5c2ffe78250dfc99badbcd4fd52b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:06:47 +0200
Subject: [PATCH 514/768] Inline action FindsContentLengthForRemoteImageObject

---
 ...FindsContentLengthForRemoteImageObject.php | 39 -------------
 .../Blogging/Models/FeaturedImage.php         | 32 +++++++++-
 .../tests/Feature/FeaturedImageModelTest.php  | 58 +++++++++++++++++++
 3 files changed, 89 insertions(+), 40 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php

diff --git a/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php b/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php
deleted file mode 100644
index 796146685d2..00000000000
--- a/packages/framework/src/Framework/Actions/FindsContentLengthForRemoteImageObject.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions;
-
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Illuminate\Support\Facades\Http;
-use RuntimeException;
-use function array_flip;
-use function array_key_exists;
-use function config;
-use function key;
-
-/**
- * @see \Hyde\Framework\Testing\Feature\FindsContentLengthForImageObjectTest
- */
-class FindsContentLengthForRemoteImageObject
-{
-    protected FeaturedImage $image;
-
-    public function __construct(FeaturedImage $image)
-    {
-        $this->image = $image;
-    }
-
-    public function execute(): int
-    {
-        $headers = Http::withHeaders([
-            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
-        ])->head($this->image->getSource())->headers();
-
-        if (array_key_exists('Content-Length', $headers)) {
-            return (int) key(array_flip($headers['Content-Length']));
-        }
-
-        throw new RuntimeException('Could not find Content-Length header for ' . $this->image->getSource());
-    }
-}
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 2af814fffe9..48a85810e09 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,11 +8,17 @@
 use Hyde\Framework\Actions\FindsContentLengthForRemoteImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\HtmlString;
 use Stringable;
+use function array_flip;
+use function array_key_exists;
 use function basename;
+use function config;
 use function e;
+use function file_exists;
 use function implode;
+use function key;
 
 /**
  * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
@@ -148,7 +154,9 @@ public function getLink(): string
 
     public function getContentLength(): int
     {
-        return (new FindsContentLengthForRemoteImageObject($this))->execute();
+        return (str_starts_with($this->getSource(), 'http')
+            ? $this->getContentLengthFromRemote()
+            : $this->getLocalContentLength()) ?? 0;
     }
 
     public function getFluentAttribution(): HtmlString
@@ -252,4 +260,26 @@ protected function getPath(): ?string
 
         return null;
     }
+
+    protected function getContentLengthFromRemote(): ?int
+    {
+        $headers = Http::withHeaders([
+            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
+        ])->head($this->getSource())->headers();
+
+        if (array_key_exists('Content-Length', $headers)) {
+            return (int) key(array_flip($headers['Content-Length']));
+        }
+
+        return null;
+    }
+
+    private function getLocalContentLength(): ?int
+    {
+        if (file_exists($this->getPath())) {
+            return filesize($this->getPath());
+        }
+
+        return null;
+    }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 99be8510e9f..126a90eeb22 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -8,7 +8,10 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Http;
+use function file_put_contents;
 use function strip_tags;
+use function unlink;
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
@@ -390,6 +393,61 @@ public function test_the_view()
         $this->assertEquals('Image by John Doe. License Creative Commons.', $this->stripHtml($component));
     }
 
+
+    public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
+    {
+        $image = new FeaturedImage();
+        $image->path = '_media/image.jpg';
+        file_put_contents($image->path, '16bytelongstring');
+
+        $this->assertEquals(
+            16, $image->getContentLength()
+        );
+
+        unlink($image->path);
+    }
+
+    public function test_it_can_find_the_content_length_for_a_remote_image()
+    {
+        Http::fake(function () {
+            return Http::response(null, 200, [
+                'Content-Length' => 16,
+            ]);
+        });
+
+        $image = new FeaturedImage();
+        $image->url = 'https://hyde.test/static/image.png';
+
+        $this->assertEquals(
+            16, $image->getContentLength()
+        );
+    }
+
+    public function test_it_returns_0_if_local_image_is_missing()
+    {
+        $image = new FeaturedImage();
+        $image->path = '_media/image.jpg';
+
+        $this->assertEquals(
+            0, $image->getContentLength()
+        );
+    }
+
+    public function test_it_returns_0_if_remote_image_is_missing()
+    {
+        Http::fake(function () {
+            return Http::response(null, 404);
+        });
+
+        $image = new FeaturedImage();
+        $image->url = 'https://hyde.test/static/image.png';
+
+        $this->assertEquals(
+            0, $image->getContentLength()
+        );
+    }
+
+
     protected function stripHtml(string $string): string
     {
         return trim(strip_newlines(strip_tags($string)), "\t ");

From 07e8aa5ece5a06469bedb23cc62cbd4c138bc46e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:07:05 +0200
Subject: [PATCH 515/768] Method getPath must not return basename

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 48a85810e09..717b2c82861 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -255,7 +255,7 @@ protected function getAuthorElement(): string
     protected function getPath(): ?string
     {
         if (isset($this->path)) {
-            return basename($this->path);
+            return ($this->path);
         }
 
         return null;

From b40c2f7b29cc3ccff41ad7d9b2863239e2f81e07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:07:40 +0200
Subject: [PATCH 516/768] Simplify if with ??

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 717b2c82861..b70734bac44 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -254,11 +254,7 @@ protected function getAuthorElement(): string
 
     protected function getPath(): ?string
     {
-        if (isset($this->path)) {
-            return ($this->path);
-        }
-
-        return null;
+        return $this->path ?? null;
     }
 
     protected function getContentLengthFromRemote(): ?int

From f0910538c837c367e972fba23fed788333cb3768 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:07:52 +0200
Subject: [PATCH 517/768] Change private to protected

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index b70734bac44..501d55af4ee 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -270,7 +270,7 @@ protected function getContentLengthFromRemote(): ?int
         return null;
     }
 
-    private function getLocalContentLength(): ?int
+    protected function getLocalContentLength(): ?int
     {
         if (file_exists($this->getPath())) {
             return filesize($this->getPath());

From 6efef4c9cec569e21f07122dcebf6ef235d30f88 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:08:03 +0200
Subject: [PATCH 518/768] Remove unused import

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 501d55af4ee..4cf184e63bd 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,7 +5,6 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use BadMethodCallException;
-use Hyde\Framework\Actions\FindsContentLengthForRemoteImageObject;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Illuminate\Support\Facades\Http;

From 9e0432e9e7b842e6679d417c14c6adbbecc85533 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:08:38 +0200
Subject: [PATCH 519/768] Delete FindsContentLengthForImageObjectTest.php

---
 .../FindsContentLengthForImageObjectTest.php  | 96 -------------------
 1 file changed, 96 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php

diff --git a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php b/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
deleted file mode 100644
index e830669ec3e..00000000000
--- a/packages/framework/tests/Feature/FindsContentLengthForImageObjectTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Facades\Http;
-use RuntimeException;
-
-/**
- * @covers \Hyde\Framework\Actions\FindsContentLengthForRemoteImageObject
- */
-class FindsContentLengthForImageObjectTest extends TestCase
-{
-    /**
-     * Unit test for the shorthand. Logic is tested in the rest of the case.
-     *
-     * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage::getContentLength
-     */
-    public function test_image_helper_shorthand_returns_content_length()
-    {
-        $this->assertIsInt(
-            (new FeaturedImage(['path' => 'foo']))->getContentLength()
-        );
-    }
-
-    public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
-    {
-        $image = new FeaturedImage();
-        $image->path = '_media/image.jpg';
-        file_put_contents($image->path, '16bytelongstring');
-
-        $this->assertEquals(
-            16, $image->getContentLength()
-        );
-
-        unlink($image->path);
-    }
-
-    public function test_it_can_find_the_content_length_for_a_remote_image()
-    {
-        Http::fake(function () {
-            return Http::response(null, 200, [
-                'Content-Length' => 16,
-            ]);
-        });
-
-        $image = new FeaturedImage();
-        $image->url = 'https://hyde.test/static/image.png';
-
-        $this->assertEquals(
-            16, $image->getContentLength()
-        );
-    }
-
-    public function test_it_returns_0_if_local_image_is_missing()
-    {
-        $image = new FeaturedImage();
-        $image->path = '_media/image.jpg';
-
-        $this->assertEquals(
-            0, $image->getContentLength()
-        );
-    }
-
-    public function test_it_returns_0_if_remote_image_is_missing()
-    {
-        Http::fake(function () {
-            return Http::response(null, 404);
-        });
-
-        $image = new FeaturedImage();
-        $image->url = 'https://hyde.test/static/image.png';
-
-        $this->assertEquals(
-            0, $image->getContentLength()
-        );
-    }
-
-    public function test_it_throws_exception_on_fail_if_configured()
-    {
-        config(['hyde.throw_on_missing_image' => true]);
-
-        Http::fake(function () {
-            return Http::response(null, 404);
-        });
-
-        $this->expectException(RuntimeException::class);
-
-        $image = new FeaturedImage();
-        $image->url = 'https://hyde.test/static/image.png';
-        $image->getContentLength();
-    }
-}

From ff1d89b5911fa253dea0faf9b435d897a621fb2e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 20:08:55 +0000
Subject: [PATCH 520/768] Apply fixes from StyleCI

---
 .../Features/Blogging/Models/FeaturedImage.php       | 12 ++++++------
 .../tests/Feature/FeaturedImageModelTest.php         |  4 +---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 4cf184e63bd..d64300a6ec8 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,20 +4,20 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use BadMethodCallException;
-use Hyde\Hyde;
-use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\HtmlString;
-use Stringable;
 use function array_flip;
 use function array_key_exists;
+use BadMethodCallException;
 use function basename;
 use function config;
 use function e;
 use function file_exists;
+use Hyde\Hyde;
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\HtmlString;
 use function implode;
 use function key;
+use Stringable;
 
 /**
  * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 126a90eeb22..79ac013cb71 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -5,11 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use BadMethodCallException;
+use function file_put_contents;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
-use function file_put_contents;
 use function strip_tags;
 use function unlink;
 
@@ -393,7 +393,6 @@ public function test_the_view()
         $this->assertEquals('Image by John Doe. License Creative Commons.', $this->stripHtml($component));
     }
 
-
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
     {
         $image = new FeaturedImage();
@@ -447,7 +446,6 @@ public function test_it_returns_0_if_remote_image_is_missing()
         );
     }
 
-
     protected function stripHtml(string $string): string
     {
         return trim(strip_newlines(strip_tags($string)), "\t ");

From d5edccceaae19ff95bd37582c0c6f77d29f1446f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:23:51 +0200
Subject: [PATCH 521/768] Force internal image path property to always begin
 with _media/

---
 .../Features/Blogging/Models/FeaturedImage.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index d64300a6ec8..b26e2f6ab34 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -41,8 +41,13 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
 {
     /**
      * The image's path if it's stored locally.
+     * The image must be stored in the _media directory.
+     *
+     * It no longer matters if you add the _media/ prefix or not,
+     * as it will be normalized to always begin with _media/.
      *
      * @example image.jpg.
+     * @example _media/image.jpg.
      */
     public ?string $path;
 
@@ -114,7 +119,7 @@ public function __construct(array $data = [])
         }
 
         if (isset($this->path)) {
-            $this->path = basename($this->path);
+            $this->path = static::normalizePath($this->path);
         }
     }
 
@@ -277,4 +282,15 @@ protected function getLocalContentLength(): ?int
 
         return null;
     }
+
+    protected static function normalizePath(string $path): string
+    {
+        $path = Hyde::pathToRelative($path);
+
+        if (str_starts_with($path, '_media/')) {
+            return $path;
+        }
+
+        return '_media/'.$path;
+    }
 }

From 582f8d9088b802f4b38d8f36c659841ed7b11f66 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 20:24:59 +0000
Subject: [PATCH 522/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index b26e2f6ab34..32374ce4e64 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -7,7 +7,6 @@
 use function array_flip;
 use function array_key_exists;
 use BadMethodCallException;
-use function basename;
 use function config;
 use function e;
 use function file_exists;

From 41397e0d9cfea58413e807c82170d08fc257b093 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:26:15 +0200
Subject: [PATCH 523/768] Test normalizing

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 79ac013cb71..ee434689642 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -42,6 +42,15 @@ public function test_make_can_create_an_image_based_on_array()
         $this->assertEquals('bar', $image->title);
     }
 
+    public function test_image_path_is_normalized_to_always_begin_with_media_prefix()
+    {
+        $image = FeaturedImage::make('foo');
+        $this->assertEquals('_media/foo', $image->path);
+
+        $image = FeaturedImage::make('_media/foo');
+        $this->assertEquals('_media/foo', $image->path);
+    }
+
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()
     {
         $image = FeaturedImage::fromSource('https://example.com/image.jpg');

From 57551595dae3eb0d3e38f9a5ca83c931bbdc57e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:26:23 +0200
Subject: [PATCH 524/768] Assert same

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index ee434689642..7bdb50ca123 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -45,10 +45,10 @@ public function test_make_can_create_an_image_based_on_array()
     public function test_image_path_is_normalized_to_always_begin_with_media_prefix()
     {
         $image = FeaturedImage::make('foo');
-        $this->assertEquals('_media/foo', $image->path);
+        $this->assertSame('_media/foo', $image->path);
 
         $image = FeaturedImage::make('_media/foo');
-        $this->assertEquals('_media/foo', $image->path);
+        $this->assertSame('_media/foo', $image->path);
     }
 
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()

From e94af1671970d60cc84221caeb8580c773fc5ecd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:30:37 +0200
Subject: [PATCH 525/768] Expect normalized path

---
 .../tests/Feature/FeaturedImageModelTest.php       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 7bdb50ca123..4df9778e8f0 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -28,7 +28,7 @@ public function test_make_can_create_an_image_based_on_string()
     {
         $image = FeaturedImage::make('foo');
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo', $image->path);
+        $this->assertEquals('_media/foo', $image->path);
     }
 
     public function test_make_can_create_an_image_based_on_array()
@@ -38,7 +38,7 @@ public function test_make_can_create_an_image_based_on_array()
             'title' => 'bar',
         ]);
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo', $image->path);
+        $this->assertEquals('_media/foo', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 
@@ -59,7 +59,7 @@ public function test_from_source_automatically_assigns_proper_property_depending
 
         $image = FeaturedImage::fromSource('image.jpg');
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('image.jpg', $image->path);
+        $this->assertEquals('_media/image.jpg', $image->path);
     }
 
     public function test_array_data_can_be_used_to_initialize_properties_in_constructor()
@@ -73,7 +73,7 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
 
         $image = new FeaturedImage($data);
 
-        $this->assertEquals($data['path'], $image->path);
+        $this->assertEquals('_media/'.$data['path'], $image->path);
         $this->assertEquals($data['url'], $image->url);
         $this->assertEquals($data['description'], $image->description);
         $this->assertEquals($data['title'], $image->title);
@@ -339,15 +339,15 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()
 
     public function test_local_path_is_normalized_to_the_media_directory()
     {
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
             'path' => 'image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
             'path' => '_media/image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
             'path' => 'media/image.jpg',
         ]))->path);
     }

From 6b93514c3d72c22d6310bb0df797b8fafe0b8c68 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:31:18 +0200
Subject: [PATCH 526/768] Support media/file as input

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 4 ++++
 packages/framework/tests/Feature/FeaturedImageModelTest.php   | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 32374ce4e64..5ee1f1b033d 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -290,6 +290,10 @@ protected static function normalizePath(string $path): string
             return $path;
         }
 
+        if (str_starts_with($path, 'media/')) {
+            return '_'.$path;
+        }
+
         return '_media/'.$path;
     }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 4df9778e8f0..afea268f7a1 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -49,6 +49,9 @@ public function test_image_path_is_normalized_to_always_begin_with_media_prefix(
 
         $image = FeaturedImage::make('_media/foo');
         $this->assertSame('_media/foo', $image->path);
+
+        $image = FeaturedImage::make('_media/foo');
+        $this->assertSame('_media/foo', $image->path);
     }
 
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()

From c2e488e80c0bdb2183ea4453489aab2e77f55677 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:33:04 +0200
Subject: [PATCH 527/768] Move down method to group constructors

---
 .../Features/Blogging/Models/FeaturedImage.php       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 5ee1f1b033d..bdb2d196bea 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -122,12 +122,6 @@ public function __construct(array $data = [])
         }
     }
 
-    /** @inheritDoc */
-    public function __toString()
-    {
-        return $this->getLink();
-    }
-
     /** Dynamically create an image based on string or front matter array */
     public static function make(string|array $data): static
     {
@@ -145,6 +139,12 @@ public static function fromSource(string $image): static
             : new static(['path' => $image]);
     }
 
+    /** @inheritDoc */
+    public function __toString()
+    {
+        return $this->getLink();
+    }
+
     public function getSource(): string
     {
         return $this->url ?? $this->getPath() ?? throw new BadMethodCallException('Attempting to get source from Image that has no source.');

From d4f544f9f91991c94641f38d3501fe0cc91a6f25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:36:07 +0200
Subject: [PATCH 528/768] Expect normalized path

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

diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 9f032d005a9..e93f419a19b 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -88,7 +88,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->path);
+        $this->assertEquals('_media/foo.png', $image->path);
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_remote_path_when_matter_is_string()
@@ -104,7 +104,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->path);
+        $this->assertEquals('_media/foo.png', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 }

From 866cf16669129dfc85c798b28b191c3e370932b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:36:10 +0200
Subject: [PATCH 529/768] Revert "Expect normalized path"

This reverts commit d4f544f9f91991c94641f38d3501fe0cc91a6f25.
---
 packages/framework/tests/Feature/MarkdownPostTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index e93f419a19b..9f032d005a9 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -88,7 +88,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo.png', $image->path);
+        $this->assertEquals('foo.png', $image->path);
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_remote_path_when_matter_is_string()
@@ -104,7 +104,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo.png', $image->path);
+        $this->assertEquals('foo.png', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 }

From e009081f246a241d38e94a46079928713712a942 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:36:23 +0200
Subject: [PATCH 530/768] Revert "Expect normalized path"

This reverts commit e94af1671970d60cc84221caeb8580c773fc5ecd.
---
 .../tests/Feature/FeaturedImageModelTest.php       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index afea268f7a1..5a18905537b 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -28,7 +28,7 @@ public function test_make_can_create_an_image_based_on_string()
     {
         $image = FeaturedImage::make('foo');
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo', $image->path);
+        $this->assertEquals('foo', $image->path);
     }
 
     public function test_make_can_create_an_image_based_on_array()
@@ -38,7 +38,7 @@ public function test_make_can_create_an_image_based_on_array()
             'title' => 'bar',
         ]);
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo', $image->path);
+        $this->assertEquals('foo', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 
@@ -62,7 +62,7 @@ public function test_from_source_automatically_assigns_proper_property_depending
 
         $image = FeaturedImage::fromSource('image.jpg');
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/image.jpg', $image->path);
+        $this->assertEquals('image.jpg', $image->path);
     }
 
     public function test_array_data_can_be_used_to_initialize_properties_in_constructor()
@@ -76,7 +76,7 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
 
         $image = new FeaturedImage($data);
 
-        $this->assertEquals('_media/'.$data['path'], $image->path);
+        $this->assertEquals($data['path'], $image->path);
         $this->assertEquals($data['url'], $image->url);
         $this->assertEquals($data['description'], $image->description);
         $this->assertEquals($data['title'], $image->title);
@@ -342,15 +342,15 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()
 
     public function test_local_path_is_normalized_to_the_media_directory()
     {
-        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => 'image.jpg',
         ]))->path);
 
-        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => '_media/image.jpg',
         ]))->path);
 
-        $this->assertEquals('_media/image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new FeaturedImage([
             'path' => 'media/image.jpg',
         ]))->path);
     }

From 98c67d5a8c764d443e1ba00ff552d45d4be0784c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:41:56 +0200
Subject: [PATCH 531/768] Fix
 https://github.com/hydephp/develop/pull/617#issuecomment-1295441165

---
 .../Blogging/Models/FeaturedImage.php         | 21 +++++++++++++++----
 .../tests/Feature/FeaturedImageModelTest.php  | 20 ++++++++++++++----
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index bdb2d196bea..a384bb619c5 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use Illuminate\Support\Str;
 use function array_flip;
 use function array_key_exists;
 use BadMethodCallException;
@@ -43,10 +44,10 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      * The image must be stored in the _media directory.
      *
      * It no longer matters if you add the _media/ prefix or not,
-     * as it will be normalized to always begin with _media/.
+     * as it will be normalized to have the prefix stripped.
      *
      * @example image.jpg.
-     * @example _media/image.jpg.
+     * @example _media/image.jpg. (will be normalized to image.jpg)
      */
     public ?string $path;
 
@@ -111,6 +112,12 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
      */
     public ?string $attributionUrl = null;
 
+    /**
+     * @var string The path to the image in the _media directory, relative to the root of the site.
+     * @example "_media/image.jpg".
+     */
+    protected string $sourcePath;
+
     public function __construct(array $data = [])
     {
         foreach ($data as $key => $value) {
@@ -118,7 +125,8 @@ public function __construct(array $data = [])
         }
 
         if (isset($this->path)) {
-            $this->path = static::normalizePath($this->path);
+            $this->sourcePath = static::normalizeSourcePath($this->path);
+            $this->path = Str::after($this->sourcePath, '_media/');
         }
     }
 
@@ -260,6 +268,11 @@ protected function getPath(): ?string
         return $this->path ?? null;
     }
 
+    public function getSourcePath(): ?string
+    {
+        return $this->sourcePath ?? null;
+    }
+
     protected function getContentLengthFromRemote(): ?int
     {
         $headers = Http::withHeaders([
@@ -282,7 +295,7 @@ protected function getLocalContentLength(): ?int
         return null;
     }
 
-    protected static function normalizePath(string $path): string
+    protected static function normalizeSourcePath(string $path): string
     {
         $path = Hyde::pathToRelative($path);
 
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 5a18905537b..e639df2f79c 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -42,16 +42,28 @@ public function test_make_can_create_an_image_based_on_array()
         $this->assertEquals('bar', $image->title);
     }
 
-    public function test_image_path_is_normalized_to_always_begin_with_media_prefix()
+    public function test_image_path_is_normalized_to_never_begin_with_media_prefix()
     {
         $image = FeaturedImage::make('foo');
-        $this->assertSame('_media/foo', $image->path);
+        $this->assertSame('foo', $image->path);
 
         $image = FeaturedImage::make('_media/foo');
-        $this->assertSame('_media/foo', $image->path);
+        $this->assertSame('foo', $image->path);
 
         $image = FeaturedImage::make('_media/foo');
-        $this->assertSame('_media/foo', $image->path);
+        $this->assertSame('foo', $image->path);
+    }
+
+    public function test_image_source_path_is_normalized_to_always_begin_with_media_prefix()
+    {
+        $image = FeaturedImage::make('foo');
+        $this->assertSame('_media/foo', $image->getSourcePath());
+
+        $image = FeaturedImage::make('_media/foo');
+        $this->assertSame('_media/foo', $image->getSourcePath());
+
+        $image = FeaturedImage::make('_media/foo');
+        $this->assertSame('_media/foo', $image->getSourcePath());
     }
 
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()

From 9fe9a2cb17c7d0cf65e26b513168e1ffffdf1269 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:42:13 +0200
Subject: [PATCH 532/768] Make helper public

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index a384bb619c5..4b6c5ba7e4c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -263,7 +263,7 @@ protected function getAuthorElement(): string
             : $this->getAuthorSpan();
     }
 
-    protected function getPath(): ?string
+    public function getPath(): ?string
     {
         return $this->path ?? null;
     }

From 34e4b19c081a7f953e1bb9c5e64b52b072f764ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:42:42 +0200
Subject: [PATCH 533/768] Move up public methods

---
 .../Blogging/Models/FeaturedImage.php         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 4b6c5ba7e4c..e9c6feabc4c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -163,6 +163,16 @@ public function getLink(): string
         return Hyde::image($this->getSource());
     }
 
+    public function getPath(): ?string
+    {
+        return $this->path ?? null;
+    }
+
+    public function getSourcePath(): ?string
+    {
+        return $this->sourcePath ?? null;
+    }
+
     public function getContentLength(): int
     {
         return (str_starts_with($this->getSource(), 'http')
@@ -263,16 +273,6 @@ protected function getAuthorElement(): string
             : $this->getAuthorSpan();
     }
 
-    public function getPath(): ?string
-    {
-        return $this->path ?? null;
-    }
-
-    public function getSourcePath(): ?string
-    {
-        return $this->sourcePath ?? null;
-    }
-
     protected function getContentLengthFromRemote(): ?int
     {
         $headers = Http::withHeaders([

From 1eb8944bb7e0de09cb6296091cc3e5eab20f87c0 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Fri, 28 Oct 2022 20:43:59 +0000
Subject: [PATCH 534/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index e9c6feabc4c..3a268548d72 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use Illuminate\Support\Str;
 use function array_flip;
 use function array_key_exists;
 use BadMethodCallException;
@@ -15,6 +14,7 @@
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\HtmlString;
+use Illuminate\Support\Str;
 use function implode;
 use function key;
 use Stringable;
@@ -114,6 +114,7 @@ class FeaturedImage implements FeaturedImageSchema, Stringable
 
     /**
      * @var string The path to the image in the _media directory, relative to the root of the site.
+     *
      * @example "_media/image.jpg".
      */
     protected string $sourcePath;

From 6de4f9ee044520071ef0f685afe2ef4888b2bd28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 28 Oct 2022 22:46:56 +0200
Subject: [PATCH 535/768] Needs the real path

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 3a268548d72..f72d29bf6f2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -289,8 +289,8 @@ protected function getContentLengthFromRemote(): ?int
 
     protected function getLocalContentLength(): ?int
     {
-        if (file_exists($this->getPath())) {
-            return filesize($this->getPath());
+        if (file_exists(Hyde::path($this->getSourcePath()))) {
+            return filesize(Hyde::path($this->getSourcePath()));
         }
 
         return null;

From df2a5a7e9f0edcff7c373ad545f655b7ad94c4df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:12:51 +0200
Subject: [PATCH 536/768] Check file path is set

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index f72d29bf6f2..813b1c4208a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -289,7 +289,7 @@ protected function getContentLengthFromRemote(): ?int
 
     protected function getLocalContentLength(): ?int
     {
-        if (file_exists(Hyde::path($this->getSourcePath()))) {
+        if (isset($this->sourcePath) && file_exists(Hyde::path($this->getSourcePath()))) {
             return filesize(Hyde::path($this->getSourcePath()));
         }
 

From f253358e1f22e19ba7cffd819d86568992661ad7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:16:19 +0200
Subject: [PATCH 537/768] Update FeaturedImageModelTest.php

---
 .../framework/tests/Feature/FeaturedImageModelTest.php     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index e639df2f79c..328795d9193 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -419,15 +419,14 @@ public function test_the_view()
 
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
     {
-        $image = new FeaturedImage();
-        $image->path = '_media/image.jpg';
-        file_put_contents($image->path, '16bytelongstring');
+        $image = new FeaturedImage(['path' => 'image.jpg']);
+        file_put_contents($image->getSourcePath(), '16bytelongstring');
 
         $this->assertEquals(
             16, $image->getContentLength()
         );
 
-        unlink($image->path);
+        unlink($image->getSourcePath());
     }
 
     public function test_it_can_find_the_content_length_for_a_remote_image()

From d9f003ade5b1e82a99b2f2f2b59612bf42f0f968 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:24:39 +0200
Subject: [PATCH 538/768] Add page type annotation

---
 .../resources/views/components/post/image.blade.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index d4f9049baad..0558be6eef5 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -1,6 +1,7 @@
 @php
-/** @var \Hyde\Framework\Features\Blogging\Models\FeaturedImage $image */
-$image = $page->image;
+    /** @var \Hyde\Pages\MarkdownPost $page  */
+    /** @var \Hyde\Framework\Features\Blogging\Models\FeaturedImage $image  */
+    $image = $page->image;
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
     <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}" itemprop="image" class="mb-0">

From 32245a72ccc2e0a8a08e8f8ea3e32734ac370d21 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:50:31 +0200
Subject: [PATCH 539/768] Assert regardless of whitespace

---
 .../tests/Feature/FeaturedImageModelTest.php          | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 328795d9193..67fe8e92994 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -10,6 +10,7 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
+use function str_replace;
 use function strip_tags;
 use function unlink;
 
@@ -414,7 +415,10 @@ public function test_the_view()
         $this->assertStringContainsString('Creative Commons', $component);
         $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
 
-        $this->assertEquals('Image by John Doe. License Creative Commons.', $this->stripHtml($component));
+        $this->assertEquals(
+            $this->stripWhitespace('Image by John Doe. License Creative Commons.'),
+            $this->stripWhitespace($this->stripHtml($component))
+        );
     }
 
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
@@ -473,4 +477,9 @@ protected function stripHtml(string $string): string
     {
         return trim(strip_newlines(strip_tags($string)), "\t ");
     }
+
+    protected function stripWhitespace(string $string): string
+    {
+        return str_replace(' ', '', $string);
+    }
 }

From 480bdcfab92783571c74c57b828cae173f47937f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:50:58 +0200
Subject: [PATCH 540/768] Refactor FeaturedImage component to handle all HTML
 logic in the view

---
 .../views/components/post/image.blade.php     | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index 0558be6eef5..d93d5d1aba0 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -5,10 +5,35 @@
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
     <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}" itemprop="image" class="mb-0">
-    <figcaption aria-label="Image caption" itemprop="caption"> 
-        {{ $image->getFluentAttribution() }}
-    </figcaption> 
+    <figcaption aria-label="Image caption" itemprop="caption">
+        @isset($image->author)
+            <span>Image by</span>
+            <span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">
+                @isset($image->attributionUrl)
+                    <a href="{{ $image->attributionUrl }}" rel="author noopener nofollow" itemprop="url">
+                        <span itemprop="name">{{ $image->author }}</span>.
+                    </a>
+                @else
+                    <span itemprop="name">{{ $image->author }}</span>.
+                @endif
+            </span>
+        @endif
+
+        @isset($image->copyright)
+            <span itemprop="copyrightNotice">{{ $image->copyright }}</span>
+        @endif
+
+        @isset($image->license)
+            <span>License</span>
+            @isset($image->licenseUrl)
+                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener" itemprop="license">{{ $image->license }}</a>.
+            @else
+                <span itemprop="license">{{ $image->license }}</span>.
+            @endif
+        @endif
+    </figcaption>
+
     @foreach ($image->getMetadataArray() as $name => $value)
-	<meta itemprop="{{ $name }}" content="{{ $value }}"> 
-    @endforeach 
+        <meta itemprop="{{ $name }}" content="{{ $value }}">
+    @endforeach
 </figure> 

From e78145ff72773b1d82d6421a1813db20cc01b02f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:52:18 +0200
Subject: [PATCH 541/768] Create FeaturedImageViewTest.php

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

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
new file mode 100644
index 00000000000..8dd7f50a755
--- /dev/null
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit\Views;
+
+class FeaturedImageViewTest
+{
+    //
+}

From d4d3594ffa73fad8de87aceee4fb4fdb3eec258b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:52:50 +0200
Subject: [PATCH 542/768] Link to the file

---
 packages/framework/tests/Unit/Views/FeaturedImageViewTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 8dd7f50a755..aeb678ccffb 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+/**
+ * @see resources/views/components/post/image.blade.php
+ */
 class FeaturedImageViewTest
 {
     //

From 950c444ddc6f34be2d6c2ce0a3e02d5e75358257 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:53:17 +0200
Subject: [PATCH 543/768] Extend test case class

---
 packages/framework/tests/Unit/Views/FeaturedImageViewTest.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index aeb678ccffb..fa1e4a0f88f 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,10 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Testing\TestCase;
+
 /**
  * @see resources/views/components/post/image.blade.php
  */
-class FeaturedImageViewTest
+class FeaturedImageViewTest extends TestCase
 {
     //
 }

From e1ac18c860a431ceac91e3c4c0a7adc846c1a4b6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:54:58 +0200
Subject: [PATCH 544/768] Move view tests to view test

---
 .../tests/Feature/FeaturedImageModelTest.php  | 180 -----------------
 .../Unit/Views/FeaturedImageViewTest.php      | 189 +++++++++++++++++-
 2 files changed, 188 insertions(+), 181 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 67fe8e92994..8b5e9fe7781 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -135,143 +135,6 @@ public function test_get_source_method_does_not_throw_exception_when_url_is_set(
         $this->assertEquals('https://example.com/image.jpg', $image->getSource());
     }
 
-    public function test_get_image_author_attribution_string_method()
-    {
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'attributionUrl' => 'https://example.com/',
-        ]);
-        $string = $image->getImageAuthorAttributionString();
-        $this->assertStringContainsString('itemprop="creator"', $string);
-        $this->assertStringContainsString('itemprop="url"', $string);
-        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
-        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
-        $this->assertStringContainsString('<a href="https://example.com/"', $string);
-
-        $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $image->getImageAuthorAttributionString();
-        $this->assertStringContainsString('itemprop="creator"', $string);
-        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
-        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
-
-        $image = new FeaturedImage();
-        $this->assertNull($image->getImageAuthorAttributionString());
-    }
-
-    public function test_get_copyright_string()
-    {
-        $image = new FeaturedImage(['copyright' => 'foo']);
-        $this->assertEquals('<span itemprop="copyrightNotice">foo</span>', $image->getCopyrightString());
-
-        $image = new FeaturedImage();
-        $this->assertNull($image->getCopyrightString());
-    }
-
-    public function test_get_license_string()
-    {
-        $image = new FeaturedImage([
-            'license' => 'foo',
-            'licenseUrl' => 'https://example.com/bar.html',
-        ]);
-        $this->assertEquals('<a href="https://example.com/bar.html" rel="license nofollow noopener" '.
-                'itemprop="license">foo</a>', $image->getLicenseString());
-
-        $image = new FeaturedImage(['license' => 'foo']);
-        $this->assertEquals('<span itemprop="license">foo</span>', $image->getLicenseString());
-
-        $image = new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']);
-        $this->assertNull($image->getLicenseString());
-
-        $image = new FeaturedImage();
-        $this->assertNull($image->getLicenseString());
-    }
-
-    public function test_get_fluent_attribution_method_uses_rich_html_tags()
-    {
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'copyright' => 'foo',
-            'license' => 'foo',
-        ]);
-        $string = $image->getFluentAttribution()->toHtml();
-
-        $this->assertStringContainsString('Image by <span itemprop="creator" ', $string);
-        $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
-        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
-
-        $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $image->getFluentAttribution()->toHtml();
-
-        $this->assertStringContainsString('Image by ', $string);
-        $this->assertStringContainsString('John Doe', $string);
-
-        $image = new FeaturedImage(['copyright' => 'foo']);
-        $string = $image->getFluentAttribution()->toHtml();
-
-        $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
-
-        $image = new FeaturedImage(['license' => 'foo']);
-
-        $string = $image->getFluentAttribution()->toHtml();
-        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
-
-        $image = new FeaturedImage();
-        $this->assertEquals('', $image->getFluentAttribution()->toHtml());
-    }
-
-    public function test_get_fluent_attribution_method_creates_fluent_messages()
-    {
-        $this->assertSame(
-            'Image by John Doe. CC. License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'copyright' => 'CC',
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame(
-            'Image by John Doe. License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame(
-            'Image by John Doe. CC.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'copyright' => 'CC',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame(
-            'All rights reserved.',
-            $this->stripHtml((new FeaturedImage([
-                'copyright' => 'All rights reserved',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame(
-            'Image by John Doe.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame(
-            'License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
-        );
-
-        $this->assertSame('',
-            $this->stripHtml((new FeaturedImage())->getFluentAttribution()->toHtml())
-        );
-    }
-
     public function test_get_metadata_array()
     {
         $image = new FeaturedImage([
@@ -387,40 +250,6 @@ public function test_to_string_returns_the_image_source_for_nested_pages()
         ])));
     }
 
-    public function test_the_view()
-    {
-        $page = new MarkdownPost();
-
-        $image = FeaturedImage::make([
-            'path' => 'foo',
-            'description' => 'This is an image',
-            'title' => 'FeaturedImage Title',
-            'author' => 'John Doe',
-            'license' => 'Creative Commons',
-            'licenseUrl' => 'https://licence.example.com',
-        ]);
-
-        $page->image = $image;
-
-        $this->mockPage($page);
-
-        $component = view('hyde::components.post.image')->render();
-
-        $this->assertStringContainsString('src="media/foo"', $component);
-        $this->assertStringContainsString('alt="This is an image"', $component);
-        $this->assertStringContainsString('title="FeaturedImage Title"', $component);
-        $this->assertStringContainsString('Image by', $component);
-        $this->assertStringContainsString('John Doe', $component);
-        $this->assertStringContainsString('License', $component);
-        $this->assertStringContainsString('Creative Commons', $component);
-        $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
-
-        $this->assertEquals(
-            $this->stripWhitespace('Image by John Doe. License Creative Commons.'),
-            $this->stripWhitespace($this->stripHtml($component))
-        );
-    }
-
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
     {
         $image = new FeaturedImage(['path' => 'image.jpg']);
@@ -473,13 +302,4 @@ public function test_it_returns_0_if_remote_image_is_missing()
         );
     }
 
-    protected function stripHtml(string $string): string
-    {
-        return trim(strip_newlines(strip_tags($string)), "\t ");
-    }
-
-    protected function stripWhitespace(string $string): string
-    {
-        return str_replace(' ', '', $string);
-    }
 }
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index fa1e4a0f88f..80b7ba6bfe8 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,12 +4,199 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use function str_replace;
+use function strip_newlines;
+use function strip_tags;
+use function trim;
+use function view;
 
 /**
  * @see resources/views/components/post/image.blade.php
  */
 class FeaturedImageViewTest extends TestCase
 {
-    //
+
+    public function test_the_view()
+    {
+        $page = new MarkdownPost();
+
+        $image = FeaturedImage::make([
+            'path' => 'foo',
+            'description' => 'This is an image',
+            'title' => 'FeaturedImage Title',
+            'author' => 'John Doe',
+            'license' => 'Creative Commons',
+            'licenseUrl' => 'https://licence.example.com',
+        ]);
+
+        $page->image = $image;
+
+        $this->mockPage($page);
+
+        $component = view('hyde::components.post.image')->render();
+
+        $this->assertStringContainsString('src="media/foo"', $component);
+        $this->assertStringContainsString('alt="This is an image"', $component);
+        $this->assertStringContainsString('title="FeaturedImage Title"', $component);
+        $this->assertStringContainsString('Image by', $component);
+        $this->assertStringContainsString('John Doe', $component);
+        $this->assertStringContainsString('License', $component);
+        $this->assertStringContainsString('Creative Commons', $component);
+        $this->assertStringContainsString('href="https://licence.example.com" rel="license nofollow noopener"', $component);
+
+        $this->assertEquals(
+            $this->stripWhitespace('Image by John Doe. License Creative Commons.'),
+            $this->stripWhitespace($this->stripHtml($component))
+        );
+    }
+
+    public function test_get_image_author_attribution_string_method()
+    {
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'attributionUrl' => 'https://example.com/',
+        ]);
+        $string = $image->getImageAuthorAttributionString();
+        $this->assertStringContainsString('itemprop="creator"', $string);
+        $this->assertStringContainsString('itemprop="url"', $string);
+        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
+        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
+        $this->assertStringContainsString('<a href="https://example.com/"', $string);
+
+        $image = new FeaturedImage(['author' => 'John Doe']);
+        $string = $image->getImageAuthorAttributionString();
+        $this->assertStringContainsString('itemprop="creator"', $string);
+        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
+        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
+
+        $image = new FeaturedImage();
+        $this->assertNull($image->getImageAuthorAttributionString());
+    }
+
+    public function test_get_copyright_string()
+    {
+        $image = new FeaturedImage(['copyright' => 'foo']);
+        $this->assertEquals('<span itemprop="copyrightNotice">foo</span>', $image->getCopyrightString());
+
+        $image = new FeaturedImage();
+        $this->assertNull($image->getCopyrightString());
+    }
+
+    public function test_get_license_string()
+    {
+        $image = new FeaturedImage([
+            'license' => 'foo',
+            'licenseUrl' => 'https://example.com/bar.html',
+        ]);
+        $this->assertEquals('<a href="https://example.com/bar.html" rel="license nofollow noopener" '.
+            'itemprop="license">foo</a>', $image->getLicenseString());
+
+        $image = new FeaturedImage(['license' => 'foo']);
+        $this->assertEquals('<span itemprop="license">foo</span>', $image->getLicenseString());
+
+        $image = new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']);
+        $this->assertNull($image->getLicenseString());
+
+        $image = new FeaturedImage();
+        $this->assertNull($image->getLicenseString());
+    }
+
+    public function test_get_fluent_attribution_method_uses_rich_html_tags()
+    {
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'copyright' => 'foo',
+            'license' => 'foo',
+        ]);
+        $string = $image->getFluentAttribution()->toHtml();
+
+        $this->assertStringContainsString('Image by <span itemprop="creator" ', $string);
+        $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
+        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
+
+        $image = new FeaturedImage(['author' => 'John Doe']);
+        $string = $image->getFluentAttribution()->toHtml();
+
+        $this->assertStringContainsString('Image by ', $string);
+        $this->assertStringContainsString('John Doe', $string);
+
+        $image = new FeaturedImage(['copyright' => 'foo']);
+        $string = $image->getFluentAttribution()->toHtml();
+
+        $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
+
+        $image = new FeaturedImage(['license' => 'foo']);
+
+        $string = $image->getFluentAttribution()->toHtml();
+        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
+
+        $image = new FeaturedImage();
+        $this->assertEquals('', $image->getFluentAttribution()->toHtml());
+    }
+
+    public function test_get_fluent_attribution_method_creates_fluent_messages()
+    {
+        $this->assertSame(
+            'Image by John Doe. CC. License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'copyright' => 'CC',
+                'license' => 'MIT',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame(
+            'Image by John Doe. License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'license' => 'MIT',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame(
+            'Image by John Doe. CC.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+                'copyright' => 'CC',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame(
+            'All rights reserved.',
+            $this->stripHtml((new FeaturedImage([
+                'copyright' => 'All rights reserved',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame(
+            'Image by John Doe.',
+            $this->stripHtml((new FeaturedImage([
+                'author' => 'John Doe',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame(
+            'License MIT.',
+            $this->stripHtml((new FeaturedImage([
+                'license' => 'MIT',
+            ]))->getFluentAttribution()->toHtml())
+        );
+
+        $this->assertSame('',
+            $this->stripHtml((new FeaturedImage())->getFluentAttribution()->toHtml())
+        );
+    }
+
+    protected function stripHtml(string $string): string
+    {
+        return trim(strip_newlines(strip_tags($string)), "\t ");
+    }
+
+    protected function stripWhitespace(string $string): string
+    {
+        return str_replace(' ', '', $string);
+    }
 }

From fcca56689014e2701cd8ef7ced1fb75eac7b94a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:57:20 +0200
Subject: [PATCH 545/768] Extract helper

---
 .../Unit/Views/FeaturedImageViewTest.php      | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 80b7ba6bfe8..814a47126fc 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -18,25 +18,16 @@
  */
 class FeaturedImageViewTest extends TestCase
 {
-
     public function test_the_view()
     {
-        $page = new MarkdownPost();
-
-        $image = FeaturedImage::make([
+        $component = $this->renderComponent(FeaturedImage::make([
             'path' => 'foo',
             'description' => 'This is an image',
             'title' => 'FeaturedImage Title',
             'author' => 'John Doe',
             'license' => 'Creative Commons',
             'licenseUrl' => 'https://licence.example.com',
-        ]);
-
-        $page->image = $image;
-
-        $this->mockPage($page);
-
-        $component = view('hyde::components.post.image')->render();
+        ]));
 
         $this->assertStringContainsString('src="media/foo"', $component);
         $this->assertStringContainsString('alt="This is an image"', $component);
@@ -199,4 +190,15 @@ protected function stripWhitespace(string $string): string
     {
         return str_replace(' ', '', $string);
     }
+
+    protected function renderComponent(FeaturedImage $image): string
+    {
+        $page = new MarkdownPost();
+
+        $page->image = $image;
+
+        $this->mockPage($page);
+
+        return view('hyde::components.post.image')->render();
+    }
 }

From 70f5f5b982c62756b124b13ecdcd5861f645449b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 09:58:34 +0200
Subject: [PATCH 546/768] Adjust transferred test method names

---
 .../tests/Unit/Views/FeaturedImageViewTest.php         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 814a47126fc..d007a2158c1 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -44,7 +44,7 @@ public function test_the_view()
         );
     }
 
-    public function test_get_image_author_attribution_string_method()
+    public function test_image_author_attribution_string()
     {
         $image = new FeaturedImage([
             'author' => 'John Doe',
@@ -67,7 +67,7 @@ public function test_get_image_author_attribution_string_method()
         $this->assertNull($image->getImageAuthorAttributionString());
     }
 
-    public function test_get_copyright_string()
+    public function test_copyright_string()
     {
         $image = new FeaturedImage(['copyright' => 'foo']);
         $this->assertEquals('<span itemprop="copyrightNotice">foo</span>', $image->getCopyrightString());
@@ -76,7 +76,7 @@ public function test_get_copyright_string()
         $this->assertNull($image->getCopyrightString());
     }
 
-    public function test_get_license_string()
+    public function test_license_string()
     {
         $image = new FeaturedImage([
             'license' => 'foo',
@@ -95,7 +95,7 @@ public function test_get_license_string()
         $this->assertNull($image->getLicenseString());
     }
 
-    public function test_get_fluent_attribution_method_uses_rich_html_tags()
+    public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
         $image = new FeaturedImage([
             'author' => 'John Doe',
@@ -128,7 +128,7 @@ public function test_get_fluent_attribution_method_uses_rich_html_tags()
         $this->assertEquals('', $image->getFluentAttribution()->toHtml());
     }
 
-    public function test_get_fluent_attribution_method_creates_fluent_messages()
+    public function test_fluent_attribution_logic_creates_fluent_messages()
     {
         $this->assertSame(
             'Image by John Doe. CC. License MIT.',

From 11ede49c6fbb86482b8f2625748c8f6dcd074f57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:10:16 +0200
Subject: [PATCH 547/768] Add helper to make the file

---
 .../framework/tests/Unit/Views/FeaturedImageViewTest.php  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index d007a2158c1..f3c2d107a6b 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -191,12 +191,18 @@ protected function stripWhitespace(string $string): string
         return str_replace(' ', '', $string);
     }
 
-    protected function renderComponent(FeaturedImage $image): string
+    protected function renderComponent(FeaturedImage $image, bool $makeFile = true): string
     {
         $page = new MarkdownPost();
 
         $page->image = $image;
 
+
+        if ($makeFile) {
+            $image->path = $image->getSourcePath() ?? '_media/foo.jpg';
+            $this->file($image->getSourcePath() ?? '_media/foo.jpg');
+        }
+
         $this->mockPage($page);
 
         return view('hyde::components.post.image')->render();

From 1bb0e2db3c2bdd6451b8e963d10e7ff8fd5f42bf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:11:00 +0200
Subject: [PATCH 548/768] Render the component

---
 .../framework/tests/Unit/Views/FeaturedImageViewTest.php  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index f3c2d107a6b..a9487830b97 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -50,7 +50,8 @@ public function test_image_author_attribution_string()
             'author' => 'John Doe',
             'attributionUrl' => 'https://example.com/',
         ]);
-        $string = $image->getImageAuthorAttributionString();
+
+        $string = $this->renderComponent($image);
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemprop="url"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
@@ -58,13 +59,10 @@ public function test_image_author_attribution_string()
         $this->assertStringContainsString('<a href="https://example.com/"', $string);
 
         $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $image->getImageAuthorAttributionString();
+        $string = $this->renderComponent($image);
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
-
-        $image = new FeaturedImage();
-        $this->assertNull($image->getImageAuthorAttributionString());
     }
 
     public function test_copyright_string()

From 53408ed2e2274cd57bb3ba6db82d82bb8a6e1c4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:11:21 +0200
Subject: [PATCH 549/768] Split out to two tests

---
 .../tests/Unit/Views/FeaturedImageViewTest.php    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index a9487830b97..f413128ea55 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -45,6 +45,15 @@ public function test_the_view()
     }
 
     public function test_image_author_attribution_string()
+    {
+        $image = new FeaturedImage(['author' => 'John Doe']);
+        $string = $this->renderComponent($image);
+        $this->assertStringContainsString('itemprop="creator"', $string);
+        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
+        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
+    }
+
+    public function test_image_author_attribution_string_with_url()
     {
         $image = new FeaturedImage([
             'author' => 'John Doe',
@@ -57,12 +66,6 @@ public function test_image_author_attribution_string()
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
         $this->assertStringContainsString('<a href="https://example.com/"', $string);
-
-        $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $this->renderComponent($image);
-        $this->assertStringContainsString('itemprop="creator"', $string);
-        $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
-        $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
     }
 
     public function test_copyright_string()

From 3ba9428bb1cc8acd78ef5cdef3e1f09c00d01d45 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:22:52 +0200
Subject: [PATCH 550/768] Add assertSee helper

---
 .../tests/Unit/Views/FeaturedImageViewTest.php       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index f413128ea55..531263f8e13 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -71,7 +71,7 @@ public function test_image_author_attribution_string_with_url()
     public function test_copyright_string()
     {
         $image = new FeaturedImage(['copyright' => 'foo']);
-        $this->assertEquals('<span itemprop="copyrightNotice">foo</span>', $image->getCopyrightString());
+        $this->assertSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
 
         $image = new FeaturedImage();
         $this->assertNull($image->getCopyrightString());
@@ -208,4 +208,14 @@ protected function renderComponent(FeaturedImage $image, bool $makeFile = true):
 
         return view('hyde::components.post.image')->render();
     }
+
+    protected function assertSee(string $needle, string $haystack, bool $stripHtmlTabsAndWhitespace = true): void
+    {
+        if ($stripHtmlTabsAndWhitespace) {
+            $needle = $this->stripWhitespace($this->stripHtml($needle));
+            $haystack = $this->stripWhitespace($this->stripHtml($haystack));
+        }
+
+        $this->assertStringContainsString($needle, $haystack);
+    }
 }

From 2baa0425c67041509883f5e025b8ecda18aaccbf Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:24:36 +0200
Subject: [PATCH 551/768] Add assertDontSee helper

---
 .../tests/Unit/Views/FeaturedImageViewTest.php       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 531263f8e13..49cab02b5ac 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -74,7 +74,7 @@ public function test_copyright_string()
         $this->assertSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
 
         $image = new FeaturedImage();
-        $this->assertNull($image->getCopyrightString());
+        $this->assertDontSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
     }
 
     public function test_license_string()
@@ -218,4 +218,14 @@ protected function assertSee(string $needle, string $haystack, bool $stripHtmlTa
 
         $this->assertStringContainsString($needle, $haystack);
     }
+
+    protected function assertDontSee(string $needle, string $haystack, bool $stripHtmlTabsAndWhitespace = true): void
+    {
+        if ($stripHtmlTabsAndWhitespace) {
+            $needle = $this->stripWhitespace($this->stripHtml($needle));
+            $haystack = $this->stripWhitespace($this->stripHtml($haystack));
+        }
+
+        $this->assertStringNotContainsString($needle, $haystack);
+    }
 }

From 1f507eaac1642cc67481ab334e32be48f2a48665 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:24:44 +0200
Subject: [PATCH 552/768] Split out test

---
 packages/framework/tests/Unit/Views/FeaturedImageViewTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 49cab02b5ac..ae5dd6af173 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -72,7 +72,10 @@ public function test_copyright_string()
     {
         $image = new FeaturedImage(['copyright' => 'foo']);
         $this->assertSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
+    }
 
+    public function test_copyright_string_inverse()
+    {
         $image = new FeaturedImage();
         $this->assertDontSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
     }

From 96fd48fe3ea61a4abe6bbcd25eb9b41daaf1ea6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:29:02 +0200
Subject: [PATCH 553/768] Split out arguments

---
 .../Unit/Views/FeaturedImageViewTest.php      | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index ae5dd6af173..4bd00c593a7 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -212,21 +212,31 @@ protected function renderComponent(FeaturedImage $image, bool $makeFile = true):
         return view('hyde::components.post.image')->render();
     }
 
-    protected function assertSee(string $needle, string $haystack, bool $stripHtmlTabsAndWhitespace = true): void
+    protected function assertSee(string $needle, string $haystack, bool $stripTabsAndWhitespace = true, bool $stripHtml = true): void
     {
-        if ($stripHtmlTabsAndWhitespace) {
-            $needle = $this->stripWhitespace($this->stripHtml($needle));
-            $haystack = $this->stripWhitespace($this->stripHtml($haystack));
+        if ($stripTabsAndWhitespace) {
+            $needle = $this->stripWhitespace(($needle));
+            $haystack = $this->stripWhitespace($haystack);
+        }
+
+        if ($stripHtml) {
+            $needle = $this->stripHtml($needle);
+            $haystack =($this->stripHtml($haystack));
         }
 
         $this->assertStringContainsString($needle, $haystack);
     }
 
-    protected function assertDontSee(string $needle, string $haystack, bool $stripHtmlTabsAndWhitespace = true): void
+    protected function assertDontSee(string $needle, string $haystack, bool $stripTabsAndWhitespace = true, bool $stripHtml = true): void
     {
-        if ($stripHtmlTabsAndWhitespace) {
-            $needle = $this->stripWhitespace($this->stripHtml($needle));
-            $haystack = $this->stripWhitespace($this->stripHtml($haystack));
+        if ($stripTabsAndWhitespace) {
+            $needle = $this->stripWhitespace(($needle));
+            $haystack = $this->stripWhitespace($haystack);
+        }
+
+        if ($stripHtml) {
+            $needle = $this->stripHtml($needle);
+            $haystack =($this->stripHtml($haystack));
         }
 
         $this->assertStringNotContainsString($needle, $haystack);

From c72a96e3877bd2bb5ecad3e300f0c6e97fcc689e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:56:29 +0200
Subject: [PATCH 554/768] Simplify test and split out to multiple methods

---
 .../Unit/Views/FeaturedImageViewTest.php      | 223 ++++++++++--------
 1 file changed, 128 insertions(+), 95 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 4bd00c593a7..371c459936d 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use function str_replace;
-use function strip_newlines;
 use function strip_tags;
 use function trim;
 use function view;
@@ -46,8 +45,7 @@ public function test_the_view()
 
     public function test_image_author_attribution_string()
     {
-        $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $this->renderComponent($image);
+        $string = $this->renderComponent(new FeaturedImage(['author' => 'John Doe']));
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
@@ -55,12 +53,10 @@ public function test_image_author_attribution_string()
 
     public function test_image_author_attribution_string_with_url()
     {
-        $image = new FeaturedImage([
+        $string = $this->renderComponent(new FeaturedImage([
             'author' => 'John Doe',
             'attributionUrl' => 'https://example.com/',
-        ]);
-
-        $string = $this->renderComponent($image);
+        ]));
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemprop="url"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
@@ -70,35 +66,47 @@ public function test_image_author_attribution_string_with_url()
 
     public function test_copyright_string()
     {
-        $image = new FeaturedImage(['copyright' => 'foo']);
-        $this->assertSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
+        $string = $this->renderComponent(new FeaturedImage(['copyright' => 'foo copy']));
+        $this->assertStringContainsString('<span itemprop="copyrightNotice">', $string);
+        $this->assertStringContainsString('foo copy', $string);
     }
 
     public function test_copyright_string_inverse()
     {
-        $image = new FeaturedImage();
-        $this->assertDontSee($this->renderComponent($image), '<span itemprop="copyrightNotice">foo</span>');
+        $string = $this->renderComponent(new FeaturedImage());
+        $this->assertStringNotContainsString('<span itemprop="copyrightNotice">', $string);
     }
 
     public function test_license_string()
+    {
+        $string = $this->renderComponent(new FeaturedImage(['license' => 'foo']));
+
+        $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
+    }
+    public function test_license_string_with_url()
     {
         $image = new FeaturedImage([
             'license' => 'foo',
             'licenseUrl' => 'https://example.com/bar.html',
         ]);
-        $this->assertEquals('<a href="https://example.com/bar.html" rel="license nofollow noopener" '.
-            'itemprop="license">foo</a>', $image->getLicenseString());
-
-        $image = new FeaturedImage(['license' => 'foo']);
-        $this->assertEquals('<span itemprop="license">foo</span>', $image->getLicenseString());
+        $string = $this->renderComponent($image);
 
-        $image = new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']);
-        $this->assertNull($image->getLicenseString());
+        $this->assertStringContainsString('<a href="https://example.com/bar.html" rel="license nofollow noopener" itemprop="license">foo</a>', $string);
+    }
 
-        $image = new FeaturedImage();
-        $this->assertNull($image->getLicenseString());
+    public function test_license_string_inverse()
+    {
+        $string = $this->renderComponent(new FeaturedImage());
+        $this->assertStringNotContainsString('<span itemprop="license">', $string);
+        $this->assertStringNotContainsString('license', $string);
     }
 
+    public function test_license_string_inverse_with_url()
+    {
+        $string = $this->renderComponent(new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
+        $this->assertStringNotContainsString('<span itemprop="license">', $string);
+        $this->assertStringNotContainsString('license', $string);
+    }
     public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
         $image = new FeaturedImage([
@@ -106,93 +114,148 @@ public function test_fluent_attribution_logic_uses_rich_html_tags()
             'copyright' => 'foo',
             'license' => 'foo',
         ]);
-        $string = $image->getFluentAttribution()->toHtml();
+        $string = $this->renderComponent($image);
 
-        $this->assertStringContainsString('Image by <span itemprop="creator" ', $string);
+        $this->assertStringContainsString('Image by', $string);
+        $this->assertStringContainsString('License', $string);
+        $this->assertStringContainsString('<span itemprop="creator" ', $string);
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
-        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
+        $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
 
-        $image = new FeaturedImage(['author' => 'John Doe']);
-        $string = $image->getFluentAttribution()->toHtml();
+        $this->assertStringContainsString('Image by', $string);
+        $this->assertStringContainsString('John Doe', $string);
+    }
+
+    public function test_fluent_attribution_logic_uses_rich_html_tags_1()
+    {
 
-        $this->assertStringContainsString('Image by ', $string);
+        $image = new FeaturedImage(['author' => 'John Doe']);
+        $string = $this->renderComponent($image);
+        $this->assertStringContainsString('Image by', $string);
         $this->assertStringContainsString('John Doe', $string);
+    }
+
+    public function test_fluent_attribution_logic_uses_rich_html_tags_2()
+    {
 
         $image = new FeaturedImage(['copyright' => 'foo']);
-        $string = $image->getFluentAttribution()->toHtml();
+        $string = $this->renderComponent($image);
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
+    }
+
+    public function test_fluent_attribution_logic_uses_rich_html_tags_3()
+    {
 
         $image = new FeaturedImage(['license' => 'foo']);
 
-        $string = $image->getFluentAttribution()->toHtml();
-        $this->assertStringContainsString('License <span itemprop="license">foo</span>', $string);
+        $string = $this->renderComponent($image);
+        $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
+    }
+
+    public function test_fluent_attribution_logic_uses_rich_html_tags_4()
+    {
 
         $image = new FeaturedImage();
-        $this->assertEquals('', $image->getFluentAttribution()->toHtml());
+        $string = $this->renderComponent($image);
+        $this->assertStringNotContainsString('Image by', $string);
+        $this->assertStringNotContainsString('License', $string);
     }
-
-    public function test_fluent_attribution_logic_creates_fluent_messages()
+    public function test_fluent_attribution_logic_creates_fluent_messages1()
     {
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'copyright' => 'CC',
+            'license' => 'MIT',
+        ]);
+
         $this->assertSame(
-            'Image by John Doe. CC. License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'copyright' => 'CC',
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace('Image by John Doe. CC. License MIT.'),
+            $this->stripHtml(($this->renderComponent($image)))
         );
-
+    }
+    public function test_fluent_attribution_logic_creates_fluent_messages2()
+    {
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'license' => 'MIT',
+        ]);
+        $expect = 'Image by John Doe. License MIT.';
         $this->assertSame(
-            'Image by John Doe. License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
+    }
+    public function test_fluent_attribution_logic_creates_fluent_messages3()
+    {
+        $expect = 'Image by John Doe. CC.';
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+            'copyright' => 'CC',
+        ]);
 
         $this->assertSame(
-            'Image by John Doe. CC.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-                'copyright' => 'CC',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
+    }
+    public function test_fluent_attribution_logic_creates_fluent_messages4()
+    {
+        $expect = 'All rights reserved.';
+        $image = new FeaturedImage([
+            'copyright' => 'All rights reserved',
+        ]);
 
         $this->assertSame(
-            'All rights reserved.',
-            $this->stripHtml((new FeaturedImage([
-                'copyright' => 'All rights reserved',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
+    }
+
+    public function test_fluent_attribution_logic_creates_fluent_messages5()
+    {
+        $expect = 'Image by John Doe.';
+        $image = new FeaturedImage([
+            'author' => 'John Doe',
+        ]);
 
         $this->assertSame(
-            'Image by John Doe.',
-            $this->stripHtml((new FeaturedImage([
-                'author' => 'John Doe',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
+    }
+    public function test_fluent_attribution_logic_creates_fluent_messages6()
+    {
+        $expect =            'License MIT.';
+        $image = new FeaturedImage([
+            'license' => 'MIT',
+        ]);
 
         $this->assertSame(
-            'License MIT.',
-            $this->stripHtml((new FeaturedImage([
-                'license' => 'MIT',
-            ]))->getFluentAttribution()->toHtml())
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
+    }
 
-        $this->assertSame('',
-            $this->stripHtml((new FeaturedImage())->getFluentAttribution()->toHtml())
+    public function test_fluent_attribution_logic_creates_fluent_messages7()
+    {
+        $expect =            '';
+        $image = new FeaturedImage([]);
+
+        $this->assertSame(
+            $this->stripWhitespace($expect),
+            $this->stripHtml(($this->renderComponent($image)))
         );
     }
 
     protected function stripHtml(string $string): string
     {
-        return trim(strip_newlines(strip_tags($string)), "\t ");
+        return trim(($this->stripWhitespace(strip_tags($string))), "\t ");
     }
 
     protected function stripWhitespace(string $string): string
     {
-        return str_replace(' ', '', $string);
+        return str_replace([' ', "\r", "\n"], '', $string);
     }
 
     protected function renderComponent(FeaturedImage $image, bool $makeFile = true): string
@@ -211,34 +274,4 @@ protected function renderComponent(FeaturedImage $image, bool $makeFile = true):
 
         return view('hyde::components.post.image')->render();
     }
-
-    protected function assertSee(string $needle, string $haystack, bool $stripTabsAndWhitespace = true, bool $stripHtml = true): void
-    {
-        if ($stripTabsAndWhitespace) {
-            $needle = $this->stripWhitespace(($needle));
-            $haystack = $this->stripWhitespace($haystack);
-        }
-
-        if ($stripHtml) {
-            $needle = $this->stripHtml($needle);
-            $haystack =($this->stripHtml($haystack));
-        }
-
-        $this->assertStringContainsString($needle, $haystack);
-    }
-
-    protected function assertDontSee(string $needle, string $haystack, bool $stripTabsAndWhitespace = true, bool $stripHtml = true): void
-    {
-        if ($stripTabsAndWhitespace) {
-            $needle = $this->stripWhitespace(($needle));
-            $haystack = $this->stripWhitespace($haystack);
-        }
-
-        if ($stripHtml) {
-            $needle = $this->stripHtml($needle);
-            $haystack =($this->stripHtml($haystack));
-        }
-
-        $this->assertStringNotContainsString($needle, $haystack);
-    }
 }

From 94daab67be27d5884c620d00bc52a6d3ee82c59b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:56:36 +0200
Subject: [PATCH 555/768] End with period

---
 .../framework/resources/views/components/post/image.blade.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index d93d5d1aba0..38ebafc1b3c 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -20,7 +20,7 @@
         @endif
 
         @isset($image->copyright)
-            <span itemprop="copyrightNotice">{{ $image->copyright }}</span>
+            <span itemprop="copyrightNotice">{{ $image->copyright }}</span>.
         @endif
 
         @isset($image->license)

From a12f18e102c6a830b28171afc6166036b9e98522 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 10:56:51 +0200
Subject: [PATCH 556/768] Remove legacy code

---
 .../Blogging/Models/FeaturedImage.php         | 69 -------------------
 1 file changed, 69 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 813b1c4208a..d94f9710ba4 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -181,25 +181,6 @@ public function getContentLength(): int
             : $this->getLocalContentLength()) ?? 0;
     }
 
-    public function getFluentAttribution(): HtmlString
-    {
-        $attribution = [];
-
-        if ($this->getImageAuthorAttributionString() !== null) {
-            $attribution[] = 'Image by '.$this->getImageAuthorAttributionString();
-        }
-
-        if ($this->getCopyrightString() !== null) {
-            $attribution[] = $this->getCopyrightString();
-        }
-
-        if ($this->getLicenseString() !== null) {
-            $attribution[] = 'License '.$this->getLicenseString();
-        }
-
-        return new HtmlString(implode('. ', $attribution).((count($attribution) > 0) ? '.' : ''));
-    }
-
     /**
      * Used in resources/views/components/post/image.blade.php to add meta tags with itemprop attributes.
      *
@@ -223,56 +204,6 @@ public function getMetadataArray(): array
         return $metadata;
     }
 
-    /** @internal */
-    public function getImageAuthorAttributionString(): string|null
-    {
-        if (isset($this->author)) {
-            return '<span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">'.$this->getAuthorElement().'</span>';
-        }
-
-        return null;
-    }
-
-    /** @internal */
-    public function getCopyrightString(): string|null
-    {
-        if (isset($this->copyright)) {
-            return '<span itemprop="copyrightNotice">'.e($this->copyright).'</span>';
-        }
-
-        return null;
-    }
-
-    /** @internal */
-    public function getLicenseString(): string|null
-    {
-        if (isset($this->license) && isset($this->licenseUrl)) {
-            return '<a href="'.e($this->licenseUrl).'" rel="license nofollow noopener" itemprop="license">'.e($this->license).'</a>';
-        }
-
-        if (isset($this->license)) {
-            return '<span itemprop="license">'.e($this->license).'</span>';
-        }
-
-        return null;
-    }
-
-    protected function getAuthorLink(): string
-    {
-        return '<a href="'.e($this->attributionUrl).'" rel="author noopener nofollow" itemprop="url">'.$this->getAuthorSpan().'</a>';
-    }
-
-    protected function getAuthorSpan(): string
-    {
-        return '<span itemprop="name">'.e($this->author).'</span>';
-    }
-
-    protected function getAuthorElement(): string
-    {
-        return isset($this->attributionUrl)
-            ? $this->getAuthorLink()
-            : $this->getAuthorSpan();
-    }
 
     protected function getContentLengthFromRemote(): ?int
     {

From e2a78e829ea8c1011fac79732ccd62751da8d267 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Oct 2022 08:57:19 +0000
Subject: [PATCH 557/768] Apply fixes from StyleCI

---
 .../Features/Blogging/Models/FeaturedImage.php   |  4 ----
 .../tests/Feature/FeaturedImageModelTest.php     |  4 ----
 .../tests/Unit/Views/FeaturedImageViewTest.php   | 16 +++++++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index d94f9710ba4..dc6ac11f311 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,14 +8,11 @@
 use function array_key_exists;
 use BadMethodCallException;
 use function config;
-use function e;
 use function file_exists;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
-use function implode;
 use function key;
 use Stringable;
 
@@ -204,7 +201,6 @@ public function getMetadataArray(): array
         return $metadata;
     }
 
-
     protected function getContentLengthFromRemote(): ?int
     {
         $headers = Http::withHeaders([
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 8b5e9fe7781..7aa225d7be1 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -7,11 +7,8 @@
 use BadMethodCallException;
 use function file_put_contents;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
-use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
-use function str_replace;
-use function strip_tags;
 use function unlink;
 
 /**
@@ -301,5 +298,4 @@ public function test_it_returns_0_if_remote_image_is_missing()
             0, $image->getContentLength()
         );
     }
-
 }
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 371c459936d..a5a2af9f789 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -83,6 +83,7 @@ public function test_license_string()
 
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
     }
+
     public function test_license_string_with_url()
     {
         $image = new FeaturedImage([
@@ -107,6 +108,7 @@ public function test_license_string_inverse_with_url()
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
+
     public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
         $image = new FeaturedImage([
@@ -128,7 +130,6 @@ public function test_fluent_attribution_logic_uses_rich_html_tags()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_1()
     {
-
         $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('Image by', $string);
@@ -137,7 +138,6 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_1()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_2()
     {
-
         $image = new FeaturedImage(['copyright' => 'foo']);
         $string = $this->renderComponent($image);
 
@@ -146,7 +146,6 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_2()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_3()
     {
-
         $image = new FeaturedImage(['license' => 'foo']);
 
         $string = $this->renderComponent($image);
@@ -155,12 +154,12 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_3()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_4()
     {
-
         $image = new FeaturedImage();
         $string = $this->renderComponent($image);
         $this->assertStringNotContainsString('Image by', $string);
         $this->assertStringNotContainsString('License', $string);
     }
+
     public function test_fluent_attribution_logic_creates_fluent_messages1()
     {
         $image = new FeaturedImage([
@@ -174,6 +173,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages1()
             $this->stripHtml(($this->renderComponent($image)))
         );
     }
+
     public function test_fluent_attribution_logic_creates_fluent_messages2()
     {
         $image = new FeaturedImage([
@@ -186,6 +186,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages2()
             $this->stripHtml(($this->renderComponent($image)))
         );
     }
+
     public function test_fluent_attribution_logic_creates_fluent_messages3()
     {
         $expect = 'Image by John Doe. CC.';
@@ -199,6 +200,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages3()
             $this->stripHtml(($this->renderComponent($image)))
         );
     }
+
     public function test_fluent_attribution_logic_creates_fluent_messages4()
     {
         $expect = 'All rights reserved.';
@@ -224,9 +226,10 @@ public function test_fluent_attribution_logic_creates_fluent_messages5()
             $this->stripHtml(($this->renderComponent($image)))
         );
     }
+
     public function test_fluent_attribution_logic_creates_fluent_messages6()
     {
-        $expect =            'License MIT.';
+        $expect = 'License MIT.';
         $image = new FeaturedImage([
             'license' => 'MIT',
         ]);
@@ -239,7 +242,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages6()
 
     public function test_fluent_attribution_logic_creates_fluent_messages7()
     {
-        $expect =            '';
+        $expect = '';
         $image = new FeaturedImage([]);
 
         $this->assertSame(
@@ -264,7 +267,6 @@ protected function renderComponent(FeaturedImage $image, bool $makeFile = true):
 
         $page->image = $image;
 
-
         if ($makeFile) {
             $image->path = $image->getSourcePath() ?? '_media/foo.jpg';
             $this->file($image->getSourcePath() ?? '_media/foo.jpg');

From 369c3b05875f5312782723e4c703e5d6a98b111c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:35:48 +0200
Subject: [PATCH 558/768] Temporary rename of FeaturedImage to
 LegacyFeaturedImage

---
 .../views/components/post/image.blade.php     |  8 +-
 .../Factories/BlogPostDataFactory.php         |  8 +-
 ...turedImage.php => LegacyFeaturedImage.php} |  2 +-
 .../SubSchemas/FeaturedImageSchema.php        |  2 +-
 packages/framework/src/Pages/MarkdownPost.php |  4 +-
 .../tests/Feature/FeaturedImageModelTest.php  | 84 +++++++++----------
 .../tests/Feature/MarkdownPostTest.php        | 12 +--
 .../Unit/Views/FeaturedImageViewTest.php      | 50 +++++------
 8 files changed, 86 insertions(+), 84 deletions(-)
 rename packages/framework/src/Framework/Features/Blogging/Models/{FeaturedImage.php => LegacyFeaturedImage.php} (98%)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index 38ebafc1b3c..c32e25e0d44 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -1,10 +1,11 @@
 @php
     /** @var \Hyde\Pages\MarkdownPost $page  */
-    /** @var \Hyde\Framework\Features\Blogging\Models\FeaturedImage $image  */
+    /** @var \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage $image  */
     $image = $page->image;
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
-    <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}" itemprop="image" class="mb-0">
+    <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}"
+         itemprop="image" class="mb-0">
     <figcaption aria-label="Image caption" itemprop="caption">
         @isset($image->author)
             <span>Image by</span>
@@ -26,7 +27,8 @@
         @isset($image->license)
             <span>License</span>
             @isset($image->licenseUrl)
-                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener" itemprop="license">{{ $image->license }}</a>.
+                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener"
+                   itemprop="license">{{ $image->license }}</a>.
             @else
                 <span itemprop="license">{{ $image->license }}</span>.
             @endif
diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 50f21a012dc..7723507d9c6 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
@@ -40,7 +40,7 @@ class BlogPostDataFactory extends Concerns\PageDataFactory implements BlogPostSc
     protected readonly ?string $category;
     protected readonly ?DateString $date;
     protected readonly ?PostAuthor $author;
-    protected readonly ?FeaturedImage $image;
+    protected readonly ?LegacyFeaturedImage $image;
 
     public function __construct(FrontMatter $matter, Markdown $markdown)
     {
@@ -93,10 +93,10 @@ protected function makeAuthor(): ?PostAuthor
         return null;
     }
 
-    protected function makeImage(): ?FeaturedImage
+    protected function makeImage(): ?LegacyFeaturedImage
     {
         if ($this->matter('image')) {
-            return FeaturedImage::make($this->matter('image'));
+            return LegacyFeaturedImage::make($this->matter('image'));
         }
 
         return null;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php
similarity index 98%
rename from packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
rename to packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php
index dc6ac11f311..f91252cbfc2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php
@@ -34,7 +34,7 @@
  * @see \Hyde\Framework\Testing\Feature\ImageModelTest
  * @phpstan-consistent-constructor
  */
-class FeaturedImage implements FeaturedImageSchema, Stringable
+class LegacyFeaturedImage implements FeaturedImageSchema, Stringable
 {
     /**
      * The image's path if it's stored locally.
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
index 4731fa3b66e..11ad3ed9d64 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Contracts\FrontMatter\SubSchemas;
 
 /**
- * @see \Hyde\Framework\Features\Blogging\Models\FeaturedImage
+ * @see \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage
  * @see \Hyde\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 7389f7a4625..64e7372c557 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -5,7 +5,7 @@
 namespace Hyde\Pages;
 
 use Hyde\Foundation\PageCollection;
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Pages\Concerns\BaseMarkdownPage;
@@ -29,7 +29,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?string $category;
     public ?DateString $date;
     public ?PostAuthor $author;
-    public ?FeaturedImage $image;
+    public ?LegacyFeaturedImage $image;
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index 7aa225d7be1..e55f72a594a 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -6,72 +6,72 @@
 
 use BadMethodCallException;
 use function file_put_contents;
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
 use function unlink;
 
 /**
- * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
+ * @covers \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage
  */
 class FeaturedImageModelTest extends TestCase
 {
     public function test_can_construct_new_image()
     {
-        $image = new FeaturedImage();
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $image = new LegacyFeaturedImage();
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
     }
 
     public function test_make_can_create_an_image_based_on_string()
     {
-        $image = FeaturedImage::make('foo');
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $image = LegacyFeaturedImage::make('foo');
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('foo', $image->path);
     }
 
     public function test_make_can_create_an_image_based_on_array()
     {
-        $image = FeaturedImage::make([
+        $image = LegacyFeaturedImage::make([
             'path' => 'foo',
             'title' => 'bar',
         ]);
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('foo', $image->path);
         $this->assertEquals('bar', $image->title);
     }
 
     public function test_image_path_is_normalized_to_never_begin_with_media_prefix()
     {
-        $image = FeaturedImage::make('foo');
+        $image = LegacyFeaturedImage::make('foo');
         $this->assertSame('foo', $image->path);
 
-        $image = FeaturedImage::make('_media/foo');
+        $image = LegacyFeaturedImage::make('_media/foo');
         $this->assertSame('foo', $image->path);
 
-        $image = FeaturedImage::make('_media/foo');
+        $image = LegacyFeaturedImage::make('_media/foo');
         $this->assertSame('foo', $image->path);
     }
 
     public function test_image_source_path_is_normalized_to_always_begin_with_media_prefix()
     {
-        $image = FeaturedImage::make('foo');
+        $image = LegacyFeaturedImage::make('foo');
         $this->assertSame('_media/foo', $image->getSourcePath());
 
-        $image = FeaturedImage::make('_media/foo');
+        $image = LegacyFeaturedImage::make('_media/foo');
         $this->assertSame('_media/foo', $image->getSourcePath());
 
-        $image = FeaturedImage::make('_media/foo');
+        $image = LegacyFeaturedImage::make('_media/foo');
         $this->assertSame('_media/foo', $image->getSourcePath());
     }
 
     public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()
     {
-        $image = FeaturedImage::fromSource('https://example.com/image.jpg');
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $image = LegacyFeaturedImage::fromSource('https://example.com/image.jpg');
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('https://example.com/image.jpg', $image->url);
 
-        $image = FeaturedImage::fromSource('image.jpg');
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $image = LegacyFeaturedImage::fromSource('image.jpg');
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('image.jpg', $image->path);
     }
 
@@ -81,10 +81,10 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
             'path' => 'image.jpg',
             'url' => 'https://example.com/image.jpg',
             'description' => 'This is an image',
-            'title' => 'FeaturedImage Title',
+            'title' => 'LegacyFeaturedImage Title',
         ];
 
-        $image = new FeaturedImage($data);
+        $image = new LegacyFeaturedImage($data);
 
         $this->assertEquals($data['path'], $image->path);
         $this->assertEquals($data['url'], $image->url);
@@ -94,7 +94,7 @@ public function test_array_data_can_be_used_to_initialize_properties_in_construc
 
     public function test_get_source_method_returns_url_when_both_url_and_path_is_set()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->url = 'https://example.com/image.jpg';
         $image->path = 'image.jpg';
 
@@ -103,7 +103,7 @@ public function test_get_source_method_returns_url_when_both_url_and_path_is_set
 
     public function test_get_source_method_returns_path_when_only_path_is_set()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->path = 'image.jpg';
 
         $this->assertEquals('image.jpg', $image->getSource());
@@ -111,7 +111,7 @@ public function test_get_source_method_returns_path_when_only_path_is_set()
 
     public function test_get_source_method_throws_exception_when_no_source_is_set()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
 
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage('Attempting to get source from Image that has no source.');
@@ -120,21 +120,21 @@ public function test_get_source_method_throws_exception_when_no_source_is_set()
 
     public function test_get_source_method_does_not_throw_exception_when_path_is_set()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->path = 'image.jpg';
         $this->assertEquals('image.jpg', $image->getSource());
     }
 
     public function test_get_source_method_does_not_throw_exception_when_url_is_set()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->url = 'https://example.com/image.jpg';
         $this->assertEquals('https://example.com/image.jpg', $image->getSource());
     }
 
     public function test_get_metadata_array()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'description' => 'foo',
             'title' => 'bar',
             'path' => 'image.jpg',
@@ -150,7 +150,7 @@ public function test_get_metadata_array()
 
     public function test_get_metadata_array_with_remote_url()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'url' => 'https://foo/bar',
         ]);
 
@@ -162,7 +162,7 @@ public function test_get_metadata_array_with_remote_url()
 
     public function test_get_metadata_array_with_local_path()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'path' => 'foo.png',
         ]);
 
@@ -175,7 +175,7 @@ public function test_get_metadata_array_with_local_path()
     public function test_get_metadata_array_with_local_path_when_on_nested_page()
     {
         $this->mockCurrentPage('foo/bar');
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'path' => 'foo.png',
         ]);
 
@@ -187,7 +187,7 @@ public function test_get_metadata_array_with_local_path_when_on_nested_page()
 
     public function test_get_link_resolves_remote_paths()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'url' => 'https://example.com/image.jpg',
         ]);
 
@@ -196,7 +196,7 @@ public function test_get_link_resolves_remote_paths()
 
     public function test_get_link_resolves_local_paths()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'path' => 'image.jpg',
         ]);
 
@@ -205,7 +205,7 @@ public function test_get_link_resolves_local_paths()
 
     public function test_get_link_resolves_local_paths_when_on_nested_page()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'path' => 'image.jpg',
         ]);
 
@@ -215,26 +215,26 @@ public function test_get_link_resolves_local_paths_when_on_nested_page()
 
     public function test_local_path_is_normalized_to_the_media_directory()
     {
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
             'path' => 'image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
             'path' => '_media/image.jpg',
         ]))->path);
 
-        $this->assertEquals('image.jpg', (new FeaturedImage([
+        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
             'path' => 'media/image.jpg',
         ]))->path);
     }
 
     public function test_to_string_returns_the_image_source()
     {
-        $this->assertEquals('https://example.com/image.jpg', (string) (new FeaturedImage([
+        $this->assertEquals('https://example.com/image.jpg', (string) (new LegacyFeaturedImage([
             'url' => 'https://example.com/image.jpg',
         ])));
 
-        $this->assertEquals('media/image.jpg', (string) (new FeaturedImage([
+        $this->assertEquals('media/image.jpg', (string) (new LegacyFeaturedImage([
             'path' => 'image.jpg',
         ])));
     }
@@ -242,14 +242,14 @@ public function test_to_string_returns_the_image_source()
     public function test_to_string_returns_the_image_source_for_nested_pages()
     {
         $this->mockCurrentPage('foo/bar');
-        $this->assertEquals('../media/image.jpg', (string) (new FeaturedImage([
+        $this->assertEquals('../media/image.jpg', (string) (new LegacyFeaturedImage([
             'path' => 'image.jpg',
         ])));
     }
 
     public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
     {
-        $image = new FeaturedImage(['path' => 'image.jpg']);
+        $image = new LegacyFeaturedImage(['path' => 'image.jpg']);
         file_put_contents($image->getSourcePath(), '16bytelongstring');
 
         $this->assertEquals(
@@ -267,7 +267,7 @@ public function test_it_can_find_the_content_length_for_a_remote_image()
             ]);
         });
 
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->url = 'https://hyde.test/static/image.png';
 
         $this->assertEquals(
@@ -277,7 +277,7 @@ public function test_it_can_find_the_content_length_for_a_remote_image()
 
     public function test_it_returns_0_if_local_image_is_missing()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->path = '_media/image.jpg';
 
         $this->assertEquals(
@@ -291,7 +291,7 @@ public function test_it_returns_0_if_remote_image_is_missing()
             return Http::response(null, 404);
         });
 
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $image->url = 'https://hyde.test/static/image.png';
 
         $this->assertEquals(
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 9f032d005a9..ec404eb211b 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
@@ -51,7 +51,7 @@ public function test_constructor_can_create_a_new_image_instance_from_a_string()
             'image' => 'https://example.com/image.jpg',
         ]));
 
-        $this->assertInstanceOf(FeaturedImage::class, $post->image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -63,7 +63,7 @@ public function test_constructor_can_create_a_new_image_instance_from_an_array()
             ],
         ]));
 
-        $this->assertInstanceOf(FeaturedImage::class, $post->image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -87,7 +87,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
     }
 
@@ -95,7 +95,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('https://example.com/foo.png', $image->url);
     }
 
@@ -103,7 +103,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
-        $this->assertInstanceOf(FeaturedImage::class, $image);
+        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
         $this->assertEquals('bar', $image->title);
     }
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index a5a2af9f789..16876f79112 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use function str_replace;
@@ -19,10 +19,10 @@ class FeaturedImageViewTest extends TestCase
 {
     public function test_the_view()
     {
-        $component = $this->renderComponent(FeaturedImage::make([
+        $component = $this->renderComponent(LegacyFeaturedImage::make([
             'path' => 'foo',
             'description' => 'This is an image',
-            'title' => 'FeaturedImage Title',
+            'title' => 'LegacyFeaturedImage Title',
             'author' => 'John Doe',
             'license' => 'Creative Commons',
             'licenseUrl' => 'https://licence.example.com',
@@ -30,7 +30,7 @@ public function test_the_view()
 
         $this->assertStringContainsString('src="media/foo"', $component);
         $this->assertStringContainsString('alt="This is an image"', $component);
-        $this->assertStringContainsString('title="FeaturedImage Title"', $component);
+        $this->assertStringContainsString('title="LegacyFeaturedImage Title"', $component);
         $this->assertStringContainsString('Image by', $component);
         $this->assertStringContainsString('John Doe', $component);
         $this->assertStringContainsString('License', $component);
@@ -45,7 +45,7 @@ public function test_the_view()
 
     public function test_image_author_attribution_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['author' => 'John Doe']));
+        $string = $this->renderComponent(new LegacyFeaturedImage(['author' => 'John Doe']));
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
@@ -53,7 +53,7 @@ public function test_image_author_attribution_string()
 
     public function test_image_author_attribution_string_with_url()
     {
-        $string = $this->renderComponent(new FeaturedImage([
+        $string = $this->renderComponent(new LegacyFeaturedImage([
             'author' => 'John Doe',
             'attributionUrl' => 'https://example.com/',
         ]));
@@ -66,27 +66,27 @@ public function test_image_author_attribution_string_with_url()
 
     public function test_copyright_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['copyright' => 'foo copy']));
+        $string = $this->renderComponent(new LegacyFeaturedImage(['copyright' => 'foo copy']));
         $this->assertStringContainsString('<span itemprop="copyrightNotice">', $string);
         $this->assertStringContainsString('foo copy', $string);
     }
 
     public function test_copyright_string_inverse()
     {
-        $string = $this->renderComponent(new FeaturedImage());
+        $string = $this->renderComponent(new LegacyFeaturedImage());
         $this->assertStringNotContainsString('<span itemprop="copyrightNotice">', $string);
     }
 
     public function test_license_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['license' => 'foo']));
+        $string = $this->renderComponent(new LegacyFeaturedImage(['license' => 'foo']));
 
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
     }
 
     public function test_license_string_with_url()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'license' => 'foo',
             'licenseUrl' => 'https://example.com/bar.html',
         ]);
@@ -97,21 +97,21 @@ public function test_license_string_with_url()
 
     public function test_license_string_inverse()
     {
-        $string = $this->renderComponent(new FeaturedImage());
+        $string = $this->renderComponent(new LegacyFeaturedImage());
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_license_string_inverse_with_url()
     {
-        $string = $this->renderComponent(new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
+        $string = $this->renderComponent(new LegacyFeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'foo',
             'license' => 'foo',
@@ -130,7 +130,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_1()
     {
-        $image = new FeaturedImage(['author' => 'John Doe']);
+        $image = new LegacyFeaturedImage(['author' => 'John Doe']);
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('Image by', $string);
         $this->assertStringContainsString('John Doe', $string);
@@ -138,7 +138,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_1()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_2()
     {
-        $image = new FeaturedImage(['copyright' => 'foo']);
+        $image = new LegacyFeaturedImage(['copyright' => 'foo']);
         $string = $this->renderComponent($image);
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
@@ -146,7 +146,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_2()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_3()
     {
-        $image = new FeaturedImage(['license' => 'foo']);
+        $image = new LegacyFeaturedImage(['license' => 'foo']);
 
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
@@ -154,7 +154,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_3()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_4()
     {
-        $image = new FeaturedImage();
+        $image = new LegacyFeaturedImage();
         $string = $this->renderComponent($image);
         $this->assertStringNotContainsString('Image by', $string);
         $this->assertStringNotContainsString('License', $string);
@@ -162,7 +162,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_4()
 
     public function test_fluent_attribution_logic_creates_fluent_messages1()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'CC',
             'license' => 'MIT',
@@ -176,7 +176,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages1()
 
     public function test_fluent_attribution_logic_creates_fluent_messages2()
     {
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'author' => 'John Doe',
             'license' => 'MIT',
         ]);
@@ -190,7 +190,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages2()
     public function test_fluent_attribution_logic_creates_fluent_messages3()
     {
         $expect = 'Image by John Doe. CC.';
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'CC',
         ]);
@@ -204,7 +204,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages3()
     public function test_fluent_attribution_logic_creates_fluent_messages4()
     {
         $expect = 'All rights reserved.';
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'copyright' => 'All rights reserved',
         ]);
 
@@ -217,7 +217,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages4()
     public function test_fluent_attribution_logic_creates_fluent_messages5()
     {
         $expect = 'Image by John Doe.';
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'author' => 'John Doe',
         ]);
 
@@ -230,7 +230,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages5()
     public function test_fluent_attribution_logic_creates_fluent_messages6()
     {
         $expect = 'License MIT.';
-        $image = new FeaturedImage([
+        $image = new LegacyFeaturedImage([
             'license' => 'MIT',
         ]);
 
@@ -243,7 +243,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages6()
     public function test_fluent_attribution_logic_creates_fluent_messages7()
     {
         $expect = '';
-        $image = new FeaturedImage([]);
+        $image = new LegacyFeaturedImage([]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
@@ -261,7 +261,7 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(FeaturedImage $image, bool $makeFile = true): string
+    protected function renderComponent(LegacyFeaturedImage $image, bool $makeFile = true): string
     {
         $page = new MarkdownPost();
 

From abbc5124b9d79898caa0e02a850a0dab99d4eca0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:36:14 +0200
Subject: [PATCH 559/768] Create FeaturedImage.php

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

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

From 0547a1756ec50f4be565fe23ee5753419286f4f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:36:35 +0200
Subject: [PATCH 560/768] Make class abstract

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 9c9134a36d1..32dbe85e35d 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-class FeaturedImage
+abstract class FeaturedImage
 {
     //
 }

From a773682ccb4af4fe88d185d002644cf616e7a40b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:36:50 +0200
Subject: [PATCH 561/768] Implements Stringable

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 32dbe85e35d..35944a650be 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-abstract class FeaturedImage
+use Stringable;
+
+abstract class FeaturedImage implements Stringable
 {
     //
 }

From 6f2f39718ac018873f9f29544e02c75106ad979a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:38:35 +0200
Subject: [PATCH 562/768] Add abstract method getSource

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 35944a650be..f52a67f9c24 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,5 +8,5 @@
 
 abstract class FeaturedImage implements Stringable
 {
-    //
+    abstract public function getSource(): string;
 }

From 268a09785c4a8cc01680bfa44d87ca36e0e75f04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:38:45 +0200
Subject: [PATCH 563/768] Add PHPDoc

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index f52a67f9c24..d3fe00c3737 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,5 +8,9 @@
 
 abstract class FeaturedImage implements Stringable
 {
+    /**
+     * Get the source of the image, must be usable within the src attribute of an image tag.
+     * @return string The image's url or path
+     */
     abstract public function getSource(): string;
 }

From 5493aafec1cff08c965b50082ed832b4b1aeaf89 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:41:59 +0200
Subject: [PATCH 564/768] Define new internal data structure

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index d3fe00c3737..0362d70047a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,6 +8,14 @@
 
 abstract class FeaturedImage implements Stringable
 {
+    protected ?string $altText = null;
+    protected ?string $titleText = null;
+    protected ?string $copyrightMessage = null;
+    protected ?string $licenseText = null;
+    protected ?string $licenseUrl = null;
+    protected ?string $authorName = null;
+    protected ?string $authorUrl = null;
+
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.
      * @return string The image's url or path

From 7965f22c307239bd432f210426e8980c76426ec8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:43:03 +0200
Subject: [PATCH 565/768] Update property name

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0362d70047a..af693a2d638 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -11,7 +11,7 @@ abstract class FeaturedImage implements Stringable
     protected ?string $altText = null;
     protected ?string $titleText = null;
     protected ?string $copyrightMessage = null;
-    protected ?string $licenseText = null;
+    protected ?string $licenseName = null;
     protected ?string $licenseUrl = null;
     protected ?string $authorName = null;
     protected ?string $authorUrl = null;

From 0b1fdfe34383659a4a68f1d87c51fc0fd5f95e6b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:43:30 +0200
Subject: [PATCH 566/768] Update copyright property

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index af693a2d638..0a6a420f90e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -10,11 +10,11 @@ abstract class FeaturedImage implements Stringable
 {
     protected ?string $altText = null;
     protected ?string $titleText = null;
-    protected ?string $copyrightMessage = null;
     protected ?string $licenseName = null;
     protected ?string $licenseUrl = null;
     protected ?string $authorName = null;
     protected ?string $authorUrl = null;
+    protected ?string $copyright = null;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From 56f1b61e7af24cacc5d7ca04d120a01972ef3261 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:44:10 +0200
Subject: [PATCH 567/768] Deprecate the test

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

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
index e55f72a594a..2f5296f4063 100644
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageModelTest.php
@@ -12,6 +12,7 @@
 use function unlink;
 
 /**
+ * @deprecated
  * @covers \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage
  */
 class FeaturedImageModelTest extends TestCase

From 96cdf73995175caf1a2da8e0e75385b1e65c91a4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:45:00 +0200
Subject: [PATCH 568/768] Create FeaturedImageTest.php

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

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

From 6a4e22cb7bcc8f9f09ddc332b4e92a3c8b698e9e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:45:10 +0200
Subject: [PATCH 569/768] Revert "Update copyright property"

This reverts commit 0b1fdfe34383659a4a68f1d87c51fc0fd5f95e6b.
---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 0a6a420f90e..af693a2d638 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -10,11 +10,11 @@ abstract class FeaturedImage implements Stringable
 {
     protected ?string $altText = null;
     protected ?string $titleText = null;
+    protected ?string $copyrightMessage = null;
     protected ?string $licenseName = null;
     protected ?string $licenseUrl = null;
     protected ?string $authorName = null;
     protected ?string $authorUrl = null;
-    protected ?string $copyright = null;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From 093a86bd77385edb96f9d8c8fc34b04f965df8ed Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:46:17 +0200
Subject: [PATCH 570/768] Reorder properties by usage order

---
 .../Framework/Features/Blogging/Models/FeaturedImage.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index af693a2d638..997ad33354a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -10,11 +10,13 @@ abstract class FeaturedImage implements Stringable
 {
     protected ?string $altText = null;
     protected ?string $titleText = null;
+
+    protected ?string $authorName = null;
+    protected ?string $authorUrl = null;
     protected ?string $copyrightMessage = null;
+
     protected ?string $licenseName = null;
     protected ?string $licenseUrl = null;
-    protected ?string $authorName = null;
-    protected ?string $authorUrl = null;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From 936bf6ba19b471ab707b5d28671493a3cd871f83 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:46:44 +0200
Subject: [PATCH 571/768] Shorten property name

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 997ad33354a..feae19bc96d 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -13,8 +13,8 @@ abstract class FeaturedImage implements Stringable
 
     protected ?string $authorName = null;
     protected ?string $authorUrl = null;
-    protected ?string $copyrightMessage = null;
 
+    protected ?string $copyrightText = null;
     protected ?string $licenseName = null;
     protected ?string $licenseUrl = null;
 

From 557d08843860221174087eef6bdde6a9a755b51b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:47:25 +0200
Subject: [PATCH 572/768] Make all properties readonly for a more predictable
 state

---
 .../Features/Blogging/Models/FeaturedImage.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index feae19bc96d..21329f996d9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,15 +8,15 @@
 
 abstract class FeaturedImage implements Stringable
 {
-    protected ?string $altText = null;
-    protected ?string $titleText = null;
+    protected readonly ?string $altText = null;
+    protected readonly ?string $titleText = null;
 
-    protected ?string $authorName = null;
-    protected ?string $authorUrl = null;
+    protected readonly ?string $authorName = null;
+    protected readonly ?string $authorUrl = null;
 
-    protected ?string $copyrightText = null;
-    protected ?string $licenseName = null;
-    protected ?string $licenseUrl = null;
+    protected readonly ?string $copyrightText = null;
+    protected readonly ?string $licenseName = null;
+    protected readonly ?string $licenseUrl = null;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From d67afa139895c8b1e217a8b08e76bd1de38601e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:48:18 +0200
Subject: [PATCH 573/768] Initialize readonly properties in the constructor

---
 .../Blogging/Models/FeaturedImage.php         | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 21329f996d9..9bd65004742 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,15 +8,26 @@
 
 abstract class FeaturedImage implements Stringable
 {
-    protected readonly ?string $altText = null;
-    protected readonly ?string $titleText = null;
+    protected readonly ?string $altText;
+    protected readonly ?string $titleText;
 
-    protected readonly ?string $authorName = null;
-    protected readonly ?string $authorUrl = null;
+    protected readonly ?string $authorName;
+    protected readonly ?string $authorUrl;
 
-    protected readonly ?string $copyrightText = null;
-    protected readonly ?string $licenseName = null;
-    protected readonly ?string $licenseUrl = null;
+    protected readonly ?string $copyrightText;
+    protected readonly ?string $licenseName;
+    protected readonly ?string $licenseUrl;
+
+    public function __construct()
+    {
+        $this->altText = null;
+        $this->titleText = null;
+        $this->authorName = null;
+        $this->authorUrl = null;
+        $this->copyrightText = null;
+        $this->licenseName = null;
+        $this->licenseUrl = null;
+    }
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From dbea0d35fe1dc2f87fc8cf2f63a8c088acb40b4f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:49:18 +0200
Subject: [PATCH 574/768] Revert "Initialize readonly properties in the
 constructor"

This reverts commit d67afa139895c8b1e217a8b08e76bd1de38601e2.
---
 .../Blogging/Models/FeaturedImage.php         | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 9bd65004742..21329f996d9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,26 +8,15 @@
 
 abstract class FeaturedImage implements Stringable
 {
-    protected readonly ?string $altText;
-    protected readonly ?string $titleText;
+    protected readonly ?string $altText = null;
+    protected readonly ?string $titleText = null;
 
-    protected readonly ?string $authorName;
-    protected readonly ?string $authorUrl;
+    protected readonly ?string $authorName = null;
+    protected readonly ?string $authorUrl = null;
 
-    protected readonly ?string $copyrightText;
-    protected readonly ?string $licenseName;
-    protected readonly ?string $licenseUrl;
-
-    public function __construct()
-    {
-        $this->altText = null;
-        $this->titleText = null;
-        $this->authorName = null;
-        $this->authorUrl = null;
-        $this->copyrightText = null;
-        $this->licenseName = null;
-        $this->licenseUrl = null;
-    }
+    protected readonly ?string $copyrightText = null;
+    protected readonly ?string $licenseName = null;
+    protected readonly ?string $licenseUrl = null;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From 7287535cc0aa3fa6ff996c47973923590f1dbcfc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:50:05 +0200
Subject: [PATCH 575/768] Remove default values from readonly properties

---
 .../Features/Blogging/Models/FeaturedImage.php     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 21329f996d9..6be667d869b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -8,15 +8,15 @@
 
 abstract class FeaturedImage implements Stringable
 {
-    protected readonly ?string $altText = null;
-    protected readonly ?string $titleText = null;
+    protected readonly ?string $altText;
+    protected readonly ?string $titleText;
 
-    protected readonly ?string $authorName = null;
-    protected readonly ?string $authorUrl = null;
+    protected readonly ?string $authorName;
+    protected readonly ?string $authorUrl;
 
-    protected readonly ?string $copyrightText = null;
-    protected readonly ?string $licenseName = null;
-    protected readonly ?string $licenseUrl = null;
+    protected readonly ?string $copyrightText;
+    protected readonly ?string $licenseName;
+    protected readonly ?string $licenseUrl;
 
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.

From 52a9e9d9237015dcf92c528e9a1566d6bb60d618 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:50:23 +0200
Subject: [PATCH 576/768] Generate constructor

---
 .../Features/Blogging/Models/FeaturedImage.php        | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 6be667d869b..848c33778d0 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -18,6 +18,17 @@ abstract class FeaturedImage implements Stringable
     protected readonly ?string $licenseName;
     protected readonly ?string $licenseUrl;
 
+    public function __construct(?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
+    {
+        $this->altText = $altText;
+        $this->titleText = $titleText;
+        $this->authorName = $authorName;
+        $this->authorUrl = $authorUrl;
+        $this->copyrightText = $copyrightText;
+        $this->licenseName = $licenseName;
+        $this->licenseUrl = $licenseUrl;
+    }
+
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.
      * @return string The image's url or path

From 3663c8ad541f9240350ac8824469bde93e9bbf87 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 11:51:13 +0200
Subject: [PATCH 577/768] Implement __toString method

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 848c33778d0..02180f502e1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -29,6 +29,11 @@ public function __construct(?string $altText, ?string $titleText, ?string $autho
         $this->licenseUrl = $licenseUrl;
     }
 
+    public function __toString(): string
+    {
+        return $this->getSource();
+    }
+
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag.
      * @return string The image's url or path

From 879c628ee13478d52afbfb4f77ca8df3b5a7b192 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:04:05 +0200
Subject: [PATCH 578/768] Add test classes

---
 .../tests/Feature/FeaturedImageTest.php       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index ec4e8922698..cdb9cad7fc4 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Testing\TestCase;
 
 /**
@@ -13,3 +14,30 @@ class FeaturedImageTest extends TestCase
 {
     //
 }
+
+class NullImage extends FeaturedImage
+{
+    public function __construct()
+    {
+        parent::__construct(null, null, null, null, null, null, null);
+    }
+
+    public function getSource(): string
+    {
+        return 'source';
+    }
+}
+
+
+class FilledImage extends FeaturedImage
+{
+    public function __construct()
+    {
+        parent::__construct('alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+    }
+
+    public function getSource(): string
+    {
+        return 'source';
+    }
+}

From c2fc4fb1dfb468238c9ebeffa32fbbda0e25664f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:05:21 +0200
Subject: [PATCH 579/768] Add helpers to determine state

---
 .../Blogging/Models/FeaturedImage.php         | 35 ++++++++++++++++
 .../tests/Feature/FeaturedImageTest.php       | 42 ++++++++++++++++++-
 2 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 02180f502e1..831c9a8776c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -39,4 +39,39 @@ public function __toString(): string
      * @return string The image's url or path
      */
     abstract public function getSource(): string;
+
+    public function hasAltText(): bool
+    {
+        return $this->altText !== null;
+    }
+
+    public function hasTitleText(): bool
+    {
+        return $this->titleText !== null;
+    }
+
+    public function hasAuthorName(): bool
+    {
+        return $this->authorName !== null;
+    }
+
+    public function hasAuthorUrl(): bool
+    {
+        return $this->authorUrl !== null;
+    }
+
+    public function hasCopyrightText(): bool
+    {
+        return $this->copyrightText !== null;
+    }
+
+    public function hasLicenseName(): bool
+    {
+        return $this->licenseName !== null;
+    }
+
+    public function hasLicenseUrl(): bool
+    {
+        return $this->licenseUrl !== null;
+    }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index cdb9cad7fc4..355333b8348 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -12,7 +12,47 @@
  */
 class FeaturedImageTest extends TestCase
 {
-    //
+    public function testHasAltText()
+    {
+        $this->assertFalse((new NullImage)->hasAltText());
+        $this->assertTrue((new FilledImage)->hasAltText());
+    }
+
+    public function testHasTitleText()
+    {
+        $this->assertFalse((new NullImage)->hasTitleText());
+        $this->assertTrue((new FilledImage)->hasTitleText());
+    }
+
+    public function testHasAuthorName()
+    {
+        $this->assertFalse((new NullImage)->hasAuthorName());
+        $this->assertTrue((new FilledImage)->hasAuthorName());
+    }
+
+    public function testHasAuthorUrl()
+    {
+        $this->assertFalse((new NullImage)->hasAuthorUrl());
+        $this->assertTrue((new FilledImage)->hasAuthorUrl());
+    }
+
+    public function testHasCopyrightText()
+    {
+        $this->assertFalse((new NullImage)->hasCopyrightText());
+        $this->assertTrue((new FilledImage)->hasCopyrightText());
+    }
+
+    public function testHasLicenseName()
+    {
+        $this->assertFalse((new NullImage)->hasLicenseName());
+        $this->assertTrue((new FilledImage)->hasLicenseName());
+    }
+
+    public function testHasLicenseUrl()
+    {
+        $this->assertFalse((new NullImage)->hasLicenseUrl());
+        $this->assertTrue((new FilledImage)->hasLicenseUrl());
+    }
 }
 
 class NullImage extends FeaturedImage

From ee60e105523f63607cf6fea1958214c93fb06a9b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:10:51 +0200
Subject: [PATCH 580/768] Add getters

---
 .../Blogging/Models/FeaturedImage.php         | 35 ++++++++++++++++
 .../tests/Feature/FeaturedImageTest.php       | 42 +++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 831c9a8776c..d5d9d61bce3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -74,4 +74,39 @@ public function hasLicenseUrl(): bool
     {
         return $this->licenseUrl !== null;
     }
+
+    public function getAltText(): ?string
+    {
+        return $this->altText;
+    }
+
+    public function getTitleText(): ?string
+    {
+        return $this->titleText;
+    }
+
+    public function getAuthorName(): ?string
+    {
+        return $this->authorName;
+    }
+
+    public function getAuthorUrl(): ?string
+    {
+        return $this->authorUrl;
+    }
+
+    public function getCopyrightText(): ?string
+    {
+        return $this->copyrightText;
+    }
+
+    public function getLicenseName(): ?string
+    {
+        return $this->licenseName;
+    }
+
+    public function getLicenseUrl(): ?string
+    {
+        return $this->licenseUrl;
+    }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 355333b8348..7d57ba91eec 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -53,6 +53,48 @@ public function testHasLicenseUrl()
         $this->assertFalse((new NullImage)->hasLicenseUrl());
         $this->assertTrue((new FilledImage)->hasLicenseUrl());
     }
+
+    public function testGetAltText()
+    {
+        $this->assertNull((new NullImage)->getAltText());
+        $this->assertEquals('alt', (new FilledImage)->getAltText());
+    }
+
+    public function testGetTitleText()
+    {
+        $this->assertNull((new NullImage)->getTitleText());
+        $this->assertEquals('title', (new FilledImage)->getTitleText());
+    }
+
+    public function testGetAuthorName()
+    {
+        $this->assertNull((new NullImage)->getAuthorName());
+        $this->assertEquals('author', (new FilledImage)->getAuthorName());
+    }
+
+    public function testGetAuthorUrl()
+    {
+        $this->assertNull((new NullImage)->getAuthorUrl());
+        $this->assertEquals('authorUrl', (new FilledImage)->getAuthorUrl());
+    }
+
+    public function testGetCopyrightText()
+    {
+        $this->assertNull((new NullImage)->getCopyrightText());
+        $this->assertEquals('copyright', (new FilledImage)->getCopyrightText());
+    }
+
+    public function testGetLicenseName()
+    {
+        $this->assertNull((new NullImage)->getLicenseName());
+        $this->assertEquals('license', (new FilledImage)->getLicenseName());
+    }
+
+    public function testGetLicenseUrl()
+    {
+        $this->assertNull((new NullImage)->getLicenseUrl());
+        $this->assertEquals('licenseUrl', (new FilledImage)->getLicenseUrl());
+    }
 }
 
 class NullImage extends FeaturedImage

From 8c0a8c66dcbf4a6dd4cd1d07ad01392202bfc65a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:12:26 +0200
Subject: [PATCH 581/768] Add abstract getContentLength method stub

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index d5d9d61bce3..b620cc49285 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -40,6 +40,8 @@ public function __toString(): string
      */
     abstract public function getSource(): string;
 
+    abstract public function getContentLength(): int;
+
     public function hasAltText(): bool
     {
         return $this->altText !== null;

From c539911115863896031051065ca19b79e44c7cd3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:12:57 +0200
Subject: [PATCH 582/768] Move up getters

---
 .../Blogging/Models/FeaturedImage.php         | 56 ++++++-------
 .../tests/Feature/FeaturedImageTest.php       | 84 +++++++++----------
 2 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index b620cc49285..510f7487b10 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -42,73 +42,73 @@ abstract public function getSource(): string;
 
     abstract public function getContentLength(): int;
 
-    public function hasAltText(): bool
+    public function getAltText(): ?string
     {
-        return $this->altText !== null;
+        return $this->altText;
     }
 
-    public function hasTitleText(): bool
+    public function getTitleText(): ?string
     {
-        return $this->titleText !== null;
+        return $this->titleText;
     }
 
-    public function hasAuthorName(): bool
+    public function getAuthorName(): ?string
     {
-        return $this->authorName !== null;
+        return $this->authorName;
     }
 
-    public function hasAuthorUrl(): bool
+    public function getAuthorUrl(): ?string
     {
-        return $this->authorUrl !== null;
+        return $this->authorUrl;
     }
 
-    public function hasCopyrightText(): bool
+    public function getCopyrightText(): ?string
     {
-        return $this->copyrightText !== null;
+        return $this->copyrightText;
     }
 
-    public function hasLicenseName(): bool
+    public function getLicenseName(): ?string
     {
-        return $this->licenseName !== null;
+        return $this->licenseName;
     }
 
-    public function hasLicenseUrl(): bool
+    public function getLicenseUrl(): ?string
     {
-        return $this->licenseUrl !== null;
+        return $this->licenseUrl;
     }
 
-    public function getAltText(): ?string
+    public function hasAltText(): bool
     {
-        return $this->altText;
+        return $this->altText !== null;
     }
 
-    public function getTitleText(): ?string
+    public function hasTitleText(): bool
     {
-        return $this->titleText;
+        return $this->titleText !== null;
     }
 
-    public function getAuthorName(): ?string
+    public function hasAuthorName(): bool
     {
-        return $this->authorName;
+        return $this->authorName !== null;
     }
 
-    public function getAuthorUrl(): ?string
+    public function hasAuthorUrl(): bool
     {
-        return $this->authorUrl;
+        return $this->authorUrl !== null;
     }
 
-    public function getCopyrightText(): ?string
+    public function hasCopyrightText(): bool
     {
-        return $this->copyrightText;
+        return $this->copyrightText !== null;
     }
 
-    public function getLicenseName(): ?string
+    public function hasLicenseName(): bool
     {
-        return $this->licenseName;
+        return $this->licenseName !== null;
     }
 
-    public function getLicenseUrl(): ?string
+    public function hasLicenseUrl(): bool
     {
-        return $this->licenseUrl;
+        return $this->licenseUrl !== null;
     }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 7d57ba91eec..57163301630 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -12,48 +12,6 @@
  */
 class FeaturedImageTest extends TestCase
 {
-    public function testHasAltText()
-    {
-        $this->assertFalse((new NullImage)->hasAltText());
-        $this->assertTrue((new FilledImage)->hasAltText());
-    }
-
-    public function testHasTitleText()
-    {
-        $this->assertFalse((new NullImage)->hasTitleText());
-        $this->assertTrue((new FilledImage)->hasTitleText());
-    }
-
-    public function testHasAuthorName()
-    {
-        $this->assertFalse((new NullImage)->hasAuthorName());
-        $this->assertTrue((new FilledImage)->hasAuthorName());
-    }
-
-    public function testHasAuthorUrl()
-    {
-        $this->assertFalse((new NullImage)->hasAuthorUrl());
-        $this->assertTrue((new FilledImage)->hasAuthorUrl());
-    }
-
-    public function testHasCopyrightText()
-    {
-        $this->assertFalse((new NullImage)->hasCopyrightText());
-        $this->assertTrue((new FilledImage)->hasCopyrightText());
-    }
-
-    public function testHasLicenseName()
-    {
-        $this->assertFalse((new NullImage)->hasLicenseName());
-        $this->assertTrue((new FilledImage)->hasLicenseName());
-    }
-
-    public function testHasLicenseUrl()
-    {
-        $this->assertFalse((new NullImage)->hasLicenseUrl());
-        $this->assertTrue((new FilledImage)->hasLicenseUrl());
-    }
-
     public function testGetAltText()
     {
         $this->assertNull((new NullImage)->getAltText());
@@ -95,6 +53,48 @@ public function testGetLicenseUrl()
         $this->assertNull((new NullImage)->getLicenseUrl());
         $this->assertEquals('licenseUrl', (new FilledImage)->getLicenseUrl());
     }
+
+    public function testHasAltText()
+    {
+        $this->assertFalse((new NullImage)->hasAltText());
+        $this->assertTrue((new FilledImage)->hasAltText());
+    }
+
+    public function testHasTitleText()
+    {
+        $this->assertFalse((new NullImage)->hasTitleText());
+        $this->assertTrue((new FilledImage)->hasTitleText());
+    }
+
+    public function testHasAuthorName()
+    {
+        $this->assertFalse((new NullImage)->hasAuthorName());
+        $this->assertTrue((new FilledImage)->hasAuthorName());
+    }
+
+    public function testHasAuthorUrl()
+    {
+        $this->assertFalse((new NullImage)->hasAuthorUrl());
+        $this->assertTrue((new FilledImage)->hasAuthorUrl());
+    }
+
+    public function testHasCopyrightText()
+    {
+        $this->assertFalse((new NullImage)->hasCopyrightText());
+        $this->assertTrue((new FilledImage)->hasCopyrightText());
+    }
+
+    public function testHasLicenseName()
+    {
+        $this->assertFalse((new NullImage)->hasLicenseName());
+        $this->assertTrue((new FilledImage)->hasLicenseName());
+    }
+
+    public function testHasLicenseUrl()
+    {
+        $this->assertFalse((new NullImage)->hasLicenseUrl());
+        $this->assertTrue((new FilledImage)->hasLicenseUrl());
+    }
 }
 
 class NullImage extends FeaturedImage

From d6a565b28fe2a09591697b515633eee849b9bcbb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:13:17 +0200
Subject: [PATCH 583/768] Update test classes

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 57163301630..4fa81d833f1 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -108,6 +108,11 @@ public function getSource(): string
     {
         return 'source';
     }
+
+    public function getContentLength(): int
+    {
+        return 0;
+    }
 }
 
 
@@ -122,4 +127,9 @@ public function getSource(): string
     {
         return 'source';
     }
+
+    public function getContentLength(): int
+    {
+        return 0;
+    }
 }

From 3d99e4217742510cd60418d772ef2492b2c11e6a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:14:28 +0200
Subject: [PATCH 584/768] Remove extra newline

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 4fa81d833f1..1159d42ced7 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -115,7 +115,6 @@ public function getContentLength(): int
     }
 }
 
-
 class FilledImage extends FeaturedImage
 {
     public function __construct()

From cb56507efc3dd6c35a973ca51a03f5e1fc4d7189 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:15:46 +0200
Subject: [PATCH 585/768] Update PHPDoc

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 510f7487b10..8d9fc4c51ac 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -35,7 +35,8 @@ public function __toString(): string
     }
 
     /**
-     * Get the source of the image, must be usable within the src attribute of an image tag.
+     * Get the source of the image, must be usable within the src attribute of an image tag,
+     * and is thus not necessarily the path to the source image on disk.
      * @return string The image's url or path
      */
     abstract public function getSource(): string;

From 1e8af8e8ce49ce6f34d1ac805f2d2c09ea5a19d3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:19:06 +0200
Subject: [PATCH 586/768] Add getMetadataArray method

---
 .../Blogging/Models/FeaturedImage.php         | 23 +++++++++++++++++++
 .../tests/Feature/FeaturedImageTest.php       | 15 ++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 8d9fc4c51ac..35fabc3bc48 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -112,4 +112,27 @@ public function hasLicenseUrl(): bool
     {
         return $this->licenseUrl !== null;
     }
+
+    /**
+     * Used in resources/views/components/post/image.blade.php to add meta tags with itemprop attributes.
+     *
+     * @return array
+     */
+    public function getMetadataArray(): array
+    {
+        $metadata = [];
+
+        if ($this->hasAltText()) {
+            $metadata['text'] = $this->getAltText();
+        }
+
+        if ($this->hasTitleText()) {
+            $metadata['name'] = $this->getTitleText();
+        }
+
+        $metadata['url'] = $this->getSource();
+        $metadata['contentUrl'] = $this->getSource();
+
+        return $metadata;
+    }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 1159d42ced7..7123fe19f3c 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -95,6 +95,21 @@ public function testHasLicenseUrl()
         $this->assertFalse((new NullImage)->hasLicenseUrl());
         $this->assertTrue((new FilledImage)->hasLicenseUrl());
     }
+
+    public function testGetMetadataArray()
+    {
+        $this->assertSame([
+            'url' => 'source',
+            'contentUrl' => 'source',
+        ], (new NullImage)->getMetadataArray());
+
+        $this->assertSame([
+            'text' => 'alt',
+            'name' => 'title',
+            'url' => 'source',
+            'contentUrl' => 'source',
+        ], (new FilledImage)->getMetadataArray());
+    }
 }
 
 class NullImage extends FeaturedImage

From f3f8b36a4483b9ebf212d4f2e24aa20d1bc7932d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:21:44 +0200
Subject: [PATCH 587/768] Create LocalFeaturedImage.php

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

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

From 68e7ad063c69876985d9bebd8828ca4064bd1f00 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:21:51 +0200
Subject: [PATCH 588/768] Extends FeaturedImage

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 8c5ddf7038e..3469cc0dfe6 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-class LocalFeaturedImage
+class LocalFeaturedImage extends FeaturedImage
 {
     //
 }

From 14855b9abe5cf2184f5b7d57b3ff78c668116885 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:22:33 +0200
Subject: [PATCH 589/768] Add source property

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 3469cc0dfe6..c4ff4df4629 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -6,5 +6,5 @@
 
 class LocalFeaturedImage extends FeaturedImage
 {
-    //
+    protected readonly string $source;
 }

From dd8e07b737d18c60308488267bc8730a0c873a9d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:22:41 +0200
Subject: [PATCH 590/768] Add constructor

---
 .../Features/Blogging/Models/LocalFeaturedImage.php         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index c4ff4df4629..8f2f6d2b555 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -7,4 +7,10 @@
 class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
+
+    public function __construct(string $source, ?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
+    {
+        parent::__construct($altText, $titleText, $authorName, $authorUrl, $copyrightText, $licenseName, $licenseUrl);
+        $this->source = $source;
+    }
 }

From d5b6d9271203dd81d52813ff83f1eff93049d8ea Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:22:48 +0200
Subject: [PATCH 591/768] Implement required method stubs

---
 .../Features/Blogging/Models/LocalFeaturedImage.php    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 8f2f6d2b555..18c6939f252 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -13,4 +13,14 @@ public function __construct(string $source, ?string $altText, ?string $titleText
         parent::__construct($altText, $titleText, $authorName, $authorUrl, $copyrightText, $licenseName, $licenseUrl);
         $this->source = $source;
     }
+
+    public function getSource(): string
+    {
+        return $this->source;
+    }
+
+    public function getContentLength(): int
+    {
+        return filesize($this->source);
+    }
 }

From 5e72648fc39a0b8e110047cbfa3aac4eb7a7dc82 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:24:41 +0200
Subject: [PATCH 592/768] Add source parameter to parent constructor for a more
 consistent API

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 2 +-
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php | 2 +-
 packages/framework/tests/Feature/FeaturedImageTest.php        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 35fabc3bc48..db91c61209a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -18,7 +18,7 @@ abstract class FeaturedImage implements Stringable
     protected readonly ?string $licenseName;
     protected readonly ?string $licenseUrl;
 
-    public function __construct(?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
+    public function __construct(string $source, ?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
     {
         $this->altText = $altText;
         $this->titleText = $titleText;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 18c6939f252..062175dd037 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -10,7 +10,7 @@ class LocalFeaturedImage extends FeaturedImage
 
     public function __construct(string $source, ?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
     {
-        parent::__construct($altText, $titleText, $authorName, $authorUrl, $copyrightText, $licenseName, $licenseUrl);
+        parent::__construct($source, $altText, $titleText, $authorName, $authorUrl, $copyrightText, $licenseName, $licenseUrl);
         $this->source = $source;
     }
 
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 7123fe19f3c..96fafd4a6dd 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -116,7 +116,7 @@ class NullImage extends FeaturedImage
 {
     public function __construct()
     {
-        parent::__construct(null, null, null, null, null, null, null);
+        parent::__construct('source',null, null, null, null, null, null, null);
     }
 
     public function getSource(): string
@@ -134,7 +134,7 @@ class FilledImage extends FeaturedImage
 {
     public function __construct()
     {
-        parent::__construct('alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+        parent::__construct('source', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
     }
 
     public function getSource(): string

From 9e1fee8e5f285e07c6cb5d512b80b18c4eda193a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:26:19 +0200
Subject: [PATCH 593/768] Test can construct LocalFeaturedImage

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 96fafd4a6dd..6aaec77db67 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Testing\TestCase;
 
 /**
@@ -110,6 +111,13 @@ public function testGetMetadataArray()
             'contentUrl' => 'source',
         ], (new FilledImage)->getMetadataArray());
     }
+
+    public function testCanConstructLocalFeaturedImage()
+    {
+        $image = new LocalFeaturedImage('source', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+        $this->assertInstanceOf(LocalFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
+    }
 }
 
 class NullImage extends FeaturedImage

From b8f66e2b56cfdf298ec8799eff247e7ace049d20 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:26:50 +0200
Subject: [PATCH 594/768] Shorten parent constructor

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 062175dd037..d1d97c473ff 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,13 +4,15 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use function func_get_args;
+
 class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
 
     public function __construct(string $source, ?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
     {
-        parent::__construct($source, $altText, $titleText, $authorName, $authorUrl, $copyrightText, $licenseName, $licenseUrl);
+        parent::__construct(...func_get_args());
         $this->source = $source;
     }
 

From e5ec8c5d17aa320b9f9c025785114ec5b681c2e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:30:33 +0200
Subject: [PATCH 595/768] Test the source is set

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 6aaec77db67..ef3c3e2fc69 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -117,6 +117,8 @@ public function testCanConstructLocalFeaturedImage()
         $image = new LocalFeaturedImage('source', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertInstanceOf(FeaturedImage::class, $image);
+
+        $this->assertEquals('source', $image->getSource());
     }
 }
 

From f702826597ba597197470cc652c82d3915c1fe5d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:31:28 +0200
Subject: [PATCH 596/768] Remove constructor in child class

---
 .../Features/Blogging/Models/LocalFeaturedImage.php         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index d1d97c473ff..b97a69a6f96 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -10,12 +10,6 @@ class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
 
-    public function __construct(string $source, ?string $altText, ?string $titleText, ?string $authorName, ?string $authorUrl, ?string $copyrightText, ?string $licenseName, ?string $licenseUrl)
-    {
-        parent::__construct(...func_get_args());
-        $this->source = $source;
-    }
-
     public function getSource(): string
     {
         return $this->source;

From 4bb1c69f87145fefd4798127454885311002dbdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:31:55 +0200
Subject: [PATCH 597/768] Add source setter so assignment can be validated
 without constructor

---
 .../Features/Blogging/Models/LocalFeaturedImage.php          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index b97a69a6f96..85570ca156c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -10,6 +10,11 @@ class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
 
+    protected function setSource(string $source): void
+    {
+        $this->source = $source;
+    }
+
     public function getSource(): string
     {
         return $this->source;

From 623fa079b6119b6fb50921b2d532e1cdd1800275 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:32:18 +0200
Subject: [PATCH 598/768] Call setSource method automatically if it exists

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index db91c61209a..21c73f13356 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Features\Blogging\Models;
 
 use Stringable;
+use function method_exists;
 
 abstract class FeaturedImage implements Stringable
 {
@@ -27,6 +28,10 @@ public function __construct(string $source, ?string $altText, ?string $titleText
         $this->copyrightText = $copyrightText;
         $this->licenseName = $licenseName;
         $this->licenseUrl = $licenseUrl;
+
+        if (method_exists($this, 'setSource')) {
+            $this->setSource($source);
+        }
     }
 
     public function __toString(): string

From 337614ba43c017d2154d2a25cfb0bcd21f0c51a0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:32:47 +0200
Subject: [PATCH 599/768] Remove unused import

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 85570ca156c..ce1e8b649d9 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,8 +4,6 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use function func_get_args;
-
 class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;

From 4ca124a0ca6f765482445b3ab1afac17b2418607 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:35:16 +0200
Subject: [PATCH 600/768] Validate path starts with media to ensure predictable
 state

---
 .../Features/Blogging/Models/LocalFeaturedImage.php |  8 ++++++++
 .../framework/tests/Feature/FeaturedImageTest.php   | 13 +++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index ce1e8b649d9..9f061deb534 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,12 +4,20 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use InvalidArgumentException;
+use function str_starts_with;
+
 class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
 
     protected function setSource(string $source): void
     {
+        if (! str_starts_with($source, '_media/')) {
+            // Throwing an exception here ensures we have a super predictable state.
+            throw new InvalidArgumentException('LocalFeaturedImage source must start with _media/');
+        }
+
         $this->source = $source;
     }
 
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index ef3c3e2fc69..30bdc486808 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -7,6 +7,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Testing\TestCase;
+use InvalidArgumentException;
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
@@ -114,11 +115,19 @@ public function testGetMetadataArray()
 
     public function testCanConstructLocalFeaturedImage()
     {
-        $image = new LocalFeaturedImage('source', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+        $image = new LocalFeaturedImage('_media/foo', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertInstanceOf(FeaturedImage::class, $image);
 
-        $this->assertEquals('source', $image->getSource());
+        $this->assertEquals('_media/foo', $image->getSource());
+    }
+
+    public function testCannotConstructLocalFeaturedImageWithInvalidSource()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('LocalFeaturedImage source must start with _media/');
+
+        new LocalFeaturedImage('foo', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
     }
 }
 

From 0d45360898b7fdc48fd55e9a44f7052d2aeca7e1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:37:04 +0200
Subject: [PATCH 601/768] Extract gorgeous helper

---
 packages/framework/tests/Feature/FeaturedImageTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 30bdc486808..721b30100e4 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -115,7 +115,7 @@ public function testGetMetadataArray()
 
     public function testCanConstructLocalFeaturedImage()
     {
-        $image = new LocalFeaturedImage('_media/foo', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+        $image = new LocalFeaturedImage('_media/foo', ...$this->defaultArguments());
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertInstanceOf(FeaturedImage::class, $image);
 
@@ -127,7 +127,12 @@ public function testCannotConstructLocalFeaturedImageWithInvalidSource()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('LocalFeaturedImage source must start with _media/');
 
-        new LocalFeaturedImage('foo', 'alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl');
+        new LocalFeaturedImage('foo', ...$this->defaultArguments());
+    }
+
+    protected function defaultArguments(): array
+    {
+        return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];
     }
 }
 

From 9b94157263710eb953efa701e5d907ceabb8ba7e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:38:28 +0200
Subject: [PATCH 602/768] Add comment

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 ++
 packages/framework/tests/Feature/FeaturedImageTest.php          | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 9f061deb534..78580e48fd1 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -18,6 +18,8 @@ protected function setSource(string $source): void
             throw new InvalidArgumentException('LocalFeaturedImage source must start with _media/');
         }
 
+        // We could also validate the file exists here if we want. We might also want to just send a warning.
+
         $this->source = $source;
     }
 
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 721b30100e4..757896b4a39 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -129,7 +129,6 @@ public function testCannotConstructLocalFeaturedImageWithInvalidSource()
 
         new LocalFeaturedImage('foo', ...$this->defaultArguments());
     }
-
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From 870439e2d0e403904102f19d8da7af8ae710feba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:39:59 +0200
Subject: [PATCH 603/768] Get content length for the real path

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 78580e48fd1..54a81aa5c13 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use Hyde\Hyde;
 use InvalidArgumentException;
 use function str_starts_with;
 
@@ -30,6 +31,6 @@ public function getSource(): string
 
     public function getContentLength(): int
     {
-        return filesize($this->source);
+        return filesize(Hyde::path($this->source));
     }
 }

From 698d469fcc5a62f7bedcb83a645321a93d8dc083 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:40:05 +0200
Subject: [PATCH 604/768] Extract method

---
 .../Features/Blogging/Models/LocalFeaturedImage.php        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 54a81aa5c13..4a68034947b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -31,6 +31,11 @@ public function getSource(): string
 
     public function getContentLength(): int
     {
-        return filesize(Hyde::path($this->source));
+        return filesize($this->storagePath());
+    }
+
+    protected function storagePath(): string
+    {
+        return Hyde::path($this->source);
     }
 }

From a9cf0b15dbfbd6b9a67a93fc2335c2b628747c1d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:40:27 +0200
Subject: [PATCH 605/768] Format

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 757896b4a39..721b30100e4 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -129,6 +129,7 @@ public function testCannotConstructLocalFeaturedImageWithInvalidSource()
 
         new LocalFeaturedImage('foo', ...$this->defaultArguments());
     }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From 8601acf7041898c890c17fe99dbe5a507a6be794 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:41:42 +0200
Subject: [PATCH 606/768] Test GetContentLength

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 721b30100e4..031d02dac9d 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -113,6 +113,12 @@ public function testGetMetadataArray()
         ], (new FilledImage)->getMetadataArray());
     }
 
+    public function testGetContentLength()
+    {
+        $this->assertEquals(0, (new NullImage)->getContentLength());
+        $this->assertEquals(0, (new FilledImage)->getContentLength());
+    }
+
     public function testCanConstructLocalFeaturedImage()
     {
         $image = new LocalFeaturedImage('_media/foo', ...$this->defaultArguments());

From 3bb68cc9c8ca81ee8d8b7ee1cd6481ca17a4f9a3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:44:14 +0200
Subject: [PATCH 607/768] Add path helper that ensures file exists

---
 .../Features/Blogging/Models/LocalFeaturedImage.php   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 4a68034947b..0b1f6889fa0 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -38,4 +38,15 @@ protected function storagePath(): string
     {
         return Hyde::path($this->source);
     }
+
+    protected function storageValidatedPath(): string
+    {
+        $path = $this->storagePath();
+
+        if (! file_exists($path)) {
+            throw new InvalidArgumentException("Image at $this->source does not exist");
+        }
+
+        return $path;
+    }
 }

From 7cc5e9855b2a885a70c93b7083fa402e9f750cb1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:44:29 +0200
Subject: [PATCH 608/768] Get the real path

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 0b1f6889fa0..484cc24089e 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -31,7 +31,7 @@ public function getSource(): string
 
     public function getContentLength(): int
     {
-        return filesize($this->storagePath());
+        return filesize($this->storageValidatedPath());
     }
 
     protected function storagePath(): string

From 4c4faa8cf616af6cc2c06c5f99061671f77b955c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:44:48 +0200
Subject: [PATCH 609/768] Test with no source

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 031d02dac9d..2a7d4ad383e 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -136,6 +136,15 @@ public function testCannotConstructLocalFeaturedImageWithInvalidSource()
         new LocalFeaturedImage('foo', ...$this->defaultArguments());
     }
 
+    public function testFeaturedImageGetContentLengthWithNoSource()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Image at _media/foo does not exist');
+
+        $image = new LocalFeaturedImage('_media/foo', ...$this->defaultArguments());
+        $this->assertEquals(0, $image->getContentLength());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From ddcaf9593f14d7b4cf1bef7ccbfa44a38272e864 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:45:31 +0200
Subject: [PATCH 610/768] Test with source

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 2a7d4ad383e..6ec5a5c0448 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -136,6 +136,14 @@ public function testCannotConstructLocalFeaturedImageWithInvalidSource()
         new LocalFeaturedImage('foo', ...$this->defaultArguments());
     }
 
+    public function testFeaturedImageGetContentLength()
+    {
+        $this->file('_media/foo', 'image');
+
+        $image = new LocalFeaturedImage('_media/foo', ...$this->defaultArguments());
+        $this->assertEquals(5, $image->getContentLength());
+    }
+
     public function testFeaturedImageGetContentLengthWithNoSource()
     {
         $this->expectException(InvalidArgumentException::class);

From bf73a796fe7feeff41965ac611cd3822523b34e5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:45:48 +0200
Subject: [PATCH 611/768] Throw FileNotFoundException instead

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php  | 3 ++-
 packages/framework/tests/Feature/FeaturedImageTest.php         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 484cc24089e..80cab857157 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Hyde;
 use InvalidArgumentException;
 use function str_starts_with;
@@ -44,7 +45,7 @@ protected function storageValidatedPath(): string
         $path = $this->storagePath();
 
         if (! file_exists($path)) {
-            throw new InvalidArgumentException("Image at $this->source does not exist");
+            throw new FileNotFoundException("Image at $this->source does not exist");
         }
 
         return $path;
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 6ec5a5c0448..26b8d72117d 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
+use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Testing\TestCase;
@@ -146,7 +147,7 @@ public function testFeaturedImageGetContentLength()
 
     public function testFeaturedImageGetContentLengthWithNoSource()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException(FileNotFoundException::class);
         $this->expectExceptionMessage('Image at _media/foo does not exist');
 
         $image = new LocalFeaturedImage('_media/foo', ...$this->defaultArguments());

From b12c93cfc40e8b5f32e6c01ecc93262a4e6a3b4b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 12:46:16 +0200
Subject: [PATCH 612/768] Inline local variable

---
 .../Features/Blogging/Models/LocalFeaturedImage.php         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 80cab857157..78c4d73d97c 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -42,12 +42,10 @@ protected function storagePath(): string
 
     protected function storageValidatedPath(): string
     {
-        $path = $this->storagePath();
-
-        if (! file_exists($path)) {
+        if (! file_exists($this->storagePath())) {
             throw new FileNotFoundException("Image at $this->source does not exist");
         }
 
-        return $path;
+        return $this->storagePath();
     }
 }

From 360af84d7981100430a0ace95c950e96e95575e9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:05:50 +0200
Subject: [PATCH 613/768] Create RemoteFeaturedImage.php

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

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

From 546d266e9dfb150a56ba6d2e7af5dd0fb5a2d6de Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:06:20 +0200
Subject: [PATCH 614/768] Add method stubs

---
 .../Features/Blogging/Models/RemoteFeaturedImage.php   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 33504142106..990b184b5d5 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -6,5 +6,13 @@
 
 class RemoteFeaturedImage extends FeaturedImage
 {
-    //
+    public function getSource(): string
+    {
+        // TODO: Implement getSource() method.
+    }
+
+    public function getContentLength(): int
+    {
+        // TODO: Implement getContentLength() method.
+    }
 }

From 042870fcb35948d75788c52b5c06a1380df8f072 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:07:10 +0200
Subject: [PATCH 615/768] Add setSource method

---
 .../Blogging/Models/RemoteFeaturedImage.php        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 990b184b5d5..23a480d24b3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -4,8 +4,22 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use InvalidArgumentException;
+
 class RemoteFeaturedImage extends FeaturedImage
 {
+    protected readonly string $source;
+
+    protected function setSource(string $source): void
+    {
+        if (! str_starts_with($source, 'http')) {
+            // Throwing an exception here ensures we have a super predictable state.
+            throw new InvalidArgumentException('RemoteFeaturedImage source must start with http/https');
+        }
+
+        $this->source = $source;
+    }
+
     public function getSource(): string
     {
         // TODO: Implement getSource() method.

From 78e538f666420861096186b853e02cde1f6b3973 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:07:21 +0200
Subject: [PATCH 616/768] Implement getSource() method

---
 .../Framework/Features/Blogging/Models/RemoteFeaturedImage.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 23a480d24b3..f3315299a80 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -22,7 +22,7 @@ protected function setSource(string $source): void
 
     public function getSource(): string
     {
-        // TODO: Implement getSource() method.
+        return $this->source;
     }
 
     public function getContentLength(): int

From 437d5f7f291a878a68f7b95a92e8919a3be50614 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:07:34 +0200
Subject: [PATCH 617/768] Add temporary return value

---
 .../Framework/Features/Blogging/Models/RemoteFeaturedImage.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index f3315299a80..941393f63f2 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -28,5 +28,6 @@ public function getSource(): string
     public function getContentLength(): int
     {
         // TODO: Implement getContentLength() method.
+        return 0;
     }
 }

From 583eb77ea7578b774e4dc40087ef22e860824346 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:09:06 +0200
Subject: [PATCH 618/768] Test RemoteFeaturedImage constructor

---
 .../tests/Feature/FeaturedImageTest.php        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 26b8d72117d..5140f6eb016 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -7,6 +7,7 @@
 use Hyde\Framework\Exceptions\FileNotFoundException;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
 use Hyde\Testing\TestCase;
 use InvalidArgumentException;
 
@@ -154,6 +155,23 @@ public function testFeaturedImageGetContentLengthWithNoSource()
         $this->assertEquals(0, $image->getContentLength());
     }
 
+    public function testCanConstructRemoteFeaturedImage()
+    {
+        $image = new RemoteFeaturedImage('http/foo', ...$this->defaultArguments());
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
+
+        $this->assertEquals('http/foo', $image->getSource());
+    }
+
+    public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
+    {
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('RemoteFeaturedImage source must start with http/https');
+
+        new RemoteFeaturedImage('foo', ...$this->defaultArguments());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From 6c5e0b48a297e542dd5e345fdb795fa5cd757bff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:09:36 +0200
Subject: [PATCH 619/768] Update exception message

---
 .../Framework/Features/Blogging/Models/RemoteFeaturedImage.php  | 2 +-
 packages/framework/tests/Feature/FeaturedImageTest.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 941393f63f2..d01b53250be 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -14,7 +14,7 @@ protected function setSource(string $source): void
     {
         if (! str_starts_with($source, 'http')) {
             // Throwing an exception here ensures we have a super predictable state.
-            throw new InvalidArgumentException('RemoteFeaturedImage source must start with http/https');
+            throw new InvalidArgumentException('RemoteFeaturedImage source must be a valid url');
         }
 
         $this->source = $source;
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 5140f6eb016..c702fce9735 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -167,7 +167,7 @@ public function testCanConstructRemoteFeaturedImage()
     public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('RemoteFeaturedImage source must start with http/https');
+        $this->expectExceptionMessage('RemoteFeaturedImage source must be a valid url');
 
         new RemoteFeaturedImage('foo', ...$this->defaultArguments());
     }

From 6e35a000fd86cbf10ecd82a9804ed7aa1879cbb0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:09:53 +0200
Subject: [PATCH 620/768] Uppercase URL

---
 .../Framework/Features/Blogging/Models/RemoteFeaturedImage.php  | 2 +-
 packages/framework/tests/Feature/FeaturedImageTest.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index d01b53250be..8e1a3fbb184 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -14,7 +14,7 @@ protected function setSource(string $source): void
     {
         if (! str_starts_with($source, 'http')) {
             // Throwing an exception here ensures we have a super predictable state.
-            throw new InvalidArgumentException('RemoteFeaturedImage source must be a valid url');
+            throw new InvalidArgumentException('RemoteFeaturedImage source must be a valid URL');
         }
 
         $this->source = $source;
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index c702fce9735..9299f785602 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -167,7 +167,7 @@ public function testCanConstructRemoteFeaturedImage()
     public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
     {
         $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('RemoteFeaturedImage source must be a valid url');
+        $this->expectExceptionMessage('RemoteFeaturedImage source must be a valid URL');
 
         new RemoteFeaturedImage('foo', ...$this->defaultArguments());
     }

From e81390748bcdd6bd6cc40b43dc711854cbec1f91 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:11:07 +0200
Subject: [PATCH 621/768] Test it accepts HTTPS

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 9299f785602..add56c88baf 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -164,6 +164,15 @@ public function testCanConstructRemoteFeaturedImage()
         $this->assertEquals('http/foo', $image->getSource());
     }
 
+    public function testCanConstructRemoteFeaturedImageWithHttps()
+    {
+        $image = new RemoteFeaturedImage('https/foo', ...$this->defaultArguments());
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
+
+        $this->assertEquals('https/foo', $image->getSource());
+    }
+
     public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
     {
         $this->expectException(InvalidArgumentException::class);

From 6b03e235c2e4494d71e2872d5ecdb542a2ef5799 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:14:41 +0200
Subject: [PATCH 622/768] Implement getContentLength() method

---
 .../Blogging/Models/RemoteFeaturedImage.php   | 16 ++++++++-
 .../tests/Feature/FeaturedImageTest.php       | 35 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 8e1a3fbb184..6cec39a370a 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -4,7 +4,12 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
+use Illuminate\Support\Facades\Http;
 use InvalidArgumentException;
+use function array_flip;
+use function array_key_exists;
+use function config;
+use function key;
 
 class RemoteFeaturedImage extends FeaturedImage
 {
@@ -27,7 +32,16 @@ public function getSource(): string
 
     public function getContentLength(): int
     {
-        // TODO: Implement getContentLength() method.
+        $headers = Http::withHeaders([
+            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
+        ])->head($this->getSource())->headers();
+
+        if (array_key_exists('Content-Length', $headers)) {
+            return (int) key(array_flip($headers['Content-Length']));
+        }
+
+        // Here we could throw an exception if we want to be strict about this.
+
         return 0;
     }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index add56c88baf..79c54e16d39 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -9,6 +9,7 @@
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
 use Hyde\Testing\TestCase;
+use Illuminate\Support\Facades\Http;
 use InvalidArgumentException;
 
 /**
@@ -181,6 +182,40 @@ public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
         new RemoteFeaturedImage('foo', ...$this->defaultArguments());
     }
 
+    public function testFeaturedImageGetContentLengthWithRemoteSource()
+    {
+        Http::fake(function () {
+            return Http::response(null, 200, [
+                'Content-Length' => 16,
+            ]);
+        });
+
+        $image = new RemoteFeaturedImage('https://hyde.test/static/image.png', ...$this->defaultArguments());
+        $this->assertEquals(16, $image->getContentLength());
+    }
+
+    public function testFeaturedImageGetContentLengthWithRemoteSourceAndNotFoundResponse()
+    {
+        Http::fake(function () {
+            return Http::response(null, 404);
+        });
+
+        $image = new RemoteFeaturedImage('https://hyde.test/static/image.png', ...$this->defaultArguments());
+        $this->assertEquals(0, $image->getContentLength());
+    }
+
+    public function testFeaturedImageGetContentLengthWithRemoteSourceAndInvalidResponse()
+    {
+        Http::fake(function () {
+            return Http::response(null, 200, [
+                'Content-Length' => 'foo',
+            ]);
+        });
+
+        $image = new RemoteFeaturedImage('https://hyde.test/static/image.png', ...$this->defaultArguments());
+        $this->assertEquals(0, $image->getContentLength());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From 1189dca8606c1ec46ec9a92abb8b61f3efed8b18 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:19:28 +0200
Subject: [PATCH 623/768] Update comment

---
 .../Framework/Features/Blogging/Models/RemoteFeaturedImage.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 6cec39a370a..cf78f0fee6b 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -40,7 +40,7 @@ public function getContentLength(): int
             return (int) key(array_flip($headers['Content-Length']));
         }
 
-        // Here we could throw an exception if we want to be strict about this.
+        // Here we could throw an exception if we want to be strict about this, or add a warning.
 
         return 0;
     }

From 3564911364af62d77fd84a4118528bf6ec89b352 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Oct 2022 11:24:27 +0000
Subject: [PATCH 624/768] Apply fixes from StyleCI

---
 .../src/Framework/Features/Blogging/Models/FeaturedImage.php  | 3 ++-
 .../Features/Blogging/Models/RemoteFeaturedImage.php          | 4 ++--
 packages/framework/tests/Feature/FeaturedImageTest.php        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
index 21c73f13356..6978abd1ab3 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/FeaturedImage.php
@@ -4,8 +4,8 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use Stringable;
 use function method_exists;
+use Stringable;
 
 abstract class FeaturedImage implements Stringable
 {
@@ -42,6 +42,7 @@ public function __toString(): string
     /**
      * Get the source of the image, must be usable within the src attribute of an image tag,
      * and is thus not necessarily the path to the source image on disk.
+     *
      * @return string The image's url or path
      */
     abstract public function getSource(): string;
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index cf78f0fee6b..2c89c134503 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Framework\Features\Blogging\Models;
 
-use Illuminate\Support\Facades\Http;
-use InvalidArgumentException;
 use function array_flip;
 use function array_key_exists;
 use function config;
+use Illuminate\Support\Facades\Http;
+use InvalidArgumentException;
 use function key;
 
 class RemoteFeaturedImage extends FeaturedImage
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 79c54e16d39..ce1ca523b38 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -226,7 +226,7 @@ class NullImage extends FeaturedImage
 {
     public function __construct()
     {
-        parent::__construct('source',null, null, null, null, null, null, null);
+        parent::__construct('source', null, null, null, null, null, null, null);
     }
 
     public function getSource(): string

From 995d459e8d90633d2479d39cd56b6d7c9d8c4a15 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 13:31:20 +0200
Subject: [PATCH 625/768] Wrap to single line

---
 .../framework/resources/views/components/post/image.blade.php  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index c32e25e0d44..0a98af3710a 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -27,8 +27,7 @@
         @isset($image->license)
             <span>License</span>
             @isset($image->licenseUrl)
-                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener"
-                   itemprop="license">{{ $image->license }}</a>.
+                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener" itemprop="license">{{ $image->license }}</a>.
             @else
                 <span itemprop="license">{{ $image->license }}</span>.
             @endif

From c15c8271065010d79b1a57a05cc767f908a64472 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:23:51 +0200
Subject: [PATCH 626/768] Create FeaturedImageFactory.php

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

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

From aeafe3ed191a60b8977f4048ec37452cb2dff4d8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:24:07 +0200
Subject: [PATCH 627/768] Extends PageDataFactory, implements
 FeaturedImageSchema

---
 .../src/Framework/Factories/FeaturedImageFactory.php          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index ad096219b49..87fa852e329 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -4,7 +4,9 @@
 
 namespace Hyde\Framework\Factories;
 
-class FeaturedImageFactory
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+
+class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
     //
 }

From 93aa4588f56f2f2a8429b6e0887ef0f97339d036 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:25:19 +0200
Subject: [PATCH 628/768] Add schema constant

---
 .../framework/src/Framework/Factories/FeaturedImageFactory.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 87fa852e329..3504f5b66d6 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -8,5 +8,5 @@
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
-    //
+    public const SCHEMA = FeaturedImageSchema::FEATURED_IMAGE_SCHEMA;
 }

From f13014186c78168a97ba01cb53fdd2805aa1d699 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:28:33 +0200
Subject: [PATCH 629/768] Add required method stub

---
 .../src/Framework/Factories/FeaturedImageFactory.php         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 3504f5b66d6..8f3ab986de2 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -9,4 +9,9 @@
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
     public const SCHEMA = FeaturedImageSchema::FEATURED_IMAGE_SCHEMA;
+
+    public function toArray(): array
+    {
+        // TODO: Implement toArray() method.
+    }
 }

From 3b651f76cc3b4042cd22142228853f122a08a166 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:29:39 +0200
Subject: [PATCH 630/768] Add class properties

---
 .../src/Framework/Factories/FeaturedImageFactory.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 8f3ab986de2..159f41aa2dc 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -10,6 +10,14 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
 {
     public const SCHEMA = FeaturedImageSchema::FEATURED_IMAGE_SCHEMA;
 
+    protected readonly ?string $altText;
+    protected readonly ?string $titleText;
+    protected readonly ?string $authorName;
+    protected readonly ?string $authorUrl;
+    protected readonly ?string $copyrightText;
+    protected readonly ?string $licenseName;
+    protected readonly ?string $licenseUrl;
+
     public function toArray(): array
     {
         // TODO: Implement toArray() method.

From 77a463d6bdbf99c4b5988571e56bb321543b7896 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:30:37 +0200
Subject: [PATCH 631/768] Implement toArray() method.

---
 .../src/Framework/Factories/FeaturedImageFactory.php   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 159f41aa2dc..935124b2f18 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -20,6 +20,14 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
 
     public function toArray(): array
     {
-        // TODO: Implement toArray() method.
+        return [
+            'altText' => $this->altText,
+            'titleText' => $this->titleText,
+            'authorName' => $this->authorName,
+            'authorUrl' => $this->authorUrl,
+            'copyrightText' => $this->copyrightText,
+            'licenseName' => $this->licenseName,
+            'licenseUrl' => $this->licenseUrl,
+        ];
     }
 }

From b164dafb4e69cd2dd00144754b0119d7495dd3f4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:31:53 +0200
Subject: [PATCH 632/768] Add constructor

---
 .../src/Framework/Factories/FeaturedImageFactory.php  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 935124b2f18..d0f561157a2 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -18,6 +18,17 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
     protected readonly ?string $licenseName;
     protected readonly ?string $licenseUrl;
 
+    public function __construct()
+    {
+        $this->altText = $this->makeAltText();
+        $this->titleText = $this->makeTitleText();
+        $this->authorName = $this->makeAuthorName();
+        $this->authorUrl = $this->makeAuthorUrl();
+        $this->copyrightText = $this->makeCopyrightText();
+        $this->licenseName = $this->makeLicenseName();
+        $this->licenseUrl = $this->makeLicenseUrl();
+    }
+
     public function toArray(): array
     {
         return [

From 33afc45a32f5399f01fcba0ef2746cc5eb60755c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:32:39 +0200
Subject: [PATCH 633/768] Add method stubs

---
 .../Factories/FeaturedImageFactory.php        | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index d0f561157a2..994fd82fd7a 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -41,4 +41,39 @@ public function toArray(): array
             'licenseUrl' => $this->licenseUrl,
         ];
     }
+
+    protected function makeAltText(): ?string
+    {
+        return null;
+    }
+
+    protected function makeTitleText(): ?string
+    {
+        return null;
+    }
+
+    protected function makeAuthorName(): ?string
+    {
+        return null;
+    }
+
+    protected function makeAuthorUrl(): ?string
+    {
+        return null;
+    }
+
+    protected function makeCopyrightText(): ?string
+    {
+        return null;
+    }
+
+    protected function makeLicenseName(): ?string
+    {
+        return null;
+    }
+
+    protected function makeLicenseUrl(): ?string
+    {
+        return null;
+    }
 }

From d2a58563c5b5a7db81e12599f71a090fdd2efc38 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:36:08 +0200
Subject: [PATCH 634/768] Create FeaturedImageFactoryTest.php

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
new file mode 100644
index 00000000000..35161367f84
--- /dev/null
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Framework\Factories\FeaturedImageFactory;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Factories\FeaturedImageFactory
+ */
+class FeaturedImageFactoryTest extends TestCase
+{
+    //
+}

From e2ad4653a16dcb5b3d9833418904e195de3c12b0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:40:26 +0200
Subject: [PATCH 635/768] Factory needs to know front matter

---
 .../src/Framework/Factories/FeaturedImageFactory.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 994fd82fd7a..bee2a0cafd7 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -4,10 +4,14 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+use Hyde\Markdown\Models\FrontMatter;
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
+    use InteractsWithFrontMatter;
+
     public const SCHEMA = FeaturedImageSchema::FEATURED_IMAGE_SCHEMA;
 
     protected readonly ?string $altText;
@@ -18,7 +22,9 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
     protected readonly ?string $licenseName;
     protected readonly ?string $licenseUrl;
 
-    public function __construct()
+    public function __construct(
+        private readonly FrontMatter $matter,
+    )
     {
         $this->altText = $this->makeAltText();
         $this->titleText = $this->makeTitleText();

From 1efd4693a9a462b939ee2027cc0c2d82b3b0fb17 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:48:12 +0200
Subject: [PATCH 636/768] Implement the factory

---
 .../Factories/FeaturedImageFactory.php        | 14 ++++-----
 .../Feature/FeaturedImageFactoryTest.php      | 30 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index bee2a0cafd7..4e8392c0999 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -50,36 +50,36 @@ public function toArray(): array
 
     protected function makeAltText(): ?string
     {
-        return null;
+        return $this->matter('description');
     }
 
     protected function makeTitleText(): ?string
     {
-        return null;
+        return $this->matter('title');
     }
 
     protected function makeAuthorName(): ?string
     {
-        return null;
+        return $this->matter('author');
     }
 
     protected function makeAuthorUrl(): ?string
     {
-        return null;
+        return $this->matter('attributionUrl');
     }
 
     protected function makeCopyrightText(): ?string
     {
-        return null;
+        return $this->matter('copyright');
     }
 
     protected function makeLicenseName(): ?string
     {
-        return null;
+        return $this->matter('license');
     }
 
     protected function makeLicenseUrl(): ?string
     {
-        return null;
+        return $this->matter('licenseUrl');
     }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 35161367f84..0ddd9f859a4 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Factories\FeaturedImageFactory;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Testing\TestCase;
 
 /**
@@ -12,5 +13,32 @@
  */
 class FeaturedImageFactoryTest extends TestCase
 {
-    //
+    public function testWithDataFromSchema()
+    {
+        $array = [
+            'path' => 'path',
+            'url' => 'url',
+            'description' => 'description',
+            'title' => 'title',
+            'copyright' => 'copyright',
+            'license' => 'license',
+            'licenseUrl' => 'licenseUrl',
+            'author' => 'author',
+            'attributionUrl' => 'attributionUrl',
+        ];
+
+        $expected = [
+            'altText' => 'description',
+            'titleText' => 'title',
+            'authorName' => 'author',
+            'authorUrl' => 'attributionUrl',
+            'copyrightText' => 'copyright',
+            'licenseName' => 'license',
+            'licenseUrl' => 'licenseUrl',
+        ];
+
+        $factory = new FeaturedImageFactory(new FrontMatter($array));
+
+        $this->assertSame($expected, $factory->toArray());
+    }
 }

From b043824f28484ab99617a020b445ea55866cf411 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:52:17 +0200
Subject: [PATCH 637/768] Sketch out make method

---
 .../Factories/FeaturedImageFactory.php        |  8 ++++++
 .../Feature/FeaturedImageFactoryTest.php      | 25 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 4e8392c0999..f95b7dbdc57 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 
@@ -48,6 +49,13 @@ public function toArray(): array
         ];
     }
 
+    public static function make(FrontMatter $matter): FeaturedImage
+    {
+        $data = (new static($matter))->toArray();
+
+        // Todo: Return the proper image type
+    }
+
     protected function makeAltText(): ?string
     {
         return $this->matter('description');
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 0ddd9f859a4..9c51402c06e 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -41,4 +41,29 @@ public function testWithDataFromSchema()
 
         $this->assertSame($expected, $factory->toArray());
     }
+
+    public function testMakeMethodCreatesLocalImageWhenPathIsSet()
+    {
+        
+    }
+
+    public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
+    {
+        
+    }
+
+    public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
+    {
+
+    }
+
+    public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
+    {
+        
+    }
+
+    public function testMakeMethodCanCreateImageFromJustString()
+    {
+        
+    }
 }

From ca4d1dcc06e05d3d25e50b0b4435a8689e6d752c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:57:26 +0200
Subject: [PATCH 638/768] Fix whoopsie: front matter keys must obviously be
 prefixed with image

---
 .../Factories/FeaturedImageFactory.php         | 14 +++++++-------
 .../tests/Feature/FeaturedImageFactoryTest.php | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index f95b7dbdc57..69a86d105a6 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -58,36 +58,36 @@ public static function make(FrontMatter $matter): FeaturedImage
 
     protected function makeAltText(): ?string
     {
-        return $this->matter('description');
+        return $this->matter('image.description');
     }
 
     protected function makeTitleText(): ?string
     {
-        return $this->matter('title');
+        return $this->matter('image.title');
     }
 
     protected function makeAuthorName(): ?string
     {
-        return $this->matter('author');
+        return $this->matter('image.author');
     }
 
     protected function makeAuthorUrl(): ?string
     {
-        return $this->matter('attributionUrl');
+        return $this->matter('image.attributionUrl');
     }
 
     protected function makeCopyrightText(): ?string
     {
-        return $this->matter('copyright');
+        return $this->matter('image.copyright');
     }
 
     protected function makeLicenseName(): ?string
     {
-        return $this->matter('license');
+        return $this->matter('image.license');
     }
 
     protected function makeLicenseUrl(): ?string
     {
-        return $this->matter('licenseUrl');
+        return $this->matter('image.licenseUrl');
     }
 }
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 9c51402c06e..44bc6052709 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -16,15 +16,15 @@ class FeaturedImageFactoryTest extends TestCase
     public function testWithDataFromSchema()
     {
         $array = [
-            'path' => 'path',
-            'url' => 'url',
-            'description' => 'description',
-            'title' => 'title',
-            'copyright' => 'copyright',
-            'license' => 'license',
-            'licenseUrl' => 'licenseUrl',
-            'author' => 'author',
-            'attributionUrl' => 'attributionUrl',
+            'image.path' => 'path',
+            'image.url' => 'url',
+            'image.description' => 'description',
+            'image.title' => 'title',
+            'image.copyright' => 'copyright',
+            'image.license' => 'license',
+            'image.licenseUrl' => 'licenseUrl',
+            'image.author' => 'author',
+            'image.attributionUrl' => 'attributionUrl',
         ];
 
         $expected = [

From a196c0a838b729f5f771deee12d79232bc206020 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:58:24 +0200
Subject: [PATCH 639/768] Add source property

---
 .../src/Framework/Factories/FeaturedImageFactory.php       | 7 +++++++
 .../framework/tests/Feature/FeaturedImageFactoryTest.php   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 69a86d105a6..13d0615a01c 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -15,6 +15,7 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
 
     public const SCHEMA = FeaturedImageSchema::FEATURED_IMAGE_SCHEMA;
 
+    protected readonly string $source;
     protected readonly ?string $altText;
     protected readonly ?string $titleText;
     protected readonly ?string $authorName;
@@ -27,6 +28,7 @@ public function __construct(
         private readonly FrontMatter $matter,
     )
     {
+        $this->source = $this->makeSource();
         $this->altText = $this->makeAltText();
         $this->titleText = $this->makeTitleText();
         $this->authorName = $this->makeAuthorName();
@@ -56,6 +58,11 @@ public static function make(FrontMatter $matter): FeaturedImage
         // Todo: Return the proper image type
     }
 
+    protected function makeSource(): string
+    {
+        // 
+    }
+
     protected function makeAltText(): ?string
     {
         return $this->matter('image.description');
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 44bc6052709..3d2908015f1 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -28,6 +28,7 @@ public function testWithDataFromSchema()
         ];
 
         $expected = [
+            'source' => 'url',
             'altText' => 'description',
             'titleText' => 'title',
             'authorName' => 'author',

From 968a34ed091d0b20575282191898f0ce41054728 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:59:47 +0200
Subject: [PATCH 640/768] Dynamically set the source

---
 .../Framework/Factories/FeaturedImageFactory.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 13d0615a01c..e7d313cd237 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -8,6 +8,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
+use function is_string;
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
@@ -60,7 +61,20 @@ public static function make(FrontMatter $matter): FeaturedImage
 
     protected function makeSource(): string
     {
-        // 
+        if (is_string($this->matter('image')))
+        {
+            return $this->matter('image');
+        }
+
+        if ($this->matter('image.url') !== null)
+        {
+            return $this->matter('image.url');
+        }
+
+        if ($this->matter('image.path') !== null)
+        {
+            return $this->matter('image.path');
+        }
     }
 
     protected function makeAltText(): ?string

From 799589b01136cecf925d3f6b9fc5eda3c54614f0 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 14:59:56 +0200
Subject: [PATCH 641/768] Throw RuntimeException if no source is set

---
 .../src/Framework/Factories/FeaturedImageFactory.php          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index e7d313cd237..b8bd7391a30 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -8,6 +8,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
+use RuntimeException;
 use function is_string;
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
@@ -75,6 +76,9 @@ protected function makeSource(): string
         {
             return $this->matter('image.path');
         }
+
+        // Todo, we might want to add a note about which file caused the error
+        throw new RuntimeException('No featured image source was found');
     }
 
     protected function makeAltText(): ?string

From 8b73fa05638fc680a56a0aa045d81e65c3811625 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:33:33 +0200
Subject: [PATCH 642/768] Return the proper image type

---
 .../src/Framework/Factories/FeaturedImageFactory.php     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index b8bd7391a30..54d353b4695 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -6,10 +6,13 @@
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use RuntimeException;
 use function is_string;
+use function str_starts_with;
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
 {
@@ -57,7 +60,11 @@ public static function make(FrontMatter $matter): FeaturedImage
     {
         $data = (new static($matter))->toArray();
 
-        // Todo: Return the proper image type
+        if (str_starts_with($data['source'], 'http')) {
+            return new RemoteFeaturedImage(...$data);
+        }
+
+        return new LocalFeaturedImage(...$data);
     }
 
     protected function makeSource(): string

From 299800637bfb96bebce877b8509294458058bca1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:34:11 +0200
Subject: [PATCH 643/768] Source needs to be added to array

---
 .../framework/src/Framework/Factories/FeaturedImageFactory.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 54d353b4695..e7211a0417e 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -46,6 +46,7 @@ public function __construct(
     public function toArray(): array
     {
         return [
+            'source' => $this->source,
             'altText' => $this->altText,
             'titleText' => $this->titleText,
             'authorName' => $this->authorName,

From b612fdd107f5a90d8aa2959c99e5012f07d51aae Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:35:39 +0200
Subject: [PATCH 644/768] Normalize the local source path

---
 .../Factories/FeaturedImageFactory.php         | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index e7211a0417e..5a40fd9a4b3 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -8,6 +8,7 @@
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
+use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use RuntimeException;
@@ -82,7 +83,7 @@ protected function makeSource(): string
 
         if ($this->matter('image.path') !== null)
         {
-            return $this->matter('image.path');
+            return $this->normalizeLocalImagePath($this->matter('image.path'));
         }
 
         // Todo, we might want to add a note about which file caused the error
@@ -123,4 +124,19 @@ protected function makeLicenseUrl(): ?string
     {
         return $this->matter('image.licenseUrl');
     }
+
+    protected static function normalizeLocalImagePath(string $path): string
+    {
+        $path = Hyde::pathToRelative($path);
+
+        if (str_starts_with($path, '_media/')) {
+            return $path;
+        }
+
+        if (str_starts_with($path, 'media/')) {
+            return '_'.$path;
+        }
+
+        return '_media/'.$path;
+    }
 }

From 555455edb6887cbaff3bbaa43c7bc77451abcdc4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:35:55 +0200
Subject: [PATCH 645/768] Update FeaturedImageFactoryTest.php

---
 .../framework/tests/Feature/FeaturedImageFactoryTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 3d2908015f1..c8a8a9a5d68 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Factories\FeaturedImageFactory;
+use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Testing\TestCase;
 
@@ -45,7 +46,13 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        
+        $array = [
+            'image.path' => 'path',
+        ];
+
+        $factory = FeaturedImageFactory::make(new FrontMatter($array));
+
+        $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()

From 907fa06d4b07d28d342b7ab8cdd603c21d50ee7b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:36:26 +0200
Subject: [PATCH 646/768] Inline variables

---
 .../tests/Feature/FeaturedImageFactoryTest.php       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index c8a8a9a5d68..5dc7f4ff484 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -46,13 +46,11 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        $array = [
-            'image.path' => 'path',
-        ];
-
-        $factory = FeaturedImageFactory::make(new FrontMatter($array));
-
-        $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
+        $this->assertInstanceOf(LocalFeaturedImage::class,
+            FeaturedImageFactory::make(new FrontMatter([
+                'image.path' => 'path',
+            ])
+        ));
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()

From 015d22c2c096381b768f1f74537e0257f563ab28 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:37:00 +0200
Subject: [PATCH 647/768] Revert "Inline variables"

This reverts commit 907fa06d4b07d28d342b7ab8cdd603c21d50ee7b.
---
 .../tests/Feature/FeaturedImageFactoryTest.php       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 5dc7f4ff484..c8a8a9a5d68 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -46,11 +46,13 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        $this->assertInstanceOf(LocalFeaturedImage::class,
-            FeaturedImageFactory::make(new FrontMatter([
-                'image.path' => 'path',
-            ])
-        ));
+        $array = [
+            'image.path' => 'path',
+        ];
+
+        $factory = FeaturedImageFactory::make(new FrontMatter($array));
+
+        $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()

From b6925b79991e0498394399e56cb8f9fb411256ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:37:14 +0200
Subject: [PATCH 648/768] Inline only single variable

---
 .../framework/tests/Feature/FeaturedImageFactoryTest.php    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index c8a8a9a5d68..4adc9e5517c 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -46,11 +46,9 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        $array = [
+        $factory = FeaturedImageFactory::make(new FrontMatter([
             'image.path' => 'path',
-        ];
-
-        $factory = FeaturedImageFactory::make(new FrontMatter($array));
+        ]));
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
     }

From d5b6037e7aa16469d5d6dac01df3d000d0fce3b7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:41:16 +0200
Subject: [PATCH 649/768] Invert logic to check on normalized data

---
 .../src/Framework/Factories/FeaturedImageFactory.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 5a40fd9a4b3..5b5daa2328d 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -62,11 +62,11 @@ public static function make(FrontMatter $matter): FeaturedImage
     {
         $data = (new static($matter))->toArray();
 
-        if (str_starts_with($data['source'], 'http')) {
-            return new RemoteFeaturedImage(...$data);
+        if (str_starts_with($data['source'], '_media')) {
+            return new LocalFeaturedImage(...$data);
         }
 
-        return new LocalFeaturedImage(...$data);
+        return new RemoteFeaturedImage(...$data);
     }
 
     protected function makeSource(): string

From 0f08b6195ad68034c706aeb679bf0b3cebb19e42 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:44:33 +0200
Subject: [PATCH 650/768] No longer validate if remote image starts with http

---
 .../Features/Blogging/Models/RemoteFeaturedImage.php      | 5 +----
 packages/framework/tests/Feature/FeaturedImageTest.php    | 8 +++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index 2c89c134503..bbbb549220f 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -17,10 +17,7 @@ class RemoteFeaturedImage extends FeaturedImage
 
     protected function setSource(string $source): void
     {
-        if (! str_starts_with($source, 'http')) {
-            // Throwing an exception here ensures we have a super predictable state.
-            throw new InvalidArgumentException('RemoteFeaturedImage source must be a valid URL');
-        }
+        // Here we can validate the source URL if we want.
 
         $this->source = $source;
     }
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index ce1ca523b38..f3b0e0b5f3b 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -174,12 +174,10 @@ public function testCanConstructRemoteFeaturedImageWithHttps()
         $this->assertEquals('https/foo', $image->getSource());
     }
 
-    public function testCannotConstructRemoteFeaturedImageWithInvalidSource()
+    public function testCanConstructRemoteFeaturedImageWithInvalidSource()
     {
-        $this->expectException(InvalidArgumentException::class);
-        $this->expectExceptionMessage('RemoteFeaturedImage source must be a valid URL');
-
-        new RemoteFeaturedImage('foo', ...$this->defaultArguments());
+        $image = new RemoteFeaturedImage('foo', ...$this->defaultArguments());
+        $this->assertEquals('foo', $image->getSource());
     }
 
     public function testFeaturedImageGetContentLengthWithRemoteSource()

From 4b843c6818a4a537c629629d1be946be73278a05 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:45:49 +0200
Subject: [PATCH 651/768] Implement the test stubs

---
 .../Feature/FeaturedImageFactoryTest.php      | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 4adc9e5517c..d83c06f581b 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -6,8 +6,10 @@
 
 use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Testing\TestCase;
+use RuntimeException;
 
 /**
  * @covers \Hyde\Framework\Factories\FeaturedImageFactory
@@ -55,21 +57,36 @@ public function testMakeMethodCreatesLocalImageWhenPathIsSet()
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
     {
-        
+        $factory = FeaturedImageFactory::make(new FrontMatter([
+            'image.url' => 'url',
+        ]));
+
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
     }
 
     public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
     {
+        $factory = FeaturedImageFactory::make(new FrontMatter([
+            'image.url' => 'url',
+            'image.path' => 'path',
+        ]));
 
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
     }
 
     public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
     {
-        
+        $this->expectException(RuntimeException::class);
+
+        FeaturedImageFactory::make(new FrontMatter([]));
     }
 
     public function testMakeMethodCanCreateImageFromJustString()
     {
-        
+        $factory = FeaturedImageFactory::make(new FrontMatter([
+            'image' => 'foo',
+        ]));
+
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
     }
 }

From 74585aed9aaf84a5fa7cccc5d1d8a3143e491e60 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:46:54 +0200
Subject: [PATCH 652/768] Add content assertions

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index d83c06f581b..64d5c015637 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -53,6 +53,7 @@ public function testMakeMethodCreatesLocalImageWhenPathIsSet()
         ]));
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
+        $this->assertSame('_media/path', $factory->getSource());
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
@@ -62,6 +63,7 @@ public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
         ]));
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
+        $this->assertSame('url', $factory->getSource());
     }
 
     public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
@@ -72,6 +74,7 @@ public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
         ]));
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
+        $this->assertSame('url', $factory->getSource());
     }
 
     public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
@@ -88,5 +91,6 @@ public function testMakeMethodCanCreateImageFromJustString()
         ]));
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
+        $this->assertSame('foo', $factory->getSource());
     }
 }

From b90be86138a0620934d4bc9d3962ae71e01a42d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 15:47:14 +0200
Subject: [PATCH 653/768] Fix local variable name

---
 .../Feature/FeaturedImageFactoryTest.php      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 64d5c015637..ff89baa4cb4 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -48,33 +48,33 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        $factory = FeaturedImageFactory::make(new FrontMatter([
+        $image = FeaturedImageFactory::make(new FrontMatter([
             'image.path' => 'path',
         ]));
 
-        $this->assertInstanceOf(LocalFeaturedImage::class, $factory);
-        $this->assertSame('_media/path', $factory->getSource());
+        $this->assertInstanceOf(LocalFeaturedImage::class, $image);
+        $this->assertSame('_media/path', $image->getSource());
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
     {
-        $factory = FeaturedImageFactory::make(new FrontMatter([
+        $image = FeaturedImageFactory::make(new FrontMatter([
             'image.url' => 'url',
         ]));
 
-        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
-        $this->assertSame('url', $factory->getSource());
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertSame('url', $image->getSource());
     }
 
     public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
     {
-        $factory = FeaturedImageFactory::make(new FrontMatter([
+        $image = FeaturedImageFactory::make(new FrontMatter([
             'image.url' => 'url',
             'image.path' => 'path',
         ]));
 
-        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
-        $this->assertSame('url', $factory->getSource());
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertSame('url', $image->getSource());
     }
 
     public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
@@ -86,11 +86,11 @@ public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
 
     public function testMakeMethodCanCreateImageFromJustString()
     {
-        $factory = FeaturedImageFactory::make(new FrontMatter([
+        $image = FeaturedImageFactory::make(new FrontMatter([
             'image' => 'foo',
         ]));
 
-        $this->assertInstanceOf(RemoteFeaturedImage::class, $factory);
-        $this->assertSame('foo', $factory->getSource());
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertSame('foo', $image->getSource());
     }
 }

From c6af53efff24316630d6ed0a362ed2d3ceca6e99 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Oct 2022 13:47:24 +0000
Subject: [PATCH 654/768] Apply fixes from StyleCI

---
 .../Framework/Factories/FeaturedImageFactory.php   | 14 +++++---------
 .../Blogging/Models/RemoteFeaturedImage.php        |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 5b5daa2328d..2735d076b46 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -11,8 +11,8 @@
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
 use Hyde\Markdown\Models\FrontMatter;
-use RuntimeException;
 use function is_string;
+use RuntimeException;
 use function str_starts_with;
 
 class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedImageSchema
@@ -32,8 +32,7 @@ class FeaturedImageFactory extends Concerns\PageDataFactory implements FeaturedI
 
     public function __construct(
         private readonly FrontMatter $matter,
-    )
-    {
+    ) {
         $this->source = $this->makeSource();
         $this->altText = $this->makeAltText();
         $this->titleText = $this->makeTitleText();
@@ -71,18 +70,15 @@ public static function make(FrontMatter $matter): FeaturedImage
 
     protected function makeSource(): string
     {
-        if (is_string($this->matter('image')))
-        {
+        if (is_string($this->matter('image'))) {
             return $this->matter('image');
         }
 
-        if ($this->matter('image.url') !== null)
-        {
+        if ($this->matter('image.url') !== null) {
             return $this->matter('image.url');
         }
 
-        if ($this->matter('image.path') !== null)
-        {
+        if ($this->matter('image.path') !== null) {
             return $this->normalizeLocalImagePath($this->matter('image.path'));
         }
 
diff --git a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
index bbbb549220f..0a42df2afd7 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/RemoteFeaturedImage.php
@@ -8,7 +8,6 @@
 use function array_key_exists;
 use function config;
 use Illuminate\Support\Facades\Http;
-use InvalidArgumentException;
 use function key;
 
 class RemoteFeaturedImage extends FeaturedImage

From aabfd315bc185aa111853f1061cbae2cc948c867 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 16:44:49 +0200
Subject: [PATCH 655/768] Delete LegacyFeaturedImage.php

---
 .../Blogging/Models/LegacyFeaturedImage.php   | 240 ------------------
 1 file changed, 240 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php
deleted file mode 100644
index f91252cbfc2..00000000000
--- a/packages/framework/src/Framework/Features/Blogging/Models/LegacyFeaturedImage.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Features\Blogging\Models;
-
-use function array_flip;
-use function array_key_exists;
-use BadMethodCallException;
-use function config;
-use function file_exists;
-use Hyde\Hyde;
-use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Str;
-use function key;
-use Stringable;
-
-/**
- * Holds the information for an image, and contains helper methods for generating fluent HTML around it.
- *
- * $schema = [
- *    'path'         => '?string',
- *    'url'          => '?string',
- *    'description'  => '?string',
- *    'title'        => '?string',
- *    'copyright'    => '?string',
- *    'license'      => '?string',
- *    'licenseUrl'   => '?string',
- *    'author'       => '?string',
- *    'attributionUrl' => '?string'
- * ];
- *
- * @see \Hyde\Framework\Testing\Feature\ImageModelTest
- * @phpstan-consistent-constructor
- */
-class LegacyFeaturedImage implements FeaturedImageSchema, Stringable
-{
-    /**
-     * The image's path if it's stored locally.
-     * The image must be stored in the _media directory.
-     *
-     * It no longer matters if you add the _media/ prefix or not,
-     * as it will be normalized to have the prefix stripped.
-     *
-     * @example image.jpg.
-     * @example _media/image.jpg. (will be normalized to image.jpg)
-     */
-    public ?string $path;
-
-    /**
-     * The image's URL if it's stored remotely.
-     * Will override the path property if both are set.
-     *
-     * @example https://example.com/media/image.jpg
-     */
-    public ?string $url;
-
-    /**
-     * The image's description. (Used for alt text for screen readers.)
-     * You should always set this to provide accessibility.
-     *
-     * @example "This is an image of a cat sitting in a basket.".
-     */
-    public ?string $description;
-
-    /**
-     * The image's title. (Shows a tooltip on hover.).
-     *
-     * @example "My Cat Archer".
-     */
-    public ?string $title;
-
-    /**
-     * The image's copyright information.
-     *
-     * @example "Copyright (c) 2020 John Doe".
-     */
-    public ?string $copyright;
-
-    /**
-     * The image's license name.
-     *
-     * @example "CC BY-NC-SA 4.0".
-     */
-    public ?string $license;
-
-    /**
-     * The image's license URL.
-     *
-     * @example "https://creativecommons.org/licenses/by-nc-sa/4.0/".
-     */
-    public ?string $licenseUrl;
-
-    /**
-     * The image's author/photographer.
-     *
-     * @example "John Doe".
-     */
-    public ?string $author;
-
-    /**
-     * Link to the image author/source (for attribution/credit).
-     * When added, the rendered $author's name will link to this URL.
-     *
-     * @note This was previously called "credit" but was renamed to "attributionUrl" for clarity.
-     *
-     * @example "https://unsplash.com/photos/example".
-     */
-    public ?string $attributionUrl = null;
-
-    /**
-     * @var string The path to the image in the _media directory, relative to the root of the site.
-     *
-     * @example "_media/image.jpg".
-     */
-    protected string $sourcePath;
-
-    public function __construct(array $data = [])
-    {
-        foreach ($data as $key => $value) {
-            $this->{$key} = $value;
-        }
-
-        if (isset($this->path)) {
-            $this->sourcePath = static::normalizeSourcePath($this->path);
-            $this->path = Str::after($this->sourcePath, '_media/');
-        }
-    }
-
-    /** Dynamically create an image based on string or front matter array */
-    public static function make(string|array $data): static
-    {
-        if (is_string($data)) {
-            return static::fromSource($data);
-        }
-
-        return new static($data);
-    }
-
-    public static function fromSource(string $image): static
-    {
-        return str_starts_with($image, 'http')
-            ? new static(['url' => $image])
-            : new static(['path' => $image]);
-    }
-
-    /** @inheritDoc */
-    public function __toString()
-    {
-        return $this->getLink();
-    }
-
-    public function getSource(): string
-    {
-        return $this->url ?? $this->getPath() ?? throw new BadMethodCallException('Attempting to get source from Image that has no source.');
-    }
-
-    public function getLink(): string
-    {
-        return Hyde::image($this->getSource());
-    }
-
-    public function getPath(): ?string
-    {
-        return $this->path ?? null;
-    }
-
-    public function getSourcePath(): ?string
-    {
-        return $this->sourcePath ?? null;
-    }
-
-    public function getContentLength(): int
-    {
-        return (str_starts_with($this->getSource(), 'http')
-            ? $this->getContentLengthFromRemote()
-            : $this->getLocalContentLength()) ?? 0;
-    }
-
-    /**
-     * Used in resources/views/components/post/image.blade.php to add meta tags with itemprop attributes.
-     *
-     * @return array
-     */
-    public function getMetadataArray(): array
-    {
-        $metadata = [];
-
-        if (isset($this->description)) {
-            $metadata['text'] = $this->description;
-        }
-
-        if (isset($this->title)) {
-            $metadata['name'] = $this->title;
-        }
-
-        $metadata['url'] = $this->getLink();
-        $metadata['contentUrl'] = $this->getLink();
-
-        return $metadata;
-    }
-
-    protected function getContentLengthFromRemote(): ?int
-    {
-        $headers = Http::withHeaders([
-            'User-Agent' => config('hyde.http_user_agent', 'RSS Request Client'),
-        ])->head($this->getSource())->headers();
-
-        if (array_key_exists('Content-Length', $headers)) {
-            return (int) key(array_flip($headers['Content-Length']));
-        }
-
-        return null;
-    }
-
-    protected function getLocalContentLength(): ?int
-    {
-        if (isset($this->sourcePath) && file_exists(Hyde::path($this->getSourcePath()))) {
-            return filesize(Hyde::path($this->getSourcePath()));
-        }
-
-        return null;
-    }
-
-    protected static function normalizeSourcePath(string $path): string
-    {
-        $path = Hyde::pathToRelative($path);
-
-        if (str_starts_with($path, '_media/')) {
-            return $path;
-        }
-
-        if (str_starts_with($path, 'media/')) {
-            return '_'.$path;
-        }
-
-        return '_media/'.$path;
-    }
-}

From 85cbb706d438463f3596d5e18afd96d31a4d53fb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 16:45:30 +0200
Subject: [PATCH 656/768] Delete FeaturedImageModelTest.php

---
 .../tests/Feature/FeaturedImageModelTest.php  | 302 ------------------
 1 file changed, 302 deletions(-)
 delete mode 100644 packages/framework/tests/Feature/FeaturedImageModelTest.php

diff --git a/packages/framework/tests/Feature/FeaturedImageModelTest.php b/packages/framework/tests/Feature/FeaturedImageModelTest.php
deleted file mode 100644
index 2f5296f4063..00000000000
--- a/packages/framework/tests/Feature/FeaturedImageModelTest.php
+++ /dev/null
@@ -1,302 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Testing\Feature;
-
-use BadMethodCallException;
-use function file_put_contents;
-use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Facades\Http;
-use function unlink;
-
-/**
- * @deprecated
- * @covers \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage
- */
-class FeaturedImageModelTest extends TestCase
-{
-    public function test_can_construct_new_image()
-    {
-        $image = new LegacyFeaturedImage();
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
-    }
-
-    public function test_make_can_create_an_image_based_on_string()
-    {
-        $image = LegacyFeaturedImage::make('foo');
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
-        $this->assertEquals('foo', $image->path);
-    }
-
-    public function test_make_can_create_an_image_based_on_array()
-    {
-        $image = LegacyFeaturedImage::make([
-            'path' => 'foo',
-            'title' => 'bar',
-        ]);
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
-        $this->assertEquals('foo', $image->path);
-        $this->assertEquals('bar', $image->title);
-    }
-
-    public function test_image_path_is_normalized_to_never_begin_with_media_prefix()
-    {
-        $image = LegacyFeaturedImage::make('foo');
-        $this->assertSame('foo', $image->path);
-
-        $image = LegacyFeaturedImage::make('_media/foo');
-        $this->assertSame('foo', $image->path);
-
-        $image = LegacyFeaturedImage::make('_media/foo');
-        $this->assertSame('foo', $image->path);
-    }
-
-    public function test_image_source_path_is_normalized_to_always_begin_with_media_prefix()
-    {
-        $image = LegacyFeaturedImage::make('foo');
-        $this->assertSame('_media/foo', $image->getSourcePath());
-
-        $image = LegacyFeaturedImage::make('_media/foo');
-        $this->assertSame('_media/foo', $image->getSourcePath());
-
-        $image = LegacyFeaturedImage::make('_media/foo');
-        $this->assertSame('_media/foo', $image->getSourcePath());
-    }
-
-    public function test_from_source_automatically_assigns_proper_property_depending_on_if_the_string_is_remote()
-    {
-        $image = LegacyFeaturedImage::fromSource('https://example.com/image.jpg');
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
-        $this->assertEquals('https://example.com/image.jpg', $image->url);
-
-        $image = LegacyFeaturedImage::fromSource('image.jpg');
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
-        $this->assertEquals('image.jpg', $image->path);
-    }
-
-    public function test_array_data_can_be_used_to_initialize_properties_in_constructor()
-    {
-        $data = [
-            'path' => 'image.jpg',
-            'url' => 'https://example.com/image.jpg',
-            'description' => 'This is an image',
-            'title' => 'LegacyFeaturedImage Title',
-        ];
-
-        $image = new LegacyFeaturedImage($data);
-
-        $this->assertEquals($data['path'], $image->path);
-        $this->assertEquals($data['url'], $image->url);
-        $this->assertEquals($data['description'], $image->description);
-        $this->assertEquals($data['title'], $image->title);
-    }
-
-    public function test_get_source_method_returns_url_when_both_url_and_path_is_set()
-    {
-        $image = new LegacyFeaturedImage();
-        $image->url = 'https://example.com/image.jpg';
-        $image->path = 'image.jpg';
-
-        $this->assertEquals('https://example.com/image.jpg', $image->getSource());
-    }
-
-    public function test_get_source_method_returns_path_when_only_path_is_set()
-    {
-        $image = new LegacyFeaturedImage();
-        $image->path = 'image.jpg';
-
-        $this->assertEquals('image.jpg', $image->getSource());
-    }
-
-    public function test_get_source_method_throws_exception_when_no_source_is_set()
-    {
-        $image = new LegacyFeaturedImage();
-
-        $this->expectException(BadMethodCallException::class);
-        $this->expectExceptionMessage('Attempting to get source from Image that has no source.');
-        $image->getSource();
-    }
-
-    public function test_get_source_method_does_not_throw_exception_when_path_is_set()
-    {
-        $image = new LegacyFeaturedImage();
-        $image->path = 'image.jpg';
-        $this->assertEquals('image.jpg', $image->getSource());
-    }
-
-    public function test_get_source_method_does_not_throw_exception_when_url_is_set()
-    {
-        $image = new LegacyFeaturedImage();
-        $image->url = 'https://example.com/image.jpg';
-        $this->assertEquals('https://example.com/image.jpg', $image->getSource());
-    }
-
-    public function test_get_metadata_array()
-    {
-        $image = new LegacyFeaturedImage([
-            'description' => 'foo',
-            'title' => 'bar',
-            'path' => 'image.jpg',
-        ]);
-
-        $this->assertEquals([
-            'text' => 'foo',
-            'name' => 'bar',
-            'url' => 'media/image.jpg',
-            'contentUrl' => 'media/image.jpg',
-        ], $image->getMetadataArray());
-    }
-
-    public function test_get_metadata_array_with_remote_url()
-    {
-        $image = new LegacyFeaturedImage([
-            'url' => 'https://foo/bar',
-        ]);
-
-        $this->assertEquals([
-            'url' => 'https://foo/bar',
-            'contentUrl' => 'https://foo/bar',
-        ], $image->getMetadataArray());
-    }
-
-    public function test_get_metadata_array_with_local_path()
-    {
-        $image = new LegacyFeaturedImage([
-            'path' => 'foo.png',
-        ]);
-
-        $this->assertEquals([
-            'url' => 'media/foo.png',
-            'contentUrl' => 'media/foo.png',
-        ], $image->getMetadataArray());
-    }
-
-    public function test_get_metadata_array_with_local_path_when_on_nested_page()
-    {
-        $this->mockCurrentPage('foo/bar');
-        $image = new LegacyFeaturedImage([
-            'path' => 'foo.png',
-        ]);
-
-        $this->assertEquals([
-            'url' => '../media/foo.png',
-            'contentUrl' => '../media/foo.png',
-        ], $image->getMetadataArray());
-    }
-
-    public function test_get_link_resolves_remote_paths()
-    {
-        $image = new LegacyFeaturedImage([
-            'url' => 'https://example.com/image.jpg',
-        ]);
-
-        $this->assertEquals('https://example.com/image.jpg', $image->getLink());
-    }
-
-    public function test_get_link_resolves_local_paths()
-    {
-        $image = new LegacyFeaturedImage([
-            'path' => 'image.jpg',
-        ]);
-
-        $this->assertEquals('media/image.jpg', $image->getLink());
-    }
-
-    public function test_get_link_resolves_local_paths_when_on_nested_page()
-    {
-        $image = new LegacyFeaturedImage([
-            'path' => 'image.jpg',
-        ]);
-
-        $this->mockCurrentPage('foo/bar');
-        $this->assertEquals('../media/image.jpg', $image->getLink());
-    }
-
-    public function test_local_path_is_normalized_to_the_media_directory()
-    {
-        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
-            'path' => 'image.jpg',
-        ]))->path);
-
-        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
-            'path' => '_media/image.jpg',
-        ]))->path);
-
-        $this->assertEquals('image.jpg', (new LegacyFeaturedImage([
-            'path' => 'media/image.jpg',
-        ]))->path);
-    }
-
-    public function test_to_string_returns_the_image_source()
-    {
-        $this->assertEquals('https://example.com/image.jpg', (string) (new LegacyFeaturedImage([
-            'url' => 'https://example.com/image.jpg',
-        ])));
-
-        $this->assertEquals('media/image.jpg', (string) (new LegacyFeaturedImage([
-            'path' => 'image.jpg',
-        ])));
-    }
-
-    public function test_to_string_returns_the_image_source_for_nested_pages()
-    {
-        $this->mockCurrentPage('foo/bar');
-        $this->assertEquals('../media/image.jpg', (string) (new LegacyFeaturedImage([
-            'path' => 'image.jpg',
-        ])));
-    }
-
-    public function test_it_can_find_the_content_length_for_a_local_image_stored_in_the_media_directory()
-    {
-        $image = new LegacyFeaturedImage(['path' => 'image.jpg']);
-        file_put_contents($image->getSourcePath(), '16bytelongstring');
-
-        $this->assertEquals(
-            16, $image->getContentLength()
-        );
-
-        unlink($image->getSourcePath());
-    }
-
-    public function test_it_can_find_the_content_length_for_a_remote_image()
-    {
-        Http::fake(function () {
-            return Http::response(null, 200, [
-                'Content-Length' => 16,
-            ]);
-        });
-
-        $image = new LegacyFeaturedImage();
-        $image->url = 'https://hyde.test/static/image.png';
-
-        $this->assertEquals(
-            16, $image->getContentLength()
-        );
-    }
-
-    public function test_it_returns_0_if_local_image_is_missing()
-    {
-        $image = new LegacyFeaturedImage();
-        $image->path = '_media/image.jpg';
-
-        $this->assertEquals(
-            0, $image->getContentLength()
-        );
-    }
-
-    public function test_it_returns_0_if_remote_image_is_missing()
-    {
-        Http::fake(function () {
-            return Http::response(null, 404);
-        });
-
-        $image = new LegacyFeaturedImage();
-        $image->url = 'https://hyde.test/static/image.png';
-
-        $this->assertEquals(
-            0, $image->getContentLength()
-        );
-    }
-}

From 8f6cf4f411119d1224bdbb51ab7610ce4b0ab87d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 16:45:51 +0200
Subject: [PATCH 657/768] Replace FeaturedImage usages with the new class

---
 .../views/components/post/image.blade.php     |  2 +-
 .../Factories/BlogPostDataFactory.php         |  8 +--
 .../SubSchemas/FeaturedImageSchema.php        |  2 +-
 packages/framework/src/Pages/MarkdownPost.php |  4 +-
 .../tests/Feature/MarkdownPostTest.php        | 12 ++---
 .../Unit/Views/FeaturedImageViewTest.php      | 50 +++++++++----------
 6 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index 0a98af3710a..4e2784e9aed 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -1,6 +1,6 @@
 @php
     /** @var \Hyde\Pages\MarkdownPost $page  */
-    /** @var \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage $image  */
+    /** @var \Hyde\Framework\Features\Blogging\Models\FeaturedImage $image  */
     $image = $page->image;
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 7723507d9c6..50f21a012dc 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -5,7 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
-use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Markdown\Models\FrontMatter;
@@ -40,7 +40,7 @@ class BlogPostDataFactory extends Concerns\PageDataFactory implements BlogPostSc
     protected readonly ?string $category;
     protected readonly ?DateString $date;
     protected readonly ?PostAuthor $author;
-    protected readonly ?LegacyFeaturedImage $image;
+    protected readonly ?FeaturedImage $image;
 
     public function __construct(FrontMatter $matter, Markdown $markdown)
     {
@@ -93,10 +93,10 @@ protected function makeAuthor(): ?PostAuthor
         return null;
     }
 
-    protected function makeImage(): ?LegacyFeaturedImage
+    protected function makeImage(): ?FeaturedImage
     {
         if ($this->matter('image')) {
-            return LegacyFeaturedImage::make($this->matter('image'));
+            return FeaturedImage::make($this->matter('image'));
         }
 
         return null;
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
index 11ad3ed9d64..4731fa3b66e 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/SubSchemas/FeaturedImageSchema.php
@@ -5,7 +5,7 @@
 namespace Hyde\Markdown\Contracts\FrontMatter\SubSchemas;
 
 /**
- * @see \Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage
+ * @see \Hyde\Framework\Features\Blogging\Models\FeaturedImage
  * @see \Hyde\Pages\MarkdownPost
  */
 interface FeaturedImageSchema
diff --git a/packages/framework/src/Pages/MarkdownPost.php b/packages/framework/src/Pages/MarkdownPost.php
index 64e7372c557..7389f7a4625 100644
--- a/packages/framework/src/Pages/MarkdownPost.php
+++ b/packages/framework/src/Pages/MarkdownPost.php
@@ -5,7 +5,7 @@
 namespace Hyde\Pages;
 
 use Hyde\Foundation\PageCollection;
-use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
 use Hyde\Pages\Concerns\BaseMarkdownPage;
@@ -29,7 +29,7 @@ class MarkdownPost extends BaseMarkdownPage implements BlogPostSchema
     public ?string $category;
     public ?DateString $date;
     public ?PostAuthor $author;
-    public ?LegacyFeaturedImage $image;
+    public ?FeaturedImage $image;
 
     /** @return \Hyde\Foundation\PageCollection<\Hyde\Pages\MarkdownPost> */
     public static function getLatestPosts(): PageCollection
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index ec404eb211b..9f032d005a9 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Feature;
 
-use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
@@ -51,7 +51,7 @@ public function test_constructor_can_create_a_new_image_instance_from_a_string()
             'image' => 'https://example.com/image.jpg',
         ]));
 
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $post->image);
+        $this->assertInstanceOf(FeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -63,7 +63,7 @@ public function test_constructor_can_create_a_new_image_instance_from_an_array()
             ],
         ]));
 
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $post->image);
+        $this->assertInstanceOf(FeaturedImage::class, $post->image);
         $this->assertEquals('https://example.com/image.jpg', $post->image->url);
     }
 
@@ -87,7 +87,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
     }
 
@@ -95,7 +95,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('https://example.com/foo.png', $image->url);
     }
 
@@ -103,7 +103,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
     {
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
-        $this->assertInstanceOf(LegacyFeaturedImage::class, $image);
+        $this->assertInstanceOf(FeaturedImage::class, $image);
         $this->assertEquals('foo.png', $image->path);
         $this->assertEquals('bar', $image->title);
     }
diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 16876f79112..a5a2af9f789 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,7 +4,7 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
-use Hyde\Framework\Features\Blogging\Models\LegacyFeaturedImage;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
 use function str_replace;
@@ -19,10 +19,10 @@ class FeaturedImageViewTest extends TestCase
 {
     public function test_the_view()
     {
-        $component = $this->renderComponent(LegacyFeaturedImage::make([
+        $component = $this->renderComponent(FeaturedImage::make([
             'path' => 'foo',
             'description' => 'This is an image',
-            'title' => 'LegacyFeaturedImage Title',
+            'title' => 'FeaturedImage Title',
             'author' => 'John Doe',
             'license' => 'Creative Commons',
             'licenseUrl' => 'https://licence.example.com',
@@ -30,7 +30,7 @@ public function test_the_view()
 
         $this->assertStringContainsString('src="media/foo"', $component);
         $this->assertStringContainsString('alt="This is an image"', $component);
-        $this->assertStringContainsString('title="LegacyFeaturedImage Title"', $component);
+        $this->assertStringContainsString('title="FeaturedImage Title"', $component);
         $this->assertStringContainsString('Image by', $component);
         $this->assertStringContainsString('John Doe', $component);
         $this->assertStringContainsString('License', $component);
@@ -45,7 +45,7 @@ public function test_the_view()
 
     public function test_image_author_attribution_string()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage(['author' => 'John Doe']));
+        $string = $this->renderComponent(new FeaturedImage(['author' => 'John Doe']));
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
@@ -53,7 +53,7 @@ public function test_image_author_attribution_string()
 
     public function test_image_author_attribution_string_with_url()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage([
+        $string = $this->renderComponent(new FeaturedImage([
             'author' => 'John Doe',
             'attributionUrl' => 'https://example.com/',
         ]));
@@ -66,27 +66,27 @@ public function test_image_author_attribution_string_with_url()
 
     public function test_copyright_string()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage(['copyright' => 'foo copy']));
+        $string = $this->renderComponent(new FeaturedImage(['copyright' => 'foo copy']));
         $this->assertStringContainsString('<span itemprop="copyrightNotice">', $string);
         $this->assertStringContainsString('foo copy', $string);
     }
 
     public function test_copyright_string_inverse()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage());
+        $string = $this->renderComponent(new FeaturedImage());
         $this->assertStringNotContainsString('<span itemprop="copyrightNotice">', $string);
     }
 
     public function test_license_string()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage(['license' => 'foo']));
+        $string = $this->renderComponent(new FeaturedImage(['license' => 'foo']));
 
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
     }
 
     public function test_license_string_with_url()
     {
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'license' => 'foo',
             'licenseUrl' => 'https://example.com/bar.html',
         ]);
@@ -97,21 +97,21 @@ public function test_license_string_with_url()
 
     public function test_license_string_inverse()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage());
+        $string = $this->renderComponent(new FeaturedImage());
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_license_string_inverse_with_url()
     {
-        $string = $this->renderComponent(new LegacyFeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
+        $string = $this->renderComponent(new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'foo',
             'license' => 'foo',
@@ -130,7 +130,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_1()
     {
-        $image = new LegacyFeaturedImage(['author' => 'John Doe']);
+        $image = new FeaturedImage(['author' => 'John Doe']);
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('Image by', $string);
         $this->assertStringContainsString('John Doe', $string);
@@ -138,7 +138,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_1()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_2()
     {
-        $image = new LegacyFeaturedImage(['copyright' => 'foo']);
+        $image = new FeaturedImage(['copyright' => 'foo']);
         $string = $this->renderComponent($image);
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
@@ -146,7 +146,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_2()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_3()
     {
-        $image = new LegacyFeaturedImage(['license' => 'foo']);
+        $image = new FeaturedImage(['license' => 'foo']);
 
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
@@ -154,7 +154,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_3()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_4()
     {
-        $image = new LegacyFeaturedImage();
+        $image = new FeaturedImage();
         $string = $this->renderComponent($image);
         $this->assertStringNotContainsString('Image by', $string);
         $this->assertStringNotContainsString('License', $string);
@@ -162,7 +162,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_4()
 
     public function test_fluent_attribution_logic_creates_fluent_messages1()
     {
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'CC',
             'license' => 'MIT',
@@ -176,7 +176,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages1()
 
     public function test_fluent_attribution_logic_creates_fluent_messages2()
     {
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
             'license' => 'MIT',
         ]);
@@ -190,7 +190,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages2()
     public function test_fluent_attribution_logic_creates_fluent_messages3()
     {
         $expect = 'Image by John Doe. CC.';
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
             'copyright' => 'CC',
         ]);
@@ -204,7 +204,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages3()
     public function test_fluent_attribution_logic_creates_fluent_messages4()
     {
         $expect = 'All rights reserved.';
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'copyright' => 'All rights reserved',
         ]);
 
@@ -217,7 +217,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages4()
     public function test_fluent_attribution_logic_creates_fluent_messages5()
     {
         $expect = 'Image by John Doe.';
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'author' => 'John Doe',
         ]);
 
@@ -230,7 +230,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages5()
     public function test_fluent_attribution_logic_creates_fluent_messages6()
     {
         $expect = 'License MIT.';
-        $image = new LegacyFeaturedImage([
+        $image = new FeaturedImage([
             'license' => 'MIT',
         ]);
 
@@ -243,7 +243,7 @@ public function test_fluent_attribution_logic_creates_fluent_messages6()
     public function test_fluent_attribution_logic_creates_fluent_messages7()
     {
         $expect = '';
-        $image = new LegacyFeaturedImage([]);
+        $image = new FeaturedImage([]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
@@ -261,7 +261,7 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(LegacyFeaturedImage $image, bool $makeFile = true): string
+    protected function renderComponent(FeaturedImage $image, bool $makeFile = true): string
     {
         $page = new MarkdownPost();
 

From ed32f4f32ca29a91d917eea8ff6b27c99ad3f38e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:12:14 +0200
Subject: [PATCH 658/768] Use the factory method

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 50f21a012dc..09555912f5f 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -96,7 +96,7 @@ protected function makeAuthor(): ?PostAuthor
     protected function makeImage(): ?FeaturedImage
     {
         if ($this->matter('image')) {
-            return FeaturedImage::make($this->matter('image'));
+            return FeaturedImageFactory::make($this->matter('image'));
         }
 
         return null;

From ee8646f400e51a4a7df65d4ad12e4ddb89c386a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:13:34 +0200
Subject: [PATCH 659/768] Factory needs the entire front matter

---
 .../framework/src/Framework/Factories/BlogPostDataFactory.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 09555912f5f..802707d4a91 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -96,7 +96,7 @@ protected function makeAuthor(): ?PostAuthor
     protected function makeImage(): ?FeaturedImage
     {
         if ($this->matter('image')) {
-            return FeaturedImageFactory::make($this->matter('image'));
+            return FeaturedImageFactory::make($this->matter);
         }
 
         return null;

From be9613a226334a6ff2c58e916f5f73d82d17a279 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:21:32 +0200
Subject: [PATCH 660/768] Update comments

---
 .../framework/src/Framework/Factories/FeaturedImageFactory.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 2735d076b46..b7f53212a53 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -82,7 +82,8 @@ protected function makeSource(): string
             return $this->normalizeLocalImagePath($this->matter('image.path'));
         }
 
-        // Todo, we might want to add a note about which file caused the error
+        // Todo, we might want to add a note about which file caused the error.
+        // We could also check for these before calling the factory, and just ignore the image if it's not valid.
         throw new RuntimeException('No featured image source was found');
     }
 

From 63c3b35763bf2c77b5048afd195896afb17271ba Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:23:23 +0200
Subject: [PATCH 661/768] Update to use the getters

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

diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 9f032d005a9..66b3df173c8 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -52,7 +52,7 @@ public function test_constructor_can_create_a_new_image_instance_from_a_string()
         ]));
 
         $this->assertInstanceOf(FeaturedImage::class, $post->image);
-        $this->assertEquals('https://example.com/image.jpg', $post->image->url);
+        $this->assertEquals('https://example.com/image.jpg', $post->image->getSource());
     }
 
     public function test_constructor_can_create_a_new_image_instance_from_an_array()
@@ -64,7 +64,7 @@ public function test_constructor_can_create_a_new_image_instance_from_an_array()
         ]));
 
         $this->assertInstanceOf(FeaturedImage::class, $post->image);
-        $this->assertEquals('https://example.com/image.jpg', $post->image->url);
+        $this->assertEquals('https://example.com/image.jpg', $post->image->getSource());
     }
 
     public function test_constructor_can_create_a_new_date_string_instance_from_matter()
@@ -88,7 +88,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->path);
+        $this->assertEquals('foo.png', $image->getSource());
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_remote_path_when_matter_is_string()
@@ -96,7 +96,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'https://example.com/foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('https://example.com/foo.png', $image->url);
+        $this->assertEquals('https://example.com/foo.png', $image->getSource());
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_supplied_data_when_matter_is_array()
@@ -104,7 +104,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->path);
-        $this->assertEquals('bar', $image->title);
+        $this->assertEquals('foo.png', $image->getSource());
+        $this->assertEquals('bar', $image->getTitleText());
     }
 }

From 2f8be1e83db528a30fc26b59fa2cc5d493b56520 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:23:29 +0200
Subject: [PATCH 662/768] Expect normalized path

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

diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 66b3df173c8..1961be87a51 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -88,7 +88,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->getSource());
+        $this->assertEquals('_media/foo.png', $image->getSource());
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_remote_path_when_matter_is_string()
@@ -104,7 +104,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('foo.png', $image->getSource());
+        $this->assertEquals('_media/foo.png', $image->getSource());
         $this->assertEquals('bar', $image->getTitleText());
     }
 }

From f94fd6f38fcc4f8abe79520d9cc703ef3ed8191d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:25:05 +0200
Subject: [PATCH 663/768] Must normalize string input

---
 .../src/Framework/Factories/FeaturedImageFactory.php         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index b7f53212a53..18d3307edca 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -71,7 +71,10 @@ public static function make(FrontMatter $matter): FeaturedImage
     protected function makeSource(): string
     {
         if (is_string($this->matter('image'))) {
-            return $this->matter('image');
+            if (str_starts_with($this->matter('image'), 'http')) {
+                return $this->matter('image');
+            }
+            return self::normalizeLocalImagePath($this->matter('image'));
         }
 
         if ($this->matter('image.url') !== null) {

From c6170de9bb66b0b6dbe4f9b8b51e52c1393039e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:26:03 +0200
Subject: [PATCH 664/768] Expect exception message

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index ff89baa4cb4..5c5092f279f 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -80,6 +80,7 @@ public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
     public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
     {
         $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('No featured image source was found');
 
         FeaturedImageFactory::make(new FrontMatter([]));
     }

From 4e6cc530aebdb275c716ccbc5e65db4d5a5322d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:26:46 +0200
Subject: [PATCH 665/768] Returned object will be local

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 5c5092f279f..2d2b9ee9edf 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -91,7 +91,7 @@ public function testMakeMethodCanCreateImageFromJustString()
             'image' => 'foo',
         ]));
 
-        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
-        $this->assertSame('foo', $image->getSource());
+        $this->assertInstanceOf(LocalFeaturedImage::class, $image);
+        $this->assertSame('_media/foo', $image->getSource());
     }
 }

From 89157125797efede2b085ae0591ea0b1e2409eb3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:26:51 +0200
Subject: [PATCH 666/768] Test both kinds of stringed inputs

---
 .../tests/Feature/FeaturedImageFactoryTest.php         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 2d2b9ee9edf..34a8550a124 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -94,4 +94,14 @@ public function testMakeMethodCanCreateImageFromJustString()
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertSame('_media/foo', $image->getSource());
     }
+
+    public function testMakeMethodCanCreateImageFromJustStringWithUrl()
+    {
+        $image = FeaturedImageFactory::make(new FrontMatter([
+            'image' => 'https://example.com/foo',
+        ]));
+
+        $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
+        $this->assertSame('https://example.com/foo', $image->getSource());
+    }
 }

From 9bd3132885488b839c4fbfe0412b3da81f03a756 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Oct 2022 15:27:01 +0000
Subject: [PATCH 667/768] Apply fixes from StyleCI

---
 .../framework/src/Framework/Factories/FeaturedImageFactory.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
index 18d3307edca..c1085979363 100644
--- a/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
+++ b/packages/framework/src/Framework/Factories/FeaturedImageFactory.php
@@ -74,6 +74,7 @@ protected function makeSource(): string
             if (str_starts_with($this->matter('image'), 'http')) {
                 return $this->matter('image');
             }
+
             return self::normalizeLocalImagePath($this->matter('image'));
         }
 

From 6c7f9b3cb3af5dd21e18daec0d545b92147431cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:32:00 +0200
Subject: [PATCH 668/768] Return value must be relative to the site's root.

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php | 3 ++-
 packages/framework/tests/Feature/FeaturedImageFactoryTest.php | 4 ++--
 packages/framework/tests/Feature/FeaturedImageTest.php        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 78c4d73d97c..afcbb121b07 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -8,6 +8,7 @@
 use Hyde\Hyde;
 use InvalidArgumentException;
 use function str_starts_with;
+use function substr;
 
 class LocalFeaturedImage extends FeaturedImage
 {
@@ -27,7 +28,7 @@ protected function setSource(string $source): void
 
     public function getSource(): string
     {
-        return $this->source;
+        return substr($this->source, 1);
     }
 
     public function getContentLength(): int
diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 34a8550a124..a49b899445d 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -53,7 +53,7 @@ public function testMakeMethodCreatesLocalImageWhenPathIsSet()
         ]));
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
-        $this->assertSame('_media/path', $image->getSource());
+        $this->assertSame('media/path', $image->getSource());
     }
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
@@ -92,7 +92,7 @@ public function testMakeMethodCanCreateImageFromJustString()
         ]));
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
-        $this->assertSame('_media/foo', $image->getSource());
+        $this->assertSame('media/foo', $image->getSource());
     }
 
     public function testMakeMethodCanCreateImageFromJustStringWithUrl()
diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index f3b0e0b5f3b..2267b528edf 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -128,7 +128,7 @@ public function testCanConstructLocalFeaturedImage()
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertInstanceOf(FeaturedImage::class, $image);
 
-        $this->assertEquals('_media/foo', $image->getSource());
+        $this->assertEquals('media/foo', $image->getSource());
     }
 
     public function testCannotConstructLocalFeaturedImageWithInvalidSource()

From 0aea37678d18503e3fd1eea427f045321356200b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:34:09 +0200
Subject: [PATCH 669/768] Add some documentation

---
 .../Features/Blogging/Models/LocalFeaturedImage.php       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index afcbb121b07..1308f00d7bb 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -10,6 +10,13 @@
 use function str_starts_with;
 use function substr;
 
+/**
+ * A featured image object, for a file stored locally.
+ *
+ * The internal data structure forces the image source to reference a file in the _media directory,
+ * and thus that is what is required for the input. However, when outputting data, the data will
+ * be used for the _site/media directory, so it will provide data relative to the site root.
+ */
 class LocalFeaturedImage extends FeaturedImage
 {
     protected readonly string $source;
@@ -28,6 +35,7 @@ protected function setSource(string $source): void
 
     public function getSource(): string
     {
+        // Return value must be relative to the site's root.
         return substr($this->source, 1);
     }
 

From 04cef9112eaf1e43eed865e31e8dda7beddbeac5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:36:17 +0200
Subject: [PATCH 670/768] Output will be for the site path

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

diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 1961be87a51..78c8b2b50ff 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -88,7 +88,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => 'foo.png']);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo.png', $image->getSource());
+        $this->assertEquals('media/foo.png', $image->getSource());
     }
 
     public function test_featured_image_can_be_constructed_returns_image_object_with_remote_path_when_matter_is_string()
@@ -104,7 +104,7 @@ public function test_featured_image_can_be_constructed_returns_image_object_with
         $page = MarkdownPost::make(matter: ['image' => ['path' => 'foo.png', 'title' => 'bar']]);
         $image = $page->image;
         $this->assertInstanceOf(FeaturedImage::class, $image);
-        $this->assertEquals('_media/foo.png', $image->getSource());
+        $this->assertEquals('media/foo.png', $image->getSource());
         $this->assertEquals('bar', $image->getTitleText());
     }
 }

From 04ae79242127bda72ccb8af238f8f1ea09f557bb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:48:16 +0200
Subject: [PATCH 671/768] Refactor to use new image model

---
 .../views/components/post/image.blade.php     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/framework/resources/views/components/post/image.blade.php b/packages/framework/resources/views/components/post/image.blade.php
index 4e2784e9aed..0b1b6b874e0 100644
--- a/packages/framework/resources/views/components/post/image.blade.php
+++ b/packages/framework/resources/views/components/post/image.blade.php
@@ -4,32 +4,32 @@
     $image = $page->image;
 @endphp
 <figure aria-label="Cover image" itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="doc-cover">
-    <img src="{{ $image->getLink() }}" alt="{{ $image->description ?? '' }}" title="{{ $image->title ?? '' }}"
+    <img src="{{ $image->getSource() }}" alt="{{ $image->getAltText() ?? '' }}" title="{{ $image->getTitleText() ?? '' }}"
          itemprop="image" class="mb-0">
     <figcaption aria-label="Image caption" itemprop="caption">
-        @isset($image->author)
+        @if($image->hasAuthorName())
             <span>Image by</span>
             <span itemprop="creator" itemscope="" itemtype="http://schema.org/Person">
-                @isset($image->attributionUrl)
-                    <a href="{{ $image->attributionUrl }}" rel="author noopener nofollow" itemprop="url">
-                        <span itemprop="name">{{ $image->author }}</span>.
+                @if($image->hasAuthorUrl())
+                    <a href="{{ $image->getAuthorUrl() }}" rel="author noopener nofollow" itemprop="url">
+                        <span itemprop="name">{{ $image->getAuthorName() }}</span>.
                     </a>
                 @else
-                    <span itemprop="name">{{ $image->author }}</span>.
+                    <span itemprop="name">{{ $image->getAuthorName() }}</span>.
                 @endif
             </span>
         @endif
 
-        @isset($image->copyright)
-            <span itemprop="copyrightNotice">{{ $image->copyright }}</span>.
+        @if($image->hasCopyrightText())
+            <span itemprop="copyrightNotice">{{ $image->getCopyrightText() }}</span>.
         @endif
 
-        @isset($image->license)
+        @if($image->hasLicenseName())
             <span>License</span>
-            @isset($image->licenseUrl)
-                <a href="{{ $image->licenseUrl }}" rel="license nofollow noopener" itemprop="license">{{ $image->license }}</a>.
+            @if($image->hasLicenseUrl())
+                <a href="{{ $image->getLicenseUrl() }}" rel="license nofollow noopener" itemprop="license">{{ $image->getLicenseName() }}</a>.
             @else
-                <span itemprop="license">{{ $image->license }}</span>.
+                <span itemprop="license">{{ $image->getLicenseName() }}</span>.
             @endif
         @endif
     </figcaption>

From b276be0fa7ff06791e4df4c6a271599b2691591a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:52:34 +0200
Subject: [PATCH 672/768] Update test for changed model

---
 .../Unit/Views/FeaturedImageViewTest.php      | 136 +++++++++---------
 1 file changed, 72 insertions(+), 64 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index a5a2af9f789..270996f6b31 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,9 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
+use function array_merge;
 use function str_replace;
 use function strip_tags;
 use function trim;
@@ -19,16 +22,16 @@ class FeaturedImageViewTest extends TestCase
 {
     public function test_the_view()
     {
-        $component = $this->renderComponent(FeaturedImage::make([
-            'path' => 'foo',
-            'description' => 'This is an image',
-            'title' => 'FeaturedImage Title',
-            'author' => 'John Doe',
-            'license' => 'Creative Commons',
-            'licenseUrl' => 'https://licence.example.com',
-        ]));
-
-        $this->assertStringContainsString('src="media/foo"', $component);
+        $component = $this->renderComponent([
+            'image.path' => 'foo.jpg',
+            'image.description' => 'This is an image',
+            'image.title' => 'FeaturedImage Title',
+            'image.author' => 'John Doe',
+            'image.license' => 'Creative Commons',
+            'image.licenseUrl' => 'https://licence.example.com',
+        ]);
+
+        $this->assertStringContainsString('src="media/foo.jpg"', $component);
         $this->assertStringContainsString('alt="This is an image"', $component);
         $this->assertStringContainsString('title="FeaturedImage Title"', $component);
         $this->assertStringContainsString('Image by', $component);
@@ -45,7 +48,7 @@ public function test_the_view()
 
     public function test_image_author_attribution_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['author' => 'John Doe']));
+        $string = $this->renderComponent(['image.author' => 'John Doe']);
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
         $this->assertStringContainsString('<span itemprop="name">John Doe</span>', $string);
@@ -53,10 +56,10 @@ public function test_image_author_attribution_string()
 
     public function test_image_author_attribution_string_with_url()
     {
-        $string = $this->renderComponent(new FeaturedImage([
-            'author' => 'John Doe',
-            'attributionUrl' => 'https://example.com/',
-        ]));
+        $string = $this->renderComponent([
+            'image.author' => 'John Doe',
+            'image.attributionUrl' => 'https://example.com/',
+        ]);
         $this->assertStringContainsString('itemprop="creator"', $string);
         $this->assertStringContainsString('itemprop="url"', $string);
         $this->assertStringContainsString('itemtype="http://schema.org/Person"', $string);
@@ -66,29 +69,29 @@ public function test_image_author_attribution_string_with_url()
 
     public function test_copyright_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['copyright' => 'foo copy']));
+        $string = $this->renderComponent(['image.copyright' => 'foo copy']);
         $this->assertStringContainsString('<span itemprop="copyrightNotice">', $string);
         $this->assertStringContainsString('foo copy', $string);
     }
 
     public function test_copyright_string_inverse()
     {
-        $string = $this->renderComponent(new FeaturedImage());
+        $string = $this->renderComponent([]);
         $this->assertStringNotContainsString('<span itemprop="copyrightNotice">', $string);
     }
 
     public function test_license_string()
     {
-        $string = $this->renderComponent(new FeaturedImage(['license' => 'foo']));
+        $string = $this->renderComponent(['image.license' => 'foo']);
 
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
     }
 
     public function test_license_string_with_url()
     {
-        $image = new FeaturedImage([
-            'license' => 'foo',
-            'licenseUrl' => 'https://example.com/bar.html',
+        $image = $this->make([
+            'image.license' => 'foo',
+            'image.licenseUrl' => 'https://example.com/bar.html',
         ]);
         $string = $this->renderComponent($image);
 
@@ -97,24 +100,24 @@ public function test_license_string_with_url()
 
     public function test_license_string_inverse()
     {
-        $string = $this->renderComponent(new FeaturedImage());
+        $string = $this->renderComponent([]);
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_license_string_inverse_with_url()
     {
-        $string = $this->renderComponent(new FeaturedImage(['licenseUrl' => 'https://example.com/bar.html']));
+        $string = $this->renderComponent(['image.licenseUrl' => 'https://example.com/bar.html']);
         $this->assertStringNotContainsString('<span itemprop="license">', $string);
         $this->assertStringNotContainsString('license', $string);
     }
 
     public function test_fluent_attribution_logic_uses_rich_html_tags()
     {
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'copyright' => 'foo',
-            'license' => 'foo',
+        $image = $this->make([
+            'image.author' => 'John Doe',
+            'image.copyright' => 'foo',
+            'image.license' => 'foo',
         ]);
         $string = $this->renderComponent($image);
 
@@ -130,7 +133,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_1()
     {
-        $image = new FeaturedImage(['author' => 'John Doe']);
+        $image = $this->make(['image.author' => 'John Doe']);
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('Image by', $string);
         $this->assertStringContainsString('John Doe', $string);
@@ -138,7 +141,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_1()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_2()
     {
-        $image = new FeaturedImage(['copyright' => 'foo']);
+        $image = $this->make(['image.copyright' => 'foo']);
         $string = $this->renderComponent($image);
 
         $this->assertStringContainsString('<span itemprop="copyrightNotice">foo</span>', $string);
@@ -146,7 +149,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_2()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_3()
     {
-        $image = new FeaturedImage(['license' => 'foo']);
+        $image = $this->make(['image.license' => 'foo']);
 
         $string = $this->renderComponent($image);
         $this->assertStringContainsString('<span itemprop="license">foo</span>', $string);
@@ -154,7 +157,7 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_3()
 
     public function test_fluent_attribution_logic_uses_rich_html_tags_4()
     {
-        $image = new FeaturedImage();
+        $image = $this->make();
         $string = $this->renderComponent($image);
         $this->assertStringNotContainsString('Image by', $string);
         $this->assertStringNotContainsString('License', $string);
@@ -162,98 +165,98 @@ public function test_fluent_attribution_logic_uses_rich_html_tags_4()
 
     public function test_fluent_attribution_logic_creates_fluent_messages1()
     {
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'copyright' => 'CC',
-            'license' => 'MIT',
+        $image = $this->make([
+            'image.author' => 'John Doe',
+            'image.copyright' => 'CC',
+            'image.license' => 'MIT',
         ]);
 
         $this->assertSame(
             $this->stripWhitespace('Image by John Doe. CC. License MIT.'),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages2()
     {
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'license' => 'MIT',
+        $image = $this->make([
+            'image.author' => 'John Doe',
+            'image.license' => 'MIT',
         ]);
         $expect = 'Image by John Doe. License MIT.';
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages3()
     {
         $expect = 'Image by John Doe. CC.';
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
-            'copyright' => 'CC',
+        $image = $this->make([
+            'image.author' => 'John Doe',
+            'image.copyright' => 'CC',
         ]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages4()
     {
         $expect = 'All rights reserved.';
-        $image = new FeaturedImage([
-            'copyright' => 'All rights reserved',
+        $image = $this->make([
+            'image.copyright' => 'All rights reserved',
         ]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages5()
     {
         $expect = 'Image by John Doe.';
-        $image = new FeaturedImage([
-            'author' => 'John Doe',
+        $image = $this->make([
+            'image.author' => 'John Doe',
         ]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages6()
     {
         $expect = 'License MIT.';
-        $image = new FeaturedImage([
-            'license' => 'MIT',
+        $image = $this->make([
+            'image.license' => 'MIT',
         ]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     public function test_fluent_attribution_logic_creates_fluent_messages7()
     {
         $expect = '';
-        $image = new FeaturedImage([]);
+        $image = $this->make([]);
 
         $this->assertSame(
             $this->stripWhitespace($expect),
-            $this->stripHtml(($this->renderComponent($image)))
+            $this->stripHtml($this->renderComponent($image))
         );
     }
 
     protected function stripHtml(string $string): string
     {
-        return trim(($this->stripWhitespace(strip_tags($string))), "\t ");
+        return trim($this->stripWhitespace(strip_tags($string)), "\t ");
     }
 
     protected function stripWhitespace(string $string): string
@@ -261,19 +264,24 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(FeaturedImage $image, bool $makeFile = true): string
+    protected function renderComponent(FeaturedImage|array $data= ['image.path'=>'foo']): string
     {
-        $page = new MarkdownPost();
+        $image = $data instanceof FeaturedImage ? $data : $this->make($data);
 
+        $page = new MarkdownPost();
         $page->image = $image;
-
-        if ($makeFile) {
-            $image->path = $image->getSourcePath() ?? '_media/foo.jpg';
-            $this->file($image->getSourcePath() ?? '_media/foo.jpg');
-        }
-
         $this->mockPage($page);
 
         return view('hyde::components.post.image')->render();
     }
+
+    protected function make(array $data = [], string $path ='foo.png'): FeaturedImage
+    {
+        $this->file("_media/$path");
+
+        return FeaturedImageFactory::make(FrontMatter::fromArray(array_merge(
+            ['image.path' => $path],
+            $data,
+        )));
+    }
 }

From 7c28e1ee4a1179de8b099be624c7e79ef63c6fa8 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Oct 2022 15:52:43 +0000
Subject: [PATCH 673/768] Apply fixes from StyleCI

---
 .../framework/tests/Unit/Views/FeaturedImageViewTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
index 270996f6b31..32dfb911534 100644
--- a/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
+++ b/packages/framework/tests/Unit/Views/FeaturedImageViewTest.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Testing\Unit\Views;
 
+use function array_merge;
 use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Testing\TestCase;
-use function array_merge;
 use function str_replace;
 use function strip_tags;
 use function trim;
@@ -264,7 +264,7 @@ protected function stripWhitespace(string $string): string
         return str_replace([' ', "\r", "\n"], '', $string);
     }
 
-    protected function renderComponent(FeaturedImage|array $data= ['image.path'=>'foo']): string
+    protected function renderComponent(FeaturedImage|array $data = ['image.path'=>'foo']): string
     {
         $image = $data instanceof FeaturedImage ? $data : $this->make($data);
 
@@ -275,7 +275,7 @@ protected function renderComponent(FeaturedImage|array $data= ['image.path'=>'fo
         return view('hyde::components.post.image')->render();
     }
 
-    protected function make(array $data = [], string $path ='foo.png'): FeaturedImage
+    protected function make(array $data = [], string $path = 'foo.png'): FeaturedImage
     {
         $this->file("_media/$path");
 

From e315cff4af229840e1e971e2a5d7a5e7aabe7909 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 17:56:46 +0200
Subject: [PATCH 674/768] Link must be relative

---
 .../Framework/Features/Blogging/Models/LocalFeaturedImage.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
index 1308f00d7bb..2f3ff752709 100644
--- a/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
+++ b/packages/framework/src/Framework/Features/Blogging/Models/LocalFeaturedImage.php
@@ -36,7 +36,7 @@ protected function setSource(string $source): void
     public function getSource(): string
     {
         // Return value must be relative to the site's root.
-        return substr($this->source, 1);
+        return Hyde::relativeLink(substr($this->source, 1));
     }
 
     public function getContentLength(): int

From 800855ed330bf02007fb6b79f64cfb8db43c906a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 18:50:16 +0200
Subject: [PATCH 675/768] Add more tests for the getSource method

---
 .../tests/Feature/FeaturedImageTest.php        | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 2267b528edf..4a48a67ec21 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -5,9 +5,11 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Exceptions\FileNotFoundException;
+use Hyde\Framework\Factories\FeaturedImageFactory;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
+use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Testing\TestCase;
 use Illuminate\Support\Facades\Http;
 use InvalidArgumentException;
@@ -214,6 +216,22 @@ public function testFeaturedImageGetContentLengthWithRemoteSourceAndInvalidRespo
         $this->assertEquals(0, $image->getContentLength());
     }
 
+    public function testGetSourceMethod()
+    {
+        $this->assertEquals('media/foo', (new LocalFeaturedImage('_media/foo', ...$this->defaultArguments()))->getSource());
+
+        $this->assertEquals('media/foo', FeaturedImageFactory::make(new FrontMatter(['image.path' => 'foo']))->getSource());
+        $this->assertEquals('media/foo', FeaturedImageFactory::make(new FrontMatter(['image.path' => 'media/foo']))->getSource());
+        $this->assertEquals('media/foo', FeaturedImageFactory::make(new FrontMatter(['image.path' => '_media/foo']))->getSource());
+
+        $this->assertEquals('foo', FeaturedImageFactory::make(new FrontMatter(['image.url' => 'foo']))->getSource());
+        $this->assertEquals('//foo', FeaturedImageFactory::make(new FrontMatter(['image.url' => '//foo']))->getSource());
+        $this->assertEquals('http', FeaturedImageFactory::make(new FrontMatter(['image.url' => 'http']))->getSource());
+
+        $this->assertEquals('media/foo', FeaturedImageFactory::make(new FrontMatter(['image' => 'foo']))->getSource());
+        $this->assertEquals('http', FeaturedImageFactory::make(new FrontMatter(['image' => 'http']))->getSource());
+    }
+
     protected function defaultArguments(): array
     {
         return ['alt', 'title', 'author', 'authorUrl', 'copyright', 'license', 'licenseUrl'];

From 5a6dc0a0fa4ed0a46ed8a202603ecc3745401ac5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:25:59 +0200
Subject: [PATCH 676/768] Add internal marker for experimental class

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 334d3e3c5a4..a92cf43b8aa 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -10,6 +10,8 @@
  * Adds a simple session handler, arguably most useful to defer messages, for example,
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
+ * @internal This class is currently experimental and should not be relied upon outside the framework.
+ *
  * It's bound into the service container as a singleton and is not persisted.
  *
  * @example app(Session::class)->addWarning('warning');

From e7f841d3f603b440be1ca6e7357d0fa3e94daf6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:31:31 +0200
Subject: [PATCH 677/768] Add final benchmark history

---
 tests/Benchmarks/PageParserBenchmark.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/Benchmarks/PageParserBenchmark.php b/tests/Benchmarks/PageParserBenchmark.php
index e51da3da87b..2ad4ebc8145 100644
--- a/tests/Benchmarks/PageParserBenchmark.php
+++ b/tests/Benchmarks/PageParserBenchmark.php
@@ -18,6 +18,7 @@ class PageParserBenchmark extends BenchCase
      * - #14c34beb1: 0.17022841ms.
      * - #0db04eaef: 0.2702086ms.
      * - #fd90ee987: 0.28220031ms.
+     * - #5a6dc0a0f: 0.21600821ms
      */
     public function testParseBladePageFile()
     {
@@ -38,6 +39,7 @@ public function testParseBladePageFile()
      * - #8e165366a: 0.1986541ms.
      * - #0db04eaef: 0.29952221ms.
      * - #fd90ee987: 0.30080938ms.
+     * - #5a6dc0a0f: 0.2528477ms
      */
     public function testParseMarkdownPageFile()
     {
@@ -58,6 +60,7 @@ public function testParseMarkdownPageFile()
      * - #5d044679b: 0.30337441ms.
      * - #0db04eaef: 0.39583502ms.
      * - #fd90ee987: 0.41671791ms.
+     * - #5a6dc0a0f: 0.39680111ms
      */
     public function testParseMarkdownPostFile()
     {
@@ -78,6 +81,7 @@ public function testParseMarkdownPostFile()
      * - #6f63f5016: 0.16660199ms.
      * - #0db04eaef: 0.2729635ms.
      * - #fd90ee987: 0.27649839ms.
+     * - #5a6dc0a0f: 0.2145988ms
      */
     public function testParseDocumentationPageFile()
     {

From e6927a967d03197a028af10d860c183e95e934d9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:31:55 +0200
Subject: [PATCH 678/768] Delete directory Benchmarks

---
 tests/Benchmarks/BenchCase.php                |  46 -------
 tests/Benchmarks/CBench/Benchmark.php         | 115 ------------------
 tests/Benchmarks/CBench/ConsoleHelpers.php    |  66 ----------
 tests/Benchmarks/CBench/Report.php            |  58 ---------
 tests/Benchmarks/CBench/TrackingHelpers.php   |  43 -------
 tests/Benchmarks/ExampleBenchmark.php         |  15 ---
 tests/Benchmarks/MarkdownBenchmark.php        |  35 ------
 tests/Benchmarks/PageParserBenchmark.php      | 106 ----------------
 tests/Benchmarks/SearchIndexBenchmark.php     |  51 --------
 .../Benchmarks/StaticSiteBuilderBenchmark.php |  44 -------
 tests/Benchmarks/reports/.gitignore           |   2 -
 11 files changed, 581 deletions(-)
 delete mode 100644 tests/Benchmarks/BenchCase.php
 delete mode 100644 tests/Benchmarks/CBench/Benchmark.php
 delete mode 100644 tests/Benchmarks/CBench/ConsoleHelpers.php
 delete mode 100644 tests/Benchmarks/CBench/Report.php
 delete mode 100644 tests/Benchmarks/CBench/TrackingHelpers.php
 delete mode 100644 tests/Benchmarks/ExampleBenchmark.php
 delete mode 100644 tests/Benchmarks/MarkdownBenchmark.php
 delete mode 100644 tests/Benchmarks/PageParserBenchmark.php
 delete mode 100644 tests/Benchmarks/SearchIndexBenchmark.php
 delete mode 100644 tests/Benchmarks/StaticSiteBuilderBenchmark.php
 delete mode 100644 tests/Benchmarks/reports/.gitignore

diff --git a/tests/Benchmarks/BenchCase.php b/tests/Benchmarks/BenchCase.php
deleted file mode 100644
index 553dbd1060c..00000000000
--- a/tests/Benchmarks/BenchCase.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-use Hyde\Testing\TestCase;
-use Illuminate\Support\Str;
-use Tests\Benchmarks\CBench\Benchmark;
-use Tests\Benchmarks\CBench\Report;
-
-/**
- * Run with vendor/bin/pest tests/Benchmarks --test-suffix="Benchmark.php".
- */
-class BenchCase extends TestCase
-{
-    public function benchmark(callable $callback, int $iterations = 100, ?string $name = null): Benchmark
-    {
-        $class = (basename(static::class, 'Test'));
-        $method = substr(debug_backtrace()[1]['function'], 4);
-
-        if (extension_loaded('xdebug')) {
-            echo "Warning: xdebug is enabled, this will affect the performance of the benchmark.\n\n";
-        }
-
-        $benchmark = Benchmark::run($callback, $iterations, $name ?? $class.'::'.$method, env('SILENCE_BENCHMARKS', true));
-
-        file_put_contents(sprintf(
-            '%s/reports/%s.json', __DIR__, (
-                Str::snake($class.'-'.lcfirst($method)))),
-            json_encode(new Report($benchmark), JSON_PRETTY_PRINT));
-
-        $this->log($method, "Ran $benchmark->iterations iterations in {$benchmark->getExecutionTimeInMs()}ms ({$benchmark->getAverageExecutionTimeInMs()}ms avg / {$benchmark->getAverageIterationsPerSecond()} per sec)");
-
-        $this->assertTrue(true);
-
-        $benchmark->runName = $name ?? $class.'::'.$method;
-
-        return $benchmark;
-    }
-
-    protected function log(string $method, string $message): void
-    {
-        echo "\033[33m$method: \033[32m$message\033[0m\n";
-    }
-}
diff --git a/tests/Benchmarks/CBench/Benchmark.php b/tests/Benchmarks/CBench/Benchmark.php
deleted file mode 100644
index 965680a62ef..00000000000
--- a/tests/Benchmarks/CBench/Benchmark.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks\CBench;
-
-/**
- * Based on CBench, ported to PSR-4.
- *
- * @link https://github.com/caendesilva/CBench
- *
- * @license MIT
- */
-class Benchmark
-{
-    use ConsoleHelpers;
-    use TrackingHelpers;
-
-    public const VERSION = 'dev-master';
-
-    public int $iterations;
-    public float $time_start;
-    public float $time_end;
-    public ?string $name;
-
-    protected bool $silent;
-
-    public function __construct(int $iterations, ?string $name = null, bool $silent = false)
-    {
-        $this->iterations = $iterations;
-        $this->name = $name;
-        $this->silent = $silent;
-
-        $this->init();
-    }
-
-    public function __destruct()
-    {
-        $this->disengage();
-    }
-
-    public static function run(callable $callback, int $iterations = 100, ?string $name = null, bool $silent = false): Benchmark
-    {
-        $benchmark = new Benchmark($iterations, $name, $silent);
-        $benchmark->execute($callback);
-
-        return $benchmark;
-    }
-
-    protected function init(): void
-    {
-        $this->comment(str_repeat('=', 40))
-            ->line('Preparing Benchmark script')
-            ->comment(str_repeat('-', 40))
-            ->line('Script version:    '.self::VERSION)
-            ->line('Current time:      '.date('Y-m-d H:i:s'))
-            ->line()
-            ->line('Iterations to run: '.$this->iterations)
-            ->line('Name of benchmark: '.($this->name ?? '[not set]'))
-            ->comment(str_repeat('=', 40))
-            ->line();
-    }
-
-    protected function disengage(): void
-    {
-        $this->line()
-            ->comment(str_repeat('=', 40))
-            ->line('Benchmark script complete')
-            ->comment(str_repeat('-', 40));
-
-        $this->info('Run information:')
-            ->line('Script version:    '.self::VERSION)
-            ->line('Today\'s date:      '.date('Y-m-d'))
-            ->line('Name of benchmark: '.($this->name ?? '[not set]'))
-            ->newline();
-
-        $this->info('Benchmark information:')
-            ->line('Total iterations:       '.$this->iterations)
-            ->line('Total execution time:   '.$this->getExecutionTimeInMs().'ms')
-            ->line('Avg.  iteration time:   '.$this->getAverageExecutionTimeInMs().'ms')
-            ->line('Avg.  iterations/sec:   '.$this->getAverageIterationsPerSecond())
-            ->line('Approx. Memory usage:   '.$this->getMemoryUsage())
-            ->newline();
-
-        $this->info('System information:')
-            ->line('PHP version: '.PHP_VERSION.' ('.php_sapi_name().')')
-            ->line('OS/Arch:     '.PHP_OS.' ('.PHP_INT_SIZE * 8 .'-bit'.')')
-            ->line('xdebug:      '.(extension_loaded('xdebug') ? 'enabled ✅' : 'disabled ❌'))
-            ->line('opcache:     '.(extension_loaded('opcache') ? 'enabled ✅' : 'disabled ❌'))
-            ->comment(str_repeat('=', 40));
-    }
-
-    protected function execute(callable $callback): void
-    {
-        $this->start();
-        for ($i = 0; $i < $this->iterations; $i++) {
-            $callback();
-        }
-        $this->end();
-    }
-
-    protected function start(): void
-    {
-        $this->time_start = microtime(true);
-
-        $this->info('Starting benchmark...')->newline();
-    }
-
-    protected function end(): void
-    {
-        $this->time_end = microtime(true);
-
-        $this->newline(2)->info('Benchmark complete!');
-    }
-}
diff --git a/tests/Benchmarks/CBench/ConsoleHelpers.php b/tests/Benchmarks/CBench/ConsoleHelpers.php
deleted file mode 100644
index 24a17abf5aa..00000000000
--- a/tests/Benchmarks/CBench/ConsoleHelpers.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks\CBench;
-
-trait ConsoleHelpers
-{
-    protected function line(string $message = ''): self
-    {
-        if (! $this->silent) {
-            echo $message.PHP_EOL;
-        }
-
-        return $this;
-    }
-
-    protected function info(string $message): self
-    {
-        $this->line("\033[32m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function warn(string $message): self
-    {
-        $this->line("\033[33m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function error(string $message): self
-    {
-        $this->line("\033[31m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function success(string $message): self
-    {
-        $this->line("\033[32m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function comment(string $message): self
-    {
-        $this->line("\033[37m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function debug(string $message): self
-    {
-        $this->line("\033[36m".$message."\033[0m");
-
-        return $this;
-    }
-
-    protected function newline(int $count = 1): self
-    {
-        $this->line(str_repeat(PHP_EOL, $count - 1));
-
-        return $this;
-    }
-}
diff --git a/tests/Benchmarks/CBench/Report.php b/tests/Benchmarks/CBench/Report.php
deleted file mode 100644
index 3f99686c304..00000000000
--- a/tests/Benchmarks/CBench/Report.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks\CBench;
-
-class Report
-{
-    protected Benchmark $benchmark;
-
-    public string $benchmark_name;
-    public string $human_date;
-    public string $timestamp;
-    public string $commit_sha;
-    public string $script_version;
-
-    public float $total_iterations;
-    public float $total_execution_time;
-    public float $avg_iteration_time;
-    public float $avg_iterations_sec;
-    public float $approx_memory_usage;
-
-    public string $php_version;
-    public string $php_sapi;
-    public string $runner_os;
-    public string $runner_arch;
-    public bool $xdebug_enabled;
-    public bool $opcache_enabled;
-
-    public function __construct(Benchmark $benchmark)
-    {
-        $this->benchmark = $benchmark;
-
-        $this->generate();
-    }
-
-    protected function generate(): void
-    {
-        $this->human_date = date('Y-m-d');
-        $this->benchmark_name = $this->benchmark->name ?? '[not set]';
-        $this->timestamp = date('c', $this->benchmark->time_start);
-        $this->commit_sha = trim(shell_exec('git rev-parse HEAD'));
-        $this->script_version = $this->benchmark::VERSION;
-
-        $this->total_iterations = $this->benchmark->iterations;
-        $this->total_execution_time = $this->benchmark->getExecutionTimeInMs();
-        $this->avg_iteration_time = $this->benchmark->getAverageExecutionTimeInMs();
-        $this->avg_iterations_sec = $this->benchmark->getAverageIterationsPerSecond();
-        $this->approx_memory_usage = $this->benchmark->getUnformattedMemoryUsage();
-
-        $this->php_version = PHP_VERSION;
-        $this->php_sapi = php_sapi_name();
-        $this->runner_os = PHP_OS;
-        $this->runner_arch = PHP_INT_SIZE * 8 .'-bit';
-        $this->xdebug_enabled = extension_loaded('xdebug');
-        $this->opcache_enabled = extension_loaded('opcache');
-    }
-}
diff --git a/tests/Benchmarks/CBench/TrackingHelpers.php b/tests/Benchmarks/CBench/TrackingHelpers.php
deleted file mode 100644
index 0924bcbf117..00000000000
--- a/tests/Benchmarks/CBench/TrackingHelpers.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks\CBench;
-
-trait TrackingHelpers
-{
-    public function getExecutionTimeInMs(int $precision = 2): float
-    {
-        return round(($this->time_end - $this->time_start) * 1000, $precision);
-    }
-
-    public function getAverageExecutionTimeInMs(int $precision = 8): float
-    {
-        return round($this->getExecutionTimeInMs(32) / $this->iterations, $precision);
-    }
-
-    public function getAverageIterationsPerSecond(): float
-    {
-        return round($this->iterations / ($this->getExecutionTimeInMs(32) / 1000), 2);
-    }
-
-    public function getUnformattedMemoryUsage(): string
-    {
-        return memory_get_usage(true);
-    }
-
-    public function getMemoryUsage(): string
-    {
-        $memory = memory_get_usage(true);
-
-        if ($memory < 1024) {
-            return $memory.'B';
-        }
-
-        if ($memory < 1048576) {
-            return round($memory / 1024, 2).'KB';
-        }
-
-        return round($memory / 1048576, 2).'MB';
-    }
-}
diff --git a/tests/Benchmarks/ExampleBenchmark.php b/tests/Benchmarks/ExampleBenchmark.php
deleted file mode 100644
index ae9f9c4e5fa..00000000000
--- a/tests/Benchmarks/ExampleBenchmark.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-class ExampleBenchmark extends BenchCase
-{
-    public function testExample()
-    {
-        $this->benchmark(function () {
-            return 'Hello World!';
-        });
-    }
-}
diff --git a/tests/Benchmarks/MarkdownBenchmark.php b/tests/Benchmarks/MarkdownBenchmark.php
deleted file mode 100644
index 33140268afa..00000000000
--- a/tests/Benchmarks/MarkdownBenchmark.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-use Hyde\Markdown\Models\Markdown;
-
-class MarkdownBenchmark extends BenchCase
-{
-    /**
-     * Results history:
-     * - #f4d8d452b: 0.42493788ms
-     * - #fd90ee987: 0.09853745ms.
-     */
-    public function testMarkdownParserFacadeShort()
-    {
-        $this->benchmark(function () {
-            return Markdown::render('Hello World!');
-        }, 1500);
-    }
-
-    /**
-     * Results history:
-     * - #f4d8d452b 2.62538815ms
-     * - #fd90ee987: 2.07124043ms.
-     */
-    public function testMarkdownParserFacadeFull()
-    {
-        $markdown = file_get_contents(__DIR__.'/../fixtures/markdown.md');
-        $this->benchmark(function () use ($markdown) {
-            return Markdown::render($markdown);
-        }, 500);
-    }
-}
diff --git a/tests/Benchmarks/PageParserBenchmark.php b/tests/Benchmarks/PageParserBenchmark.php
deleted file mode 100644
index 2ad4ebc8145..00000000000
--- a/tests/Benchmarks/PageParserBenchmark.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-use Hyde\Hyde;
-use Hyde\Pages\BladePage;
-use Hyde\Pages\DocumentationPage;
-use Hyde\Pages\MarkdownPage;
-use Hyde\Pages\MarkdownPost;
-use Tests\Benchmarks\CBench\Benchmark;
-
-class PageParserBenchmark extends BenchCase
-{
-    /**
-     * Results history:
-     * - #14c34beb1: 0.17022841ms.
-     * - #0db04eaef: 0.2702086ms.
-     * - #fd90ee987: 0.28220031ms.
-     * - #5a6dc0a0f: 0.21600821ms
-     */
-    public function testParseBladePageFile()
-    {
-        $this->mockConsoleOutput = false;
-        $this->artisan('publish:homepage posts -n');
-
-        $result = $this->benchmark(function () {
-            return BladePage::parse('index');
-        }, 10000);
-
-        $this->report($result);
-
-        $this->artisan('publish:homepage welcome -n');
-    }
-
-    /**
-     * Results history:
-     * - #8e165366a: 0.1986541ms.
-     * - #0db04eaef: 0.29952221ms.
-     * - #fd90ee987: 0.30080938ms.
-     * - #5a6dc0a0f: 0.2528477ms
-     */
-    public function testParseMarkdownPageFile()
-    {
-        $this->mockConsoleOutput = false;
-        $this->artisan('make:page Test -n');
-
-        $result = $this->benchmark(function () {
-            return MarkdownPage::parse('test');
-        }, 10000);
-
-        $this->report($result);
-
-        Hyde::unlink('_pages/test.md');
-    }
-
-    /**
-     * Results history:
-     * - #5d044679b: 0.30337441ms.
-     * - #0db04eaef: 0.39583502ms.
-     * - #fd90ee987: 0.41671791ms.
-     * - #5a6dc0a0f: 0.39680111ms
-     */
-    public function testParseMarkdownPostFile()
-    {
-        $this->mockConsoleOutput = false;
-        $this->artisan('make:post -n');
-
-        $result = $this->benchmark(function () {
-            return MarkdownPost::parse('my-new-post');
-        }, 10000);
-
-        $this->report($result);
-
-        Hyde::unlink('_posts/my-new-post.md');
-    }
-
-    /**
-     * Results history:
-     * - #6f63f5016: 0.16660199ms.
-     * - #0db04eaef: 0.2729635ms.
-     * - #fd90ee987: 0.27649839ms.
-     * - #5a6dc0a0f: 0.2145988ms
-     */
-    public function testParseDocumentationPageFile()
-    {
-        $this->mockConsoleOutput = false;
-        $this->artisan('make:page --docs Test -n');
-
-        $result = $this->benchmark(function () {
-            return DocumentationPage::parse('test');
-        }, 10000);
-
-        $this->report($result);
-
-        Hyde::unlink('_docs/test.md');
-    }
-
-    protected function report(Benchmark $benchmark): void
-    {
-        echo "- <b>$benchmark->runName</b> - avg_iteration_time\n";
-        echo '- #'.trim(shell_exec('git rev-parse --short HEAD')).
-            ": {$benchmark->getAverageExecutionTimeInMs()}ms\n";
-    }
-}
diff --git a/tests/Benchmarks/SearchIndexBenchmark.php b/tests/Benchmarks/SearchIndexBenchmark.php
deleted file mode 100644
index 2f396d766d6..00000000000
--- a/tests/Benchmarks/SearchIndexBenchmark.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-use Hyde\Hyde;
-
-class SearchIndexBenchmark extends BenchCase
-{
-    /**
-     * Results history:
-     * - #5555b676b: 26.75ms (with xdebug)
-     * - #2d73931ad: 19.41ms (with xdebug)
-     * - #fd90ee987: 10.0887394ms.
-     */
-    public function testBuildSearchIndexCommandNoFiles()
-    {
-        $this->benchmark(function () {
-            $this->artisan('build:search');
-        }, 50);
-
-        unlink(Hyde::path('_site/docs/search.json'));
-        unlink(Hyde::path('_site/docs/search.html'));
-    }
-
-    /**
-     * Results history:
-     * - #5555b676b: 120.45ms (with xdebug)
-     * - #2d73931ad: 105.91ms (with xdebug)
-     * - #fd90ee987: 36.29438877ms.
-     */
-    public function testBuildSearchIndexCommandWithFiles()
-    {
-        $this->mockRoute();
-
-        copy(Hyde::path('tests/fixtures/_posts/typography-simple.md'), Hyde::path('_docs/typography-simple.md'));
-        copy(Hyde::path('tests/fixtures/_posts/typography-front-matter.md'), Hyde::path('_docs/typography-front-matter.md'));
-        copy(Hyde::path('tests/fixtures/markdown-features.md'), Hyde::path('_docs/markdown-features.md'));
-        copy(Hyde::path('tests/fixtures/markdown.md'), Hyde::path('_docs/markdown.md'));
-        touch(Hyde::path('_docs/blank.md'));
-
-        $this->benchmark(function () {
-            $this->artisan('build:search');
-        }, 10);
-
-        $this->resetDocs();
-        unlink(Hyde::path('_site/docs/search.json'));
-        unlink(Hyde::path('_site/docs/search.html'));
-    }
-}
diff --git a/tests/Benchmarks/StaticSiteBuilderBenchmark.php b/tests/Benchmarks/StaticSiteBuilderBenchmark.php
deleted file mode 100644
index 7de145fce35..00000000000
--- a/tests/Benchmarks/StaticSiteBuilderBenchmark.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Benchmarks;
-
-use Hyde\Hyde;
-use Tests\Benchmarks\CBench\Benchmark;
-
-class StaticSiteBuilderBenchmark extends BenchCase
-{
-    /**
-     * Results history:
-     * - #49834e374: 76.05051994ms
-     * - #1cf136fc0: 85.29273033ms
-     * - #fd90ee987: 49.32703972ms.
-     */
-    public function testParseBladePageFile()
-    {
-        $this->mockConsoleOutput = false;
-        $this->artisan('publish:homepage posts -n');
-        $this->artisan('make:page Test -n');
-        $this->artisan('make:post -n');
-        $this->artisan('make:page --docs Test -n');
-
-        $result = $this->benchmark(function () {
-            return $this->artisan('build');
-        }, 100);
-
-        $this->report($result);
-
-        $this->artisan('publish:homepage welcome -n');
-        Hyde::unlink('_pages/test.md');
-        Hyde::unlink('_posts/my-new-post.md');
-        Hyde::unlink('_docs/test.md');
-    }
-
-    protected function report(Benchmark $benchmark): void
-    {
-        echo "- <b>$benchmark->runName</b> - avg_iteration_time\n";
-        echo '- #'.trim(shell_exec('git rev-parse --short HEAD')).
-            ": {$benchmark->getAverageExecutionTimeInMs()}ms\n";
-    }
-}
diff --git a/tests/Benchmarks/reports/.gitignore b/tests/Benchmarks/reports/.gitignore
deleted file mode 100644
index c96a04f008e..00000000000
--- a/tests/Benchmarks/reports/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file

From 4812c0ade84081810b7e73675b3a322b8afd7740 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:48:11 +0200
Subject: [PATCH 679/768] I give up. I will personally upgrade your site if you
 need it.

---
 RELEASE_NOTES.md | 56 +++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 41 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 123f3a37d78..61af9b0cbff 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -12,9 +12,17 @@ This serves two purposes:
 ### Added
 - for new features.
 
-### Changed
+### Breaking changes
+
+#### Abstract
+
+This release contains a plethora of breaking changes compared to the beta versions.
+So many in fact, it could actually be easier and faster to recreate your project from scratch than to upgrade a particularly complex project.
+
+The good news however, is that this release is the last one containing breaking changes.
+
+#### Major breaking changes
 
-#### Breaking changes
 These are changes that break backwards compatibility and that are likely to concern users using HydePHP to create sites.
 
 - HydePHP now requires PHP 8.1 or higher.
@@ -29,53 +37,19 @@ For example, if a namespace is changed, all internal references to that namespac
 If you however have written custom code that explicitly references the old namespace, you will need to update your code to use the new namespace.
 
 - The Framework package now uses strict types for its source files.
-- Changes and refactors regarding the internal metadata handling, see below.
-- The static class property used to determine the site output path has been moved.
-  * Instead of using `StaticPageBuilder::$outputPath` you must now use `Site::$outputPath`.
-- Major refactors to the Metadata services.
-  * Large changes to the Meta.php helper/facade; most of its business logic has been moved to the GlobalMetadataBag class.
-  * This might affect you if you relied on any of the helper methods that were removed from Meta.php.
-  * See https://github.com/hydephp/develop/pull/584 for more details.
-- The Route helpers no longer throw exceptions when attempting to access a non-existent route.
-  * Instead, they return `null` if the route does not exist.
-  * This is to allow for more flexibility in the way routes are used.
-  * You can use Route::getOrFail() to get the same behavior as before, or null coalesce the result of Route::get().
-
-### Other changes
-
-- Changes to normalize how navigation priorities are determined.
-  - The fallback navigation priority for all navigation items is now 999.
-  - The offset for config priorities is now +500 instead of +250 for sidebar navigation.
-  * This change may influence the order of navigation items in your site. Before deploying your site to production, you may want to review the order of your navigation items and adjust the priority of any items that are not in the order you want.
+
+### Changed
+
+- for changes in existing functionality.
 
 ### Deprecated
 - for soon-to-be removed features.
 
 ### Removed
-- Removed single usage trait AsksToRebuildSite.php (inlined into HydePublishHomepageCommand.php)
-- Removed interface ActionContract.php
+- for now removed features.
 
 ### Fixed
 - for any bug fixes.
 
 ### Security
 - in case of vulnerabilities.
-
-
----
-
-## Additional details about the internal changes
-
-These are additional details about the changes that are not relevant to the end user, but could be relevant to
-developers who write custom code and integrations using the HydePHP framework.
-
-### Changes and refactors regarding the internal metadata handling
-
-The internal metadata handling has been refactored to make it more flexible and easier to extend. If you have not written any custom code that interacts with the metadata system, you can skip this section.
-
-#### Class and namespace changes
- 
-- The MetadataBag class's namespace has been changed from `Hyde\Framework\Models\Metadata\MetadataBag` to `Hyde\Framework\Modules\Metadata\MetadataBag;`
-- All metadata models have been moved to the new namespace `Hyde\Framework\Modules\Metadata\Models`
-- All metadata models have been renamed, changing the suffix `Item` to `Element`
-- Renamed MetadataItemContract.php to MetadataElementContract.php in the new namespace `Hyde\Framework\Modules\Metadata`

From 0c4dc1b2c4343bee1d655198cebfe8c134303edd Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:48:23 +0200
Subject: [PATCH 680/768] Be a bit more helpful

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

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 61af9b0cbff..be440533c50 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -21,6 +21,18 @@ So many in fact, it could actually be easier and faster to recreate your project
 
 The good news however, is that this release is the last one containing breaking changes.
 
+While I've got your attention: read this the section right after this, as you might not need to make any changes at all.
+
+#### Do I need to make any changes to my project?
+
+If any of these statements are true, you will probably need to make changes to your project, and it might be easiest to copy over your content to a new project.
+
+- You currently only have PHP 8.0 installed, HydePHP now requires PHP 8.1.
+- You have written custom code (for example in Blade views) that relies on the old API.
+- You have published the built-in Blade views (you should be able to get away by just republishing them).
+
+In all cases, you will most definitely need to republish the configuration files.
+
 #### Major breaking changes
 
 These are changes that break backwards compatibility and that are likely to concern users using HydePHP to create sites.

From b1333e267f800f2a782e16201c89150369281f74 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 19:50:14 +0200
Subject: [PATCH 681/768] Version 1.0.0-dev!

---
 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 6abe2df7791..1892a3e5ce4 100644
--- a/packages/framework/src/Foundation/HydeKernel.php
+++ b/packages/framework/src/Foundation/HydeKernel.php
@@ -56,7 +56,7 @@ class HydeKernel implements Arrayable, JsonSerializable
 
     protected bool $booted = false;
 
-    public const VERSION = '0.64.0-dev';
+    public const VERSION = '1.0.0-dev';
 
     public function __construct(?string $basePath = null)
     {

From a7e2ed8367cff4be2dd580cd858372611ad850a8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:02:22 +0200
Subject: [PATCH 682/768] Fix coverage tags for factory classes

---
 packages/framework/tests/Feature/HydePageTest.php             | 4 +++-
 .../framework/tests/Feature/PageModelConstructorsTest.php     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 2807803ecae..bf8be0003c1 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -26,7 +26,9 @@
  * @covers \Hyde\Pages\Concerns\BaseMarkdownPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Factories\PageDataFactory
+ * @covers \Hyde\Framework\Factories\FeaturedImageFactory
+ * @covers \Hyde\Framework\Factories\HydePageDataFactory
+ * @covers \Hyde\Framework\Factories\BlogPostDataFactory
  */
 class HydePageTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index 88926eb52f0..8e65b72dc00 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -14,7 +14,9 @@
  *
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
- * @covers \Hyde\Framework\Factories\PageDataFactory
+ * @covers \Hyde\Framework\Factories\FeaturedImageFactory
+ * @covers \Hyde\Framework\Factories\HydePageDataFactory
+ * @covers \Hyde\Framework\Factories\BlogPostDataFactory
  */
 class PageModelConstructorsTest extends TestCase
 {

From 8d7a859c588641e59392e9cc80cbd99ee728e070 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:06:49 +0200
Subject: [PATCH 683/768] Test without service container to see if that affects
 coverage

---
 .../framework/tests/Framework/Feature/SessionTest.php  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index d28803d3a51..038b60c5a46 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -32,11 +32,13 @@ public function test_session_can_store_and_retrieve_data()
 
     public function test_session_can_forget_data()
     {
-        app(Session::class)->put('foo', 'bar');
-        $this->assertTrue(app(Session::class)->has('foo'));
+        $session = new Session();
 
-        app(Session::class)->forget('foo');
-        $this->assertFalse(app(Session::class)->has('foo'));
+        $session->put('foo', 'bar');
+        $this->assertTrue($session->has('foo'));
+
+        $session->forget('foo');
+        $this->assertFalse($session->has('foo'));
     }
 
     public function test_session_can_add_warning()

From dd0bc10744c0abc60fe52dde20ab6654260356e8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:09:57 +0200
Subject: [PATCH 684/768] Revert "Test without service container to see if that
 affects coverage"

This reverts commit 8d7a859c588641e59392e9cc80cbd99ee728e070.
---
 .../framework/tests/Framework/Feature/SessionTest.php  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Framework/Feature/SessionTest.php b/packages/framework/tests/Framework/Feature/SessionTest.php
index 038b60c5a46..d28803d3a51 100644
--- a/packages/framework/tests/Framework/Feature/SessionTest.php
+++ b/packages/framework/tests/Framework/Feature/SessionTest.php
@@ -32,13 +32,11 @@ public function test_session_can_store_and_retrieve_data()
 
     public function test_session_can_forget_data()
     {
-        $session = new Session();
-
-        $session->put('foo', 'bar');
-        $this->assertTrue($session->has('foo'));
+        app(Session::class)->put('foo', 'bar');
+        $this->assertTrue(app(Session::class)->has('foo'));
 
-        $session->forget('foo');
-        $this->assertFalse($session->has('foo'));
+        app(Session::class)->forget('foo');
+        $this->assertFalse(app(Session::class)->has('foo'));
     }
 
     public function test_session_can_add_warning()

From fbe31c8be4e7d7d7d94fa04e7ab2ec5492c63bfb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:08:33 +0200
Subject: [PATCH 685/768] Covers child classes

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

diff --git a/packages/framework/tests/Feature/FeaturedImageTest.php b/packages/framework/tests/Feature/FeaturedImageTest.php
index 4a48a67ec21..3e6c506afa6 100644
--- a/packages/framework/tests/Feature/FeaturedImageTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @covers \Hyde\Framework\Features\Blogging\Models\FeaturedImage
+ * @covers \Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage
+ * @covers \Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage
  */
 class FeaturedImageTest extends TestCase
 {

From 7b85d6b909ad9e629acb1acb490e747e7e8f191e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:11:11 +0200
Subject: [PATCH 686/768] Test exists method

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

diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index ac75ec8f004..509f6cb1989 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -182,4 +182,10 @@ public function testIsWithRouteKeyObject()
         $this->assertTrue($route->is(new RouteKey('foo')));
         $this->assertFalse($route->is(new RouteKey('bar')));
     }
+
+    public function testExists()
+    {
+        $this->assertTrue(Route::exists('index'));
+        $this->assertFalse(Route::exists('not-found'));
+    }
 }

From d8c5d6a550826e6d1ff493e2ce55f0377dd8ca6d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:12:59 +0200
Subject: [PATCH 687/768] Import as alias

---
 packages/framework/tests/Unit/Facades/RouteFacadeTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index 974363e155c..4ce2eb6e246 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Route;
+use Hyde\Support\Models\Route as RouteModel;
 use Hyde\Testing\TestCase;
 
 /**
@@ -14,6 +15,6 @@ class RouteFacadeTest extends TestCase
 {
     public function test_route_facade_can_call_methods_on_the_route_model()
     {
-        $this->assertEquals(Route::all(), \Hyde\Support\Models\Route::all());
+        $this->assertEquals(Route::all(), RouteModel::all());
     }
 }

From 1905ff9026203bcc67f96689681239701a96378d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:14:27 +0200
Subject: [PATCH 688/768] Test all methods

---
 .../tests/Unit/Facades/RouteFacadeTest.php    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index 4ce2eb6e246..daf7fe0bb2c 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -17,4 +17,29 @@ public function test_route_facade_can_call_methods_on_the_route_model()
     {
         $this->assertEquals(Route::all(), RouteModel::all());
     }
+
+    public function testGet()
+    {
+        $this->assertSame(Route::get('index'), RouteModel::get('index'));
+    }
+
+    public function testGetOrFail()
+    {
+        $this->assertSame(Route::getOrFail('index'), RouteModel::getOrFail('index'));
+    }
+
+    public function testAll()
+    {
+        $this->assertSame(Route::all(), RouteModel::all());
+    }
+
+    public function testCurrent()
+    {
+        $this->assertSame(Route::current(), RouteModel::current());
+    }
+
+    public function testExists()
+    {
+        $this->assertSame(Route::exists('index'), RouteModel::exists('index'));
+    }
 }

From 6511235ee20d231f003953fec74293861e63a6ad Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:14:37 +0200
Subject: [PATCH 689/768] Remove redundant test

---
 packages/framework/tests/Unit/Facades/RouteFacadeTest.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index daf7fe0bb2c..491a3bd7cda 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -13,11 +13,6 @@
  */
 class RouteFacadeTest extends TestCase
 {
-    public function test_route_facade_can_call_methods_on_the_route_model()
-    {
-        $this->assertEquals(Route::all(), RouteModel::all());
-    }
-
     public function testGet()
     {
         $this->assertSame(Route::get('index'), RouteModel::get('index'));

From a9bbcc461dd05f6207df5b31f0594f6c634f9748 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:14:59 +0200
Subject: [PATCH 690/768] Update test method names

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

diff --git a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
index 491a3bd7cda..c4525b7136a 100644
--- a/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
+++ b/packages/framework/tests/Unit/Facades/RouteFacadeTest.php
@@ -13,27 +13,27 @@
  */
 class RouteFacadeTest extends TestCase
 {
-    public function testGet()
+    public function testFacadeMethodGetCallsSameOnModel()
     {
         $this->assertSame(Route::get('index'), RouteModel::get('index'));
     }
 
-    public function testGetOrFail()
+    public function testFacadeMethodGetOrFailCallsSameOnModel()
     {
         $this->assertSame(Route::getOrFail('index'), RouteModel::getOrFail('index'));
     }
 
-    public function testAll()
+    public function testFacadeMethodAllCallsSameOnModel()
     {
         $this->assertSame(Route::all(), RouteModel::all());
     }
 
-    public function testCurrent()
+    public function testFacadeMethodCurrentCallsSameOnModel()
     {
         $this->assertSame(Route::current(), RouteModel::current());
     }
 
-    public function testExists()
+    public function testFacadeMethodExistsCallsSameOnModel()
     {
         $this->assertSame(Route::exists('index'), RouteModel::exists('index'));
     }

From 5bf62e6d267390867fac6a6490edc11c8499ff25 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:30:14 +0200
Subject: [PATCH 691/768] Remove internal marker to see if that affects
 coverage

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index a92cf43b8aa..9956d8389fc 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -10,7 +10,7 @@
  * Adds a simple session handler, arguably most useful to defer messages, for example,
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
- * @internal This class is currently experimental and should not be relied upon outside the framework.
+ * @experimental This class is currently experimental and should not be relied upon outside the framework.
  *
  * It's bound into the service container as a singleton and is not persisted.
  *

From 652f2eef4c0ccb56ba74bee31d4debd89693d63f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:38:24 +0200
Subject: [PATCH 692/768] Revert "Remove internal marker to see if that affects
 coverage"

This reverts commit 5bf62e6d267390867fac6a6490edc11c8499ff25.
---
 packages/framework/src/Framework/Features/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index 9956d8389fc..a92cf43b8aa 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -10,7 +10,7 @@
  * Adds a simple session handler, arguably most useful to defer messages, for example,
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
- * @experimental This class is currently experimental and should not be relied upon outside the framework.
+ * @internal This class is currently experimental and should not be relied upon outside the framework.
  *
  * It's bound into the service container as a singleton and is not persisted.
  *

From ffd77a96e76804280406063cbc6af7476422c1c4 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sat, 29 Oct 2022 21:38:45 +0200
Subject: [PATCH 693/768] Mark class with codeCoverageIgnore

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

diff --git a/packages/framework/src/Framework/Features/Session/Session.php b/packages/framework/src/Framework/Features/Session/Session.php
index a92cf43b8aa..e3ead641311 100644
--- a/packages/framework/src/Framework/Features/Session/Session.php
+++ b/packages/framework/src/Framework/Features/Session/Session.php
@@ -11,6 +11,7 @@
  * to asynchronously add warnings to be used at a later point in the request lifecycle.
  *
  * @internal This class is currently experimental and should not be relied upon outside the framework.
+ * @codeCoverageIgnore
  *
  * It's bound into the service container as a singleton and is not persisted.
  *

From 965a589252813df311dcc586616e980038ce1069 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:08:49 +0100
Subject: [PATCH 694/768] Set test sources

---
 .idea/develop.iml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/develop.iml b/.idea/develop.iml
index f3fc5e568d0..c6fd67dbf70 100644
--- a/.idea/develop.iml
+++ b/.idea/develop.iml
@@ -7,6 +7,9 @@
       <sourceFolder url="file://$MODULE_DIR$/packages/framework/tests" isTestSource="true" packagePrefix="Hyde\Framework\Testing\" />
       <sourceFolder url="file://$MODULE_DIR$/packages/realtime-compiler/src" isTestSource="false" packagePrefix="Hyde\RealtimeCompiler\" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="Hyde\Testing\" />
+      <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$/tests/Hyde/Feature" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/storage/app" />
       <excludeFolder url="file://$MODULE_DIR$/storage/framework" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/hyde" />

From 3e0a7c2d322187132db0b2668119ffb0ce3d9768 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:14:48 +0100
Subject: [PATCH 695/768] Rename test class to TestPage

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

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index bf8be0003c1..a73e0acc016 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -38,7 +38,7 @@ public function testSourceDirectory()
     {
         $this->assertSame(
             'source',
-            HandlesPageFilesystemTestClass::sourceDirectory()
+            TestPage::sourceDirectory()
         );
     }
 
@@ -46,7 +46,7 @@ public function testOutputDirectory()
     {
         $this->assertSame(
             'output',
-            HandlesPageFilesystemTestClass::outputDirectory()
+            TestPage::outputDirectory()
         );
     }
 
@@ -54,7 +54,7 @@ public function testFileExtension()
     {
         $this->assertSame(
             '.md',
-            HandlesPageFilesystemTestClass::fileExtension()
+            TestPage::fileExtension()
         );
     }
 
@@ -62,7 +62,7 @@ public function testSourcePath()
     {
         $this->assertSame(
             'source/hello-world.md',
-            HandlesPageFilesystemTestClass::sourcePath('hello-world')
+            TestPage::sourcePath('hello-world')
         );
     }
 
@@ -70,7 +70,7 @@ public function testOutputPath()
     {
         $this->assertSame(
             'output/hello-world.html',
-            HandlesPageFilesystemTestClass::outputPath('hello-world')
+            TestPage::outputPath('hello-world')
         );
     }
 
@@ -78,7 +78,7 @@ public function testGetSourcePath()
     {
         $this->assertSame(
             'source/hello-world.md',
-            (new HandlesPageFilesystemTestClass('hello-world'))->getSourcePath()
+            (new TestPage('hello-world'))->getSourcePath()
         );
     }
 
@@ -86,7 +86,7 @@ public function testGetOutputPath()
     {
         $this->assertSame(
             'output/hello-world.html',
-            (new HandlesPageFilesystemTestClass('hello-world'))->getOutputPath()
+            (new TestPage('hello-world'))->getOutputPath()
         );
     }
 
@@ -94,7 +94,7 @@ public function testGetLink()
     {
         $this->assertSame(
             'output/hello-world.html',
-            (new HandlesPageFilesystemTestClass('hello-world'))->getLink()
+            (new TestPage('hello-world'))->getLink()
         );
     }
 
@@ -811,15 +811,15 @@ public function testGetLinkWithPrettyUrls()
     {
         config(['site.pretty_urls' => true]);
         $this->assertEquals('output/hello-world',
-            (new HandlesPageFilesystemTestClass('hello-world'))->getLink()
+            (new TestPage('hello-world'))->getLink()
         );
     }
 
     public function testGetLinkUsesHyperlinksHelper()
     {
         $this->assertSame(
-            Hyde::formatLink((new HandlesPageFilesystemTestClass('hello-world'))->getOutputPath()),
-            (new HandlesPageFilesystemTestClass('hello-world'))->getLink()
+            Hyde::formatLink((new TestPage('hello-world'))->getOutputPath()),
+            (new TestPage('hello-world'))->getLink()
         );
     }
 
@@ -833,7 +833,7 @@ protected function resetDirectoryConfiguration(): void
     }
 }
 
-class HandlesPageFilesystemTestClass extends HydePage
+class TestPage extends HydePage
 {
     public static string $sourceDirectory = 'source';
     public static string $outputDirectory = 'output';

From deb82982fa7bac44f2d22d72ade752f342636a04 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:16:59 +0100
Subject: [PATCH 696/768] Test the make method

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

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index a73e0acc016..0044738cecb 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -98,6 +98,16 @@ public function testGetLink()
         );
     }
 
+    public function testMake()
+    {
+        $this->assertEquals(TestPage::make(), new TestPage());
+
+        $this->assertEquals(
+            TestPage::make('foo', ['foo' => 'bar']),
+            new TestPage('foo', ['foo' => 'bar'])
+        );
+    }
+
     public function testShowInNavigation()
     {
         $this->assertTrue((new BladePage('foo'))->showInNavigation());

From e360b88aab02c3105b52c5454b214ae43a8f9032 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:22:53 +0100
Subject: [PATCH 697/768] Disable 'Class constant referenced via child class'
 inspection

---
 .idea/inspectionProfiles/Project_Default.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 1f1088f20e1..f2d52d3eeb9 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -33,6 +33,7 @@
         </list>
       </option>
     </inspection_tool>
+    <inspection_tool class="PhpClassConstantAccessedViaChildClassInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpDocMissingThrowsInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpMissingStrictTypesDeclarationInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="PhpUnhandledExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />

From 50a675d04e5d4214e5dd8d60814bd40796a0920f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:23:46 +0100
Subject: [PATCH 698/768] Update message as server is no longer experimental

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index ec5cf38f93a..4824cfb7c4d 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -16,7 +16,7 @@ class ServeCommand extends Command
     protected $signature = 'serve {--port=8080} {--host=localhost}';
 
     /** @var string */
-    protected $description = 'Start the experimental realtime compiler.';
+    protected $description = 'Start the realtime compiler server.';
 
     public function handle(): int
     {

From 32be4c0d38b2e8550754dd41332336760fb165cb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:24:22 +0100
Subject: [PATCH 699/768] Add PHPDoc linking to the package

---
 packages/framework/src/Console/Commands/ServeCommand.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 4824cfb7c4d..d591194844f 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -9,6 +9,8 @@
 
 /**
  * Start the realtime compiler server.
+ *
+ * @see https://github.com/hydephp/realtime-compiler
  */
 class ServeCommand extends Command
 {

From 78a254f2ea7e97f448daa57b01515ef443fbf627 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:25:05 +0100
Subject: [PATCH 700/768] Extract helper method

---
 .../src/Console/Commands/ServeCommand.php          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index d591194844f..86b4dfeeae0 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -25,10 +25,7 @@ public function handle(): int
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
 
         $host = $this->option('host');
-        $port = $this->option('port');
-        if (! $port) {
-            $port = config('hyde.server.port', 8080);
-        }
+        $port = $this->getPort();
 
         $command = "php -S $host:$port ".Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');
         if (app()->environment('testing')) {
@@ -38,4 +35,13 @@ public function handle(): int
 
         return Command::SUCCESS;
     }
+
+    protected function getPort(): int
+    {
+        $port = $this->option('port');
+        if (!$port) {
+            $port = config('hyde.server.port', 8080);
+        }
+        return $port;
+    }
 }

From 665f0346a3a2fd263ec5a65f75174ccdc0d7102c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:27:03 +0100
Subject: [PATCH 701/768] Cast selection to int

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 86b4dfeeae0..31ce93962f9 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -42,6 +42,6 @@ protected function getPort(): int
         if (!$port) {
             $port = config('hyde.server.port', 8080);
         }
-        return $port;
+        return (int) $port;
     }
 }

From f8666006db25a36207e4213e1a3e9b4de7f4d738 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:29:56 +0100
Subject: [PATCH 702/768] Convert concatenation and string interpolation to a
 'sprintf()' call

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 31ce93962f9..dd278a498a2 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -27,7 +27,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $command = "php -S $host:$port ".Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');
+        $command = sprintf("php -S %s:%d %s", $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php'));
         if (app()->environment('testing')) {
             $command = 'echo '.$command;
         }

From 98445d29c9d85fa96a1870340cdc26b49113532b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:31:09 +0100
Subject: [PATCH 703/768] Add extra tests

---
 .../Feature/Commands/ServeCommandTest.php     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index ca6a10204dd..a3c595c3615 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -17,4 +17,25 @@ public function test_hyde_serve_command()
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
     }
+
+    public function test_hyde_serve_command_with_port_option()
+    {
+        $this->artisan('serve --port=8081')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
+
+    public function test_hyde_serve_command_with_host_option()
+    {
+        $this->artisan('serve --host=foo')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
+
+    public function test_hyde_serve_command_with_port_and_host_option()
+    {
+        $this->artisan('serve --port=8081 --host=foo')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
 }

From a229802755b3d4f222a14b1ebc25a9fdf96d525c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:32:34 +0100
Subject: [PATCH 704/768] Test the config

---
 .../Feature/Commands/ServeCommandTest.php      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index a3c595c3615..2827dbf5245 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -38,4 +38,22 @@ public function test_hyde_serve_command_with_port_and_host_option()
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
     }
+
+    public function test_hyde_serve_command_with_port_defined_in_config()
+    {
+        $this->app['config']->set('hyde.server.port', 8081);
+
+        $this->artisan('serve')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
+
+    public function test_hyde_serve_command_with_port_defined_in_config_and_port_option()
+    {
+        $this->app['config']->set('hyde.server.port', 8081);
+
+        $this->artisan('serve --port=8082')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
 }

From d6915cda63f085a7c0bc399508ee50da4e85d1f5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:34:18 +0100
Subject: [PATCH 705/768] Test with missing config

---
 .../tests/Feature/Commands/ServeCommandTest.php          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index 2827dbf5245..795b82feee5 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -56,4 +56,13 @@ public function test_hyde_serve_command_with_port_defined_in_config_and_port_opt
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
     }
+
+    public function test_hyde_serve_command_with_port_missing_in_config_and_port_option()
+    {
+        $this->app['config']->set('hyde.server.port');
+
+        $this->artisan('serve')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->assertExitCode(0);
+    }
 }

From 049a5e7cfa683bb1505de6bfafbd8efc86a6e99a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:36:19 +0100
Subject: [PATCH 706/768] Fix config mock calls

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

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index 795b82feee5..c65bf1d85d1 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -41,7 +41,7 @@ public function test_hyde_serve_command_with_port_and_host_option()
 
     public function test_hyde_serve_command_with_port_defined_in_config()
     {
-        $this->app['config']->set('hyde.server.port', 8081);
+        config(['hyde.server.port' => 8081]);
 
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
@@ -50,7 +50,7 @@ public function test_hyde_serve_command_with_port_defined_in_config()
 
     public function test_hyde_serve_command_with_port_defined_in_config_and_port_option()
     {
-        $this->app['config']->set('hyde.server.port', 8081);
+        config(['hyde.server.port' => 8081]);
 
         $this->artisan('serve --port=8082')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
@@ -59,7 +59,7 @@ public function test_hyde_serve_command_with_port_defined_in_config_and_port_opt
 
     public function test_hyde_serve_command_with_port_missing_in_config_and_port_option()
     {
-        $this->app['config']->set('hyde.server.port');
+        config(['hyde.server.port' => null]);
 
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')

From a75cc4bace906b4b7657cec42df513e9c468fa57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:37:16 +0100
Subject: [PATCH 707/768] Extract method

---
 .../src/Console/Commands/ServeCommand.php          | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index dd278a498a2..d8b749cf51a 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -27,11 +27,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $command = sprintf("php -S %s:%d %s", $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php'));
-        if (app()->environment('testing')) {
-            $command = 'echo '.$command;
-        }
-        passthru($command);
+        $this->runCommand(sprintf("php -S %s:%d %s", $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
 
         return Command::SUCCESS;
     }
@@ -44,4 +40,12 @@ protected function getPort(): int
         }
         return (int) $port;
     }
+
+    protected function runCommand(string $command): void
+    {
+        if (app()->environment('testing')) {
+            $command = 'echo ' . $command;
+        }
+        passthru($command);
+    }
 }

From cbcad47b57162cacdd600294b7ceb69a3976db2d Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:38:14 +0100
Subject: [PATCH 708/768] Format code style

---
 packages/framework/src/Console/Commands/ServeCommand.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index d8b749cf51a..7a3a2f256eb 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -6,6 +6,10 @@
 
 use Hyde\Hyde;
 use LaravelZero\Framework\Commands\Command;
+use function app;
+use function config;
+use function passthru;
+use function sprintf;
 
 /**
  * Start the realtime compiler server.
@@ -27,7 +31,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runCommand(sprintf("php -S %s:%d %s", $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
+        $this->runCommand(sprintf('php -S %s:%d %s', $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
 
         return Command::SUCCESS;
     }
@@ -35,7 +39,7 @@ public function handle(): int
     protected function getPort(): int
     {
         $port = $this->option('port');
-        if (!$port) {
+        if (! $port) {
             $port = config('hyde.server.port', 8080);
         }
         return (int) $port;

From b75039e113fbcbf6de3c82e08723776fbf316101 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:38:56 +0100
Subject: [PATCH 709/768] Change test mock to not call passthru at all

---
 packages/framework/src/Console/Commands/ServeCommand.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 7a3a2f256eb..521d17c615c 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -48,8 +48,9 @@ protected function getPort(): int
     protected function runCommand(string $command): void
     {
         if (app()->environment('testing')) {
-            $command = 'echo ' . $command;
+            $this->line($command);
+        } else {
+            passthru($command);
         }
-        passthru($command);
     }
 }

From 64455437d003fd5fdddb9c631b1212de57301b63 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:39:27 +0100
Subject: [PATCH 710/768] Rename helper method

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 521d17c615c..4c4c637ea3c 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -31,7 +31,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runCommand(sprintf('php -S %s:%d %s', $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
+        $this->runServerCommand(sprintf('php -S %s:%d %s', $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
 
         return Command::SUCCESS;
     }
@@ -45,7 +45,7 @@ protected function getPort(): int
         return (int) $port;
     }
 
-    protected function runCommand(string $command): void
+    protected function runServerCommand(string $command): void
     {
         if (app()->environment('testing')) {
             $this->line($command);

From e0614a8ae4eda6b92fb29a13a605a0adb79fcc6e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:40:16 +0100
Subject: [PATCH 711/768] Run assertion on the output

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

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index c65bf1d85d1..629cdd09310 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -15,6 +15,7 @@ public function test_hyde_serve_command()
     {
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8080')
             ->assertExitCode(0);
     }
 

From dab61f39603f272be5ecc9462fbfc94f846a25e6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:42:07 +0100
Subject: [PATCH 712/768] Add command assertions

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

diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index 629cdd09310..dff26f0c826 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -23,6 +23,7 @@ public function test_hyde_serve_command_with_port_option()
     {
         $this->artisan('serve --port=8081')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8081')
             ->assertExitCode(0);
     }
 
@@ -30,6 +31,7 @@ public function test_hyde_serve_command_with_host_option()
     {
         $this->artisan('serve --host=foo')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S foo:8080')
             ->assertExitCode(0);
     }
 
@@ -37,6 +39,7 @@ public function test_hyde_serve_command_with_port_and_host_option()
     {
         $this->artisan('serve --port=8081 --host=foo')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S foo:8081')
             ->assertExitCode(0);
     }
 
@@ -46,6 +49,7 @@ public function test_hyde_serve_command_with_port_defined_in_config()
 
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8081')
             ->assertExitCode(0);
     }
 
@@ -55,6 +59,7 @@ public function test_hyde_serve_command_with_port_defined_in_config_and_port_opt
 
         $this->artisan('serve --port=8082')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8082')
             ->assertExitCode(0);
     }
 
@@ -64,6 +69,7 @@ public function test_hyde_serve_command_with_port_missing_in_config_and_port_opt
 
         $this->artisan('serve')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8080')
             ->assertExitCode(0);
     }
 }

From 6fb811048696faf842558dcd29b023b35a358196 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:47:04 +0100
Subject: [PATCH 713/768] Remove default port value, otherwise config is never
 checked

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 4c4c637ea3c..12fafbec654 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -19,7 +19,7 @@
 class ServeCommand extends Command
 {
     /** @var string */
-    protected $signature = 'serve {--port=8080} {--host=localhost}';
+    protected $signature = 'serve {--port=} {--host=localhost}';
 
     /** @var string */
     protected $description = 'Start the realtime compiler server.';

From 4b3d9bc663f81619adee3447b1e71653c6c225eb Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:48:24 +0100
Subject: [PATCH 714/768] Fall back to default port if config can't be parsed

---
 .../framework/src/Console/Commands/ServeCommand.php    |  2 +-
 .../tests/Feature/Commands/ServeCommandTest.php        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 12fafbec654..fa881c0b1ea 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -42,7 +42,7 @@ protected function getPort(): int
         if (! $port) {
             $port = config('hyde.server.port', 8080);
         }
-        return (int) $port;
+        return (int) $port ?: 8080;
     }
 
     protected function runServerCommand(string $command): void
diff --git a/packages/framework/tests/Feature/Commands/ServeCommandTest.php b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
index dff26f0c826..03e03cb6ca5 100644
--- a/packages/framework/tests/Feature/Commands/ServeCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/ServeCommandTest.php
@@ -72,4 +72,14 @@ public function test_hyde_serve_command_with_port_missing_in_config_and_port_opt
             ->expectsOutputToContain('php -S localhost:8080')
             ->assertExitCode(0);
     }
+
+    public function test_hyde_serve_command_with_invalid_config_value()
+    {
+        config(['hyde.server.port' => 'foo']);
+
+        $this->artisan('serve')
+            ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
+            ->expectsOutputToContain('php -S localhost:8080')
+            ->assertExitCode(0);
+    }
 }

From 3625e502d6e845095629655118553e0228514bff Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:49:05 +0100
Subject: [PATCH 715/768] Set codeCoverageIgnore annotation

---
 packages/framework/src/Console/Commands/ServeCommand.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index fa881c0b1ea..56655326b57 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -50,6 +50,7 @@ protected function runServerCommand(string $command): void
         if (app()->environment('testing')) {
             $this->line($command);
         } else {
+            /** @codeCoverageIgnore */
             passthru($command);
         }
     }

From 970280d3c1a8d34b4687347dc5280e04da7b0aec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:49:55 +0100
Subject: [PATCH 716/768] Split comma-separated values into multiple lines

---
 packages/framework/src/Console/Commands/ServeCommand.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 56655326b57..ce624663bd0 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -31,7 +31,11 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runServerCommand(sprintf('php -S %s:%d %s', $host, $port, Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')));
+        $this->runServerCommand(sprintf('php -S %s:%d %s',
+            $host,
+            $port,
+            Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')
+        ));
 
         return Command::SUCCESS;
     }

From 1002fb7b5d2bdef950544dbc5329bcb9e3b142b5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:52:13 +0100
Subject: [PATCH 717/768] Revert "Convert concatenation and string
 interpolation to a 'sprintf()' call"

This reverts commit f8666006db25a36207e4213e1a3e9b4de7f4d738.
---
 packages/framework/src/Console/Commands/ServeCommand.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index ce624663bd0..9d5e1419b54 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -31,11 +31,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runServerCommand(sprintf('php -S %s:%d %s',
-            $host,
-            $port,
-            Hyde::path('vendor/hyde/realtime-compiler/bin/server.php')
-        ));
+        $this->runServerCommand("php -S $host:$port ".Hyde::path('vendor/hyde/realtime-compiler/bin/server.php'));
 
         return Command::SUCCESS;
     }

From 39837034bf689a4218912cb9db2e151b196fb317 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:52:57 +0100
Subject: [PATCH 718/768] Extract helper method

---
 packages/framework/src/Console/Commands/ServeCommand.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 9d5e1419b54..cf48b60f75a 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -31,7 +31,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runServerCommand("php -S $host:$port ".Hyde::path('vendor/hyde/realtime-compiler/bin/server.php'));
+        $this->runServerCommand("php -S $host:$port ". $this->getExecutablePath());
 
         return Command::SUCCESS;
     }
@@ -45,6 +45,11 @@ protected function getPort(): int
         return (int) $port ?: 8080;
     }
 
+    protected function getExecutablePath(): string
+    {
+        return Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');
+    }
+
     protected function runServerCommand(string $command): void
     {
         if (app()->environment('testing')) {

From 0012551d4a449b59814f1866f45e9ad8a167102b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:53:12 +0100
Subject: [PATCH 719/768] Convert concatenation to string interpolation

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index cf48b60f75a..fc5d5d03e9c 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -31,7 +31,7 @@ public function handle(): int
         $host = $this->option('host');
         $port = $this->getPort();
 
-        $this->runServerCommand("php -S $host:$port ". $this->getExecutablePath());
+        $this->runServerCommand("php -S $host:$port {$this->getExecutablePath()}");
 
         return Command::SUCCESS;
     }

From 332ad68eb6fb13ba03188020b51cd46ae3161fec Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:53:30 +0100
Subject: [PATCH 720/768] Inline variables

---
 packages/framework/src/Console/Commands/ServeCommand.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index fc5d5d03e9c..5c41c420582 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -28,10 +28,7 @@ public function handle(): int
     {
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
 
-        $host = $this->option('host');
-        $port = $this->getPort();
-
-        $this->runServerCommand("php -S $host:$port {$this->getExecutablePath()}");
+        $this->runServerCommand("php -S {$this->option('host')}:{$this->getPort()} {$this->getExecutablePath()}");
 
         return Command::SUCCESS;
     }

From a5a1d3ec7e968d7cf3d8b475af63c2e1083a21da Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:53:47 +0100
Subject: [PATCH 721/768] Convert string interpolation to a 'sprintf()' call

---
 packages/framework/src/Console/Commands/ServeCommand.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 5c41c420582..38596e2c86b 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -28,7 +28,11 @@ public function handle(): int
     {
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
 
-        $this->runServerCommand("php -S {$this->option('host')}:{$this->getPort()} {$this->getExecutablePath()}");
+        $this->runServerCommand(sprintf("php -S %s:%d %s",
+            $this->option('host'),
+            $this->getPort(),
+            $this->getExecutablePath()
+        ));
 
         return Command::SUCCESS;
     }

From 7ea4ba0cdba7e9370f6581c6746484186693601e Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:55:23 +0100
Subject: [PATCH 722/768] Swap order of flags

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 38596e2c86b..a92242e7f9c 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -19,7 +19,7 @@
 class ServeCommand extends Command
 {
     /** @var string */
-    protected $signature = 'serve {--port=} {--host=localhost}';
+    protected $signature = 'serve {--host=localhost} {--port=}';
 
     /** @var string */
     protected $description = 'Start the realtime compiler server.';

From fa020ea2804a4146b93c5f5f91bd62d232f00e64 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 14:58:35 +0100
Subject: [PATCH 723/768] Match display of default value

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index a92242e7f9c..af1ca9fd9b8 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -19,7 +19,7 @@
 class ServeCommand extends Command
 {
     /** @var string */
-    protected $signature = 'serve {--host=localhost} {--port=}';
+    protected $signature = 'serve {--host=localhost} {--port= : <comment> [default: 8080] </comment>}';
 
     /** @var string */
     protected $description = 'Start the realtime compiler server.';

From 78e3b1691a1aebf273bc4ef13501cf29eaeb16e3 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 15:05:04 +0100
Subject: [PATCH 724/768] Simplify port selection helper method

---
 .../framework/src/Console/Commands/ServeCommand.php    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index af1ca9fd9b8..5446e755cca 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -30,20 +30,16 @@ public function handle(): int
 
         $this->runServerCommand(sprintf("php -S %s:%d %s",
             $this->option('host'),
-            $this->getPort(),
+            $this->getPortSelection() ?: 8080,
             $this->getExecutablePath()
         ));
 
         return Command::SUCCESS;
     }
 
-    protected function getPort(): int
+    protected function getPortSelection(): int
     {
-        $port = $this->option('port');
-        if (! $port) {
-            $port = config('hyde.server.port', 8080);
-        }
-        return (int) $port ?: 8080;
+        return (int) ($this->option('port') ?: config('hyde.server.port', 8080));
     }
 
     protected function getExecutablePath(): string

From 0258bd76faea3c286de31992b7a5faf59384923e Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 14:54:17 +0000
Subject: [PATCH 725/768] Apply fixes from StyleCI

---
 packages/framework/src/Console/Commands/ServeCommand.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 5446e755cca..2fcf94d6129 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -4,10 +4,10 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Hyde;
-use LaravelZero\Framework\Commands\Command;
 use function app;
 use function config;
+use Hyde\Hyde;
+use LaravelZero\Framework\Commands\Command;
 use function passthru;
 use function sprintf;
 
@@ -28,7 +28,7 @@ public function handle(): int
     {
         $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
 
-        $this->runServerCommand(sprintf("php -S %s:%d %s",
+        $this->runServerCommand(sprintf('php -S %s:%d %s',
             $this->option('host'),
             $this->getPortSelection() ?: 8080,
             $this->getExecutablePath()

From febb983bf6fc5cae595414b04b0741bc347dc7a9 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:15:16 +0100
Subject: [PATCH 726/768] Remove unnecessary argument names

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

diff --git a/packages/framework/src/Console/Commands/MakePostCommand.php b/packages/framework/src/Console/Commands/MakePostCommand.php
index 0cbde3f972e..0a638fad032 100644
--- a/packages/framework/src/Console/Commands/MakePostCommand.php
+++ b/packages/framework/src/Console/Commands/MakePostCommand.php
@@ -42,10 +42,10 @@ public function handle(): int
 
         $this->info('Creating a post with the following details:');
         $creator = new CreatesNewMarkdownPostFile(
-            title: $title,
-            description: $description,
-            category: $category,
-            author: $author
+            $title,
+            $description,
+            $category,
+            $author
         );
 
         $this->line("Title: $creator->title");

From a1c582388cafd67a37ad1263a8472c643a58f0df Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:20:03 +0100
Subject: [PATCH 727/768] Replace unnecessary qualifiers with imports

---
 .../src/Foundation/Concerns/ManagesViewData.php          | 3 ++-
 .../src/Framework/Features/Metadata/MetadataBag.php      | 9 ++++++---
 .../Markdown/Contracts/FrontMatter/BlogPostSchema.php    | 4 +++-
 .../src/Markdown/Contracts/FrontMatter/PageSchema.php    | 4 +++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Foundation/Concerns/ManagesViewData.php b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
index 5e8be62248d..f0cfab0af22 100644
--- a/packages/framework/src/Foundation/Concerns/ManagesViewData.php
+++ b/packages/framework/src/Foundation/Concerns/ManagesViewData.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Foundation\Concerns;
 
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Illuminate\Support\Facades\View;
 
@@ -19,7 +20,7 @@ trait ManagesViewData
      *
      * @param  \Hyde\Pages\Concerns\HydePage  $page
      */
-    public function shareViewData(\Hyde\Pages\Concerns\HydePage $page): void
+    public function shareViewData(HydePage $page): void
     {
         View::share('page', $page);
         View::share('currentPage', $page->getRouteKey());
diff --git a/packages/framework/src/Framework/Features/Metadata/MetadataBag.php b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
index a8be0c4d339..84566bfd921 100644
--- a/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
+++ b/packages/framework/src/Framework/Features/Metadata/MetadataBag.php
@@ -4,6 +4,9 @@
 
 namespace Hyde\Framework\Features\Metadata;
 
+use Hyde\Framework\Features\Metadata\Elements\LinkElement;
+use Hyde\Framework\Features\Metadata\Elements\MetadataElement;
+use Hyde\Framework\Features\Metadata\Elements\OpenGraphElement;
 use Illuminate\Contracts\Support\Htmlable;
 
 /**
@@ -42,15 +45,15 @@ public function get(): array
 
     public function add(MetadataElementContract|string $element): static
     {
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\LinkElement) {
+        if ($element instanceof LinkElement) {
             return $this->addElement('links', $element);
         }
 
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\MetadataElement) {
+        if ($element instanceof MetadataElement) {
             return $this->addElement('metadata', $element);
         }
 
-        if ($element instanceof \Hyde\Framework\Features\Metadata\Elements\OpenGraphElement) {
+        if ($element instanceof OpenGraphElement) {
             return $this->addElement('properties', $element);
         }
 
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
index 6cd6c59a621..5201fea7848 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/BlogPostSchema.php
@@ -4,10 +4,12 @@
 
 namespace Hyde\Markdown\Contracts\FrontMatter;
 
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema;
+
 /**
  * @see \Hyde\Pages\MarkdownPost
  */
-interface BlogPostSchema extends \Hyde\Markdown\Contracts\FrontMatter\SubSchemas\FeaturedImageSchema
+interface BlogPostSchema extends FeaturedImageSchema
 {
     public const MARKDOWN_POST_SCHEMA = [
         'title'        => 'string',
diff --git a/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
index 06b3d9fce9d..26686747487 100644
--- a/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
+++ b/packages/framework/src/Markdown/Contracts/FrontMatter/PageSchema.php
@@ -4,10 +4,12 @@
 
 namespace Hyde\Markdown\Contracts\FrontMatter;
 
+use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
+
 /**
  * @see \Hyde\Pages\Concerns\HydePage
  */
-interface PageSchema extends \Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema
+interface PageSchema extends NavigationSchema
 {
     public const PAGE_SCHEMA = [
         'title'         => 'string',

From 366ef54c17a704ace472715ec0172891e5158281 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:28:13 +0100
Subject: [PATCH 728/768] Extract testing helper

---
 .../Feature/FeaturedImageFactoryTest.php      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index a49b899445d..fbbe513c41f 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Testing\Feature;
 
 use Hyde\Framework\Factories\FeaturedImageFactory;
+use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\LocalFeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\RemoteFeaturedImage;
 use Hyde\Markdown\Models\FrontMatter;
@@ -48,9 +49,9 @@ public function testWithDataFromSchema()
 
     public function testMakeMethodCreatesLocalImageWhenPathIsSet()
     {
-        $image = FeaturedImageFactory::make(new FrontMatter([
+        $image = $this->makeFromArray([
             'image.path' => 'path',
-        ]));
+        ]);
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertSame('media/path', $image->getSource());
@@ -58,9 +59,9 @@ public function testMakeMethodCreatesLocalImageWhenPathIsSet()
 
     public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
     {
-        $image = FeaturedImageFactory::make(new FrontMatter([
+        $image = $this->makeFromArray([
             'image.url' => 'url',
-        ]));
+        ]);
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
         $this->assertSame('url', $image->getSource());
@@ -68,10 +69,10 @@ public function testMakeMethodCreatesRemoteImageWhenUrlIsSet()
 
     public function testMakeMethodCreatesRemoteImageWhenBothUrlAndPathIsSet()
     {
-        $image = FeaturedImageFactory::make(new FrontMatter([
+        $image = $this->makeFromArray([
             'image.url' => 'url',
             'image.path' => 'path',
-        ]));
+        ]);
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
         $this->assertSame('url', $image->getSource());
@@ -82,14 +83,14 @@ public function testMakeMethodThrowsExceptionIfNoPathInformationIsSet()
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('No featured image source was found');
 
-        FeaturedImageFactory::make(new FrontMatter([]));
+        $this->makeFromArray([]);
     }
 
     public function testMakeMethodCanCreateImageFromJustString()
     {
-        $image = FeaturedImageFactory::make(new FrontMatter([
+        $image = $this->makeFromArray([
             'image' => 'foo',
-        ]));
+        ]);
 
         $this->assertInstanceOf(LocalFeaturedImage::class, $image);
         $this->assertSame('media/foo', $image->getSource());
@@ -97,11 +98,16 @@ public function testMakeMethodCanCreateImageFromJustString()
 
     public function testMakeMethodCanCreateImageFromJustStringWithUrl()
     {
-        $image = FeaturedImageFactory::make(new FrontMatter([
+        $image = $this->makeFromArray([
             'image' => 'https://example.com/foo',
-        ]));
+        ]);
 
         $this->assertInstanceOf(RemoteFeaturedImage::class, $image);
         $this->assertSame('https://example.com/foo', $image->getSource());
     }
+
+    protected function makeFromArray(array $matter): FeaturedImage
+    {
+        return FeaturedImageFactory::make(new FrontMatter($matter));
+    }
 }

From af326a3edef2595c248fc6f3670c384a600e2a57 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:30:42 +0100
Subject: [PATCH 729/768] Test image paths are normalized

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index fbbe513c41f..3a9bad839ad 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -106,6 +106,17 @@ public function testMakeMethodCanCreateImageFromJustStringWithUrl()
         $this->assertSame('https://example.com/foo', $image->getSource());
     }
 
+    public function testImagePathsAreNormalized()
+    {
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => 'foo'])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => 'media/foo'])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => '_media/foo'])->getSource());
+
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'foo'] ])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'media/foo'] ])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => '_media/foo'] ])->getSource());
+    }
+
     protected function makeFromArray(array $matter): FeaturedImage
     {
         return FeaturedImageFactory::make(new FrontMatter($matter));

From 62b2cdf1fac93d6b6326606ceb98a6f2e1cdf26b Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 15:30:54 +0000
Subject: [PATCH 730/768] Apply fixes from StyleCI

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

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 3a9bad839ad..596a21f0635 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -112,9 +112,9 @@ public function testImagePathsAreNormalized()
         $this->assertSame('media/foo', $this->makeFromArray(['image' => 'media/foo'])->getSource());
         $this->assertSame('media/foo', $this->makeFromArray(['image' => '_media/foo'])->getSource());
 
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'foo'] ])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'media/foo'] ])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => '_media/foo'] ])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'foo']])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'media/foo']])->getSource());
+        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => '_media/foo']])->getSource());
     }
 
     protected function makeFromArray(array $matter): FeaturedImage

From 72f1ba3c67aba56b6e2eb569c54d80d12b5495a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:36:34 +0100
Subject: [PATCH 731/768] Extract helper

---
 .../tests/Feature/FeaturedImageFactoryTest.php  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
index 596a21f0635..9f99cc9710e 100644
--- a/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
+++ b/packages/framework/tests/Feature/FeaturedImageFactoryTest.php
@@ -108,17 +108,22 @@ public function testMakeMethodCanCreateImageFromJustStringWithUrl()
 
     public function testImagePathsAreNormalized()
     {
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => 'foo'])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => 'media/foo'])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => '_media/foo'])->getSource());
+        $this->assertSourceIsSame('media/foo', ['image' => 'foo']);
+        $this->assertSourceIsSame('media/foo', ['image' => 'media/foo']);
+        $this->assertSourceIsSame('media/foo', ['image' => '_media/foo']);
 
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'foo']])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => 'media/foo']])->getSource());
-        $this->assertSame('media/foo', $this->makeFromArray(['image' => ['path' => '_media/foo']])->getSource());
+        $this->assertSourceIsSame('media/foo', ['image' => ['path' => 'foo']]);
+        $this->assertSourceIsSame('media/foo', ['image' => ['path' => 'media/foo']]);
+        $this->assertSourceIsSame('media/foo', ['image' => ['path' => '_media/foo']]);
     }
 
     protected function makeFromArray(array $matter): FeaturedImage
     {
         return FeaturedImageFactory::make(new FrontMatter($matter));
     }
+
+    protected function assertSourceIsSame(string $expected, array $matter): void
+    {
+        $this->assertSame($expected, $this->makeFromArray($matter)->getSource());
+    }
 }

From 79e7e39b30287368c8db8d199fc0184cc6a82ec2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:47:12 +0100
Subject: [PATCH 732/768] Entire method needs to be ignored

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

diff --git a/packages/framework/src/Console/Commands/ServeCommand.php b/packages/framework/src/Console/Commands/ServeCommand.php
index 2fcf94d6129..65a71150ee4 100644
--- a/packages/framework/src/Console/Commands/ServeCommand.php
+++ b/packages/framework/src/Console/Commands/ServeCommand.php
@@ -47,12 +47,12 @@ protected function getExecutablePath(): string
         return Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');
     }
 
+    /** @codeCoverageIgnore */
     protected function runServerCommand(string $command): void
     {
         if (app()->environment('testing')) {
             $this->line($command);
         } else {
-            /** @codeCoverageIgnore */
             passthru($command);
         }
     }

From c9ceeb4d029a0081276ee8e84f646d7ec9c8ca49 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:49:09 +0100
Subject: [PATCH 733/768] Test covers factory

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

diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index d92df155128..48d5e2fd774 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -15,6 +15,7 @@
 /**
  * @covers \Hyde\Pages\DocumentationPage
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class DocumentationPageTest extends TestCase
 {

From 022313655db746da6a3c621bed27fe56472c3e7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 16:55:33 +0100
Subject: [PATCH 734/768] Test covers factory

---
 .../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 80077c5a9d8..a622b011c00 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -16,6 +16,7 @@
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
  * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class DocumentationSidebarTest extends TestCase
 {

From d90968a5167426869ed7ebd12c4c0a161af064a7 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 16:29:26 +0000
Subject: [PATCH 735/768] Apply fixes from StyleCI

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

diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index c05588342a0..7ee3aee1859 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -3,12 +3,12 @@
 namespace Hyde\Testing;
 
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
+use Hyde\Framework\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPage;
 use Hyde\Support\Models\Route;
 use Illuminate\View\Component;
-use Hyde\Framework\Helpers\Features;
 use LaravelZero\Framework\Testing\TestCase as BaseTestCase;
 
 require_once __DIR__.'/helpers.php';

From 98d27178ff491231542904cb1d1d7882e027af80 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 17:31:05 +0100
Subject: [PATCH 736/768] Resolve merge conflict

---
 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 2ef9ba41519..70b733ee0cb 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -4,9 +4,9 @@
 
 namespace Hyde\Facades;
 
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use function count;
 use Hyde\Framework\Concerns\Internal\MockableFeatures;
-use Hyde\Framework\Concerns\JsonSerializesArrayable;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
 use Illuminate\Contracts\Support\Arrayable;

From e6390851cac57a438b9ebd12337e48b353a1befe Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 16:31:35 +0000
Subject: [PATCH 737/768] Apply fixes from StyleCI

---
 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 70b733ee0cb..ca097efd8cc 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -4,11 +4,11 @@
 
 namespace Hyde\Facades;
 
-use Hyde\Support\Concerns\JsonSerializesArrayable;
 use function count;
 use Hyde\Framework\Concerns\Internal\MockableFeatures;
 use Hyde\Framework\Services\DiscoveryService;
 use Hyde\Hyde;
+use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Str;
 use JsonSerializable;

From a9d97f6a5933bc68e166edf2acc256d835fd822f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 17:33:47 +0100
Subject: [PATCH 738/768] Resolve merge conflict

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

diff --git a/packages/testing/src/TestCase.php b/packages/testing/src/TestCase.php
index 7ee3aee1859..3defa894236 100644
--- a/packages/testing/src/TestCase.php
+++ b/packages/testing/src/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace Hyde\Testing;
 
+use Hyde\Facades\Features;
 use Hyde\Framework\Actions\ConvertsArrayToFrontMatter;
-use Hyde\Framework\Helpers\Features;
 use Hyde\Hyde;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\Pages\MarkdownPage;

From 6a73e4a3b4843875e80098538bceb413a90b9d1f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 18:53:43 +0100
Subject: [PATCH 739/768] Inline helper method

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

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index ae3ec8b11bf..bcb83c24670 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -15,15 +15,10 @@ trait ConstructsPageSchemas
 {
     protected function constructPageSchemas(): void
     {
-        $this->constructPageSchema();
+        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
 
         if ($this instanceof MarkdownPost) {
             $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
         }
     }
-
-    protected function constructPageSchema(): void
-    {
-        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
-    }
 }

From 29b7cddfab91a7a9438d89311004a5a14533c2af Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 18:55:02 +0100
Subject: [PATCH 740/768] Split comma-separated values into multiple lines

---
 .../Concerns/Internal/ConstructsPageSchemas.php          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index bcb83c24670..88158b8405d 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -15,7 +15,14 @@ trait ConstructsPageSchemas
 {
     protected function constructPageSchemas(): void
     {
-        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
+        $this->constructFactoryData(new HydePageDataFactory(
+            $this->matter,
+            $this->markdown ?? false,
+            $this::class,
+            $this->identifier,
+            $this->getOutputPath(),
+            $this->routeKey)
+        );
 
         if ($this instanceof MarkdownPost) {
             $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));

From d70cdd2f183f03a6db2b2f84658fd3effe8aad02 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 18:55:32 +0100
Subject: [PATCH 741/768] Use static instead of this

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 88158b8405d..f7ed4f18c61 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -18,7 +18,7 @@ protected function constructPageSchemas(): void
         $this->constructFactoryData(new HydePageDataFactory(
             $this->matter,
             $this->markdown ?? false,
-            $this::class,
+            static::class,
             $this->identifier,
             $this->getOutputPath(),
             $this->routeKey)

From 81c4698c903a8c36fed0693667520ed8c61c9810 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 18:55:59 +0100
Subject: [PATCH 742/768] Format parentheses

---
 .../src/Framework/Concerns/Internal/ConstructsPageSchemas.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index f7ed4f18c61..3bd71b6bd69 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -21,8 +21,8 @@ protected function constructPageSchemas(): void
             static::class,
             $this->identifier,
             $this->getOutputPath(),
-            $this->routeKey)
-        );
+            $this->routeKey
+        ));
 
         if ($this instanceof MarkdownPost) {
             $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));

From 237763a800750d466dce588e21b1be3649c27702 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:07:39 +0100
Subject: [PATCH 743/768] Create CoreDataObject.php

---
 .../Factories/Concerns/CoreDataObject.php     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php

diff --git a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
new file mode 100644
index 00000000000..27860857ab5
--- /dev/null
+++ b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Factories\Concerns;
+
+/**
+ * Experimental class to contain the core data for a page being constructed.
+ *
+ * It should contain immutable data known at the very start of construction.
+ * The data should contain everything needed to identify the unique page.
+ */
+final class CoreDataObject
+{
+    public function __construct(
+        public readonly string $pageClass,
+        public readonly string $identifier,
+        public readonly string $sourcePath,
+        public readonly string $outputPath,
+        public readonly string $routeKey,
+    ) {
+        //
+    }
+}

From 54d8a1514985e98d333b02fc415355bd4ebb84b1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:07:59 +0100
Subject: [PATCH 744/768] Implements Arrayable

---
 .../Factories/Concerns/CoreDataObject.php     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
index 27860857ab5..452f70955b1 100644
--- a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
+++ b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
@@ -4,14 +4,20 @@
 
 namespace Hyde\Framework\Factories\Concerns;
 
+use Hyde\Support\Concerns\JsonSerializesArrayable;
+use Illuminate\Contracts\Support\Arrayable;
+use JsonSerializable;
+
 /**
  * Experimental class to contain the core data for a page being constructed.
  *
  * It should contain immutable data known at the very start of construction.
  * The data should contain everything needed to identify the unique page.
  */
-final class CoreDataObject
+final class CoreDataObject implements Arrayable, JsonSerializable
 {
+    use JsonSerializesArrayable;
+
     public function __construct(
         public readonly string $pageClass,
         public readonly string $identifier,
@@ -21,4 +27,15 @@ public function __construct(
     ) {
         //
     }
+
+    public function toArray(): array
+    {
+        return [
+            'pageClass' => $this->pageClass,
+            'identifier' => $this->identifier,
+            'sourcePath' => $this->sourcePath,
+            'outputPath' => $this->outputPath,
+            'routeKey' => $this->routeKey,
+        ];
+    }
 }

From 0b789f82a6c19e2efb3d243187820feaede9698f Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:08:14 +0100
Subject: [PATCH 745/768] Adds front matter and markdown data

---
 .../src/Framework/Factories/Concerns/CoreDataObject.php    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
index 452f70955b1..103bd9b6bc3 100644
--- a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
+++ b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
@@ -4,6 +4,8 @@
 
 namespace Hyde\Framework\Factories\Concerns;
 
+use Hyde\Markdown\Models\FrontMatter;
+use Hyde\Markdown\Models\Markdown;
 use Hyde\Support\Concerns\JsonSerializesArrayable;
 use Illuminate\Contracts\Support\Arrayable;
 use JsonSerializable;
@@ -12,13 +14,16 @@
  * Experimental class to contain the core data for a page being constructed.
  *
  * It should contain immutable data known at the very start of construction.
- * The data should contain everything needed to identify the unique page.
+ * In addition to the front matter and markdown, the data should contain
+ * everything needed to identify the unique page being constructed.
  */
 final class CoreDataObject implements Arrayable, JsonSerializable
 {
     use JsonSerializesArrayable;
 
     public function __construct(
+        public readonly FrontMatter $matter,
+        public readonly Markdown|false $markdown,
         public readonly string $pageClass,
         public readonly string $identifier,
         public readonly string $sourcePath,

From 72fb096ce052fb84be7578ff197a9f99f248cbbc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:09:08 +0100
Subject: [PATCH 746/768] Replace promoted properties with traditional property
 declaration

---
 .../Factories/HydePageDataFactory.php         | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 449a058dee1..79aa8ebca48 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -25,15 +25,27 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     protected readonly string $title;
     protected readonly ?string $canonicalUrl;
     protected readonly ?NavigationData $navigation;
+    private readonly string $routeKey;
+    private readonly string $outputPath;
+    private readonly string $identifier;
+    private readonly string $pageClass;
+    private readonly Markdown|false $markdown;
+    private readonly FrontMatter $matter;
 
     public function __construct(
-        private readonly FrontMatter $matter,
-        private readonly Markdown|false $markdown,
-        private readonly string $pageClass,
-        private readonly string $identifier,
-        private readonly string $outputPath,
-        private readonly string $routeKey,
+        FrontMatter $matter,
+        Markdown|false $markdown,
+        string $pageClass,
+        string $identifier,
+        string $outputPath,
+        string $routeKey,
     ) {
+        $this->matter = $matter;
+        $this->markdown = $markdown;
+        $this->pageClass = $pageClass;
+        $this->identifier = $identifier;
+        $this->outputPath = $outputPath;
+        $this->routeKey = $routeKey;
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From 9f18bf9a96d4d8eff5ce9675126b96b93c32177b Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:11:49 +0100
Subject: [PATCH 747/768] Refactor factory to accept the new data object class

---
 .../Internal/ConstructsPageSchemas.php        | 10 +++++++---
 .../Factories/HydePageDataFactory.php         | 20 ++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index 3bd71b6bd69..c6a2373542c 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Concerns\Internal;
 
 use Hyde\Framework\Factories\BlogPostDataFactory;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Factories\HydePageDataFactory;
 use Hyde\Pages\MarkdownPost;
 
@@ -15,14 +16,17 @@ trait ConstructsPageSchemas
 {
     protected function constructPageSchemas(): void
     {
-        $this->constructFactoryData(new HydePageDataFactory(
+        $pageData = new CoreDataObject(
             $this->matter,
             $this->markdown ?? false,
             static::class,
             $this->identifier,
+            $this->getSourcePath(),
             $this->getOutputPath(),
-            $this->routeKey
-        ));
+            $this->getRouteKey(),
+        );
+
+        $this->constructFactoryData(new HydePageDataFactory($pageData));
 
         if ($this instanceof MarkdownPost) {
             $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 79aa8ebca48..e3c3fa94dce 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Hyde;
 use Hyde\Markdown\Contracts\FrontMatter\PageSchema;
@@ -33,19 +34,14 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     private readonly FrontMatter $matter;
 
     public function __construct(
-        FrontMatter $matter,
-        Markdown|false $markdown,
-        string $pageClass,
-        string $identifier,
-        string $outputPath,
-        string $routeKey,
+        private readonly CoreDataObject $pageData,
     ) {
-        $this->matter = $matter;
-        $this->markdown = $markdown;
-        $this->pageClass = $pageClass;
-        $this->identifier = $identifier;
-        $this->outputPath = $outputPath;
-        $this->routeKey = $routeKey;
+        $this->matter = $this->pageData->matter;
+        $this->markdown = $this->pageData->markdown;
+        $this->pageClass = $this->pageData->pageClass;
+        $this->identifier = $this->pageData->identifier;
+        $this->outputPath = $this->pageData->outputPath;
+        $this->routeKey = $this->pageData->routeKey;
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From 82f31d8284f8199ddad0d91038134426056c7453 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:17:17 +0100
Subject: [PATCH 748/768] Move helpers from deprecated trait to HasFactory
 trait

---
 .../Internal/ConstructsPageSchemas.php        | 19 +--------------
 .../Factories/Concerns/HasFactory.php         | 23 +++++++++++++++++++
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index c6a2373542c..126845bf707 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -14,22 +14,5 @@
  */
 trait ConstructsPageSchemas
 {
-    protected function constructPageSchemas(): void
-    {
-        $pageData = new CoreDataObject(
-            $this->matter,
-            $this->markdown ?? false,
-            static::class,
-            $this->identifier,
-            $this->getSourcePath(),
-            $this->getOutputPath(),
-            $this->getRouteKey(),
-        );
-
-        $this->constructFactoryData(new HydePageDataFactory($pageData));
-
-        if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
-        }
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index c49e944e885..5e066856e1f 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -4,6 +4,10 @@
 
 namespace Hyde\Framework\Factories\Concerns;
 
+use Hyde\Framework\Factories\BlogPostDataFactory;
+use Hyde\Framework\Factories\HydePageDataFactory;
+use Hyde\Pages\MarkdownPost;
+
 trait HasFactory
 {
     public function constructFactoryData(PageDataFactory $data): void
@@ -12,4 +16,23 @@ public function constructFactoryData(PageDataFactory $data): void
             $this->{$key} = $value;
         }
     }
+
+    protected function constructPageSchemas(): void
+    {
+        $pageData = new CoreDataObject(
+            $this->matter,
+            $this->markdown ?? false,
+            static::class,
+            $this->identifier,
+            $this->getSourcePath(),
+            $this->getOutputPath(),
+            $this->getRouteKey(),
+        );
+
+        $this->constructFactoryData(new HydePageDataFactory($pageData));
+
+        if ($this instanceof MarkdownPost) {
+            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
+        }
+    }
 }

From 1f34ac4acac522032d940eba919c7680a8f3fef6 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:17:49 +0100
Subject: [PATCH 749/768] No longer use deprecated trait

---
 packages/framework/src/Pages/Concerns/HydePage.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index 5bcfe3b7728..0700f1c1925 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -7,7 +7,6 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
-use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Factories\Concerns\HasFactory;
 use Hyde\Framework\Features\Metadata\PageMetadataBag;
 use Hyde\Framework\Features\Navigation\NavigationData;
@@ -37,7 +36,6 @@
  */
 abstract class HydePage implements PageSchema
 {
-    use ConstructsPageSchemas;
     use InteractsWithFrontMatter;
     use HasFactory;
 

From a4dc27452dca15b9e3768f656cd7993bb22bf26c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:19:56 +0100
Subject: [PATCH 750/768] Move helpers from deprecated trait to HasFactory
 trait

---
 .../Internal/ConstructsPageSchemas.php         | 14 +-------------
 .../Factories/Concerns/HasFactory.php          | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
index ae3ec8b11bf..595f5b30a59 100644
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
@@ -13,17 +13,5 @@
  */
 trait ConstructsPageSchemas
 {
-    protected function constructPageSchemas(): void
-    {
-        $this->constructPageSchema();
-
-        if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
-        }
-    }
-
-    protected function constructPageSchema(): void
-    {
-        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
-    }
+    //
 }
diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index c49e944e885..7569ad8d01a 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -4,6 +4,10 @@
 
 namespace Hyde\Framework\Factories\Concerns;
 
+use Hyde\Framework\Factories\BlogPostDataFactory;
+use Hyde\Framework\Factories\HydePageDataFactory;
+use Hyde\Pages\MarkdownPost;
+
 trait HasFactory
 {
     public function constructFactoryData(PageDataFactory $data): void
@@ -12,4 +16,18 @@ public function constructFactoryData(PageDataFactory $data): void
             $this->{$key} = $value;
         }
     }
+
+    protected function constructPageSchemas(): void
+    {
+        $this->constructPageSchema();
+
+        if ($this instanceof MarkdownPost) {
+            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
+        }
+    }
+
+    protected function constructPageSchema(): void
+    {
+        $this->constructFactoryData(new HydePageDataFactory($this->matter, $this->markdown ?? false, $this::class, $this->identifier, $this->getOutputPath(), $this->routeKey));
+    }
 }

From 8c831ab613c46d1b24a72f5a7d00bda505daa0e2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:17:49 +0100
Subject: [PATCH 751/768] No longer use deprecated trait

---
 packages/framework/src/Pages/Concerns/HydePage.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index 5bcfe3b7728..0700f1c1925 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -7,7 +7,6 @@
 use Hyde\Foundation\PageCollection;
 use Hyde\Framework\Actions\SourceFileParser;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
-use Hyde\Framework\Concerns\Internal\ConstructsPageSchemas;
 use Hyde\Framework\Factories\Concerns\HasFactory;
 use Hyde\Framework\Features\Metadata\PageMetadataBag;
 use Hyde\Framework\Features\Navigation\NavigationData;
@@ -37,7 +36,6 @@
  */
 abstract class HydePage implements PageSchema
 {
-    use ConstructsPageSchemas;
     use InteractsWithFrontMatter;
     use HasFactory;
 

From 34346d3ae8ab8d781ce127ac796f3a91bfaeae12 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:20:40 +0100
Subject: [PATCH 752/768] Update coverage annotations

---
 packages/framework/tests/Feature/HydePageTest.php               | 2 +-
 packages/framework/tests/Feature/MarkdownPostTest.php           | 2 +-
 packages/framework/tests/Feature/PageModelConstructorsTest.php  | 2 +-
 .../tests/Feature/Services/DocumentationSidebarTest.php         | 2 +-
 packages/framework/tests/Unit/DocumentationPageTest.php         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 0044738cecb..96f3c108ceb 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -24,7 +24,7 @@
  *
  * @covers \Hyde\Pages\Concerns\HydePage
  * @covers \Hyde\Pages\Concerns\BaseMarkdownPage
- * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Factories\FeaturedImageFactory
  * @covers \Hyde\Framework\Factories\HydePageDataFactory
diff --git a/packages/framework/tests/Feature/MarkdownPostTest.php b/packages/framework/tests/Feature/MarkdownPostTest.php
index 78c8b2b50ff..3e795b84b1e 100644
--- a/packages/framework/tests/Feature/MarkdownPostTest.php
+++ b/packages/framework/tests/Feature/MarkdownPostTest.php
@@ -13,7 +13,7 @@
 
 /**
  * @covers \Hyde\Pages\MarkdownPost
- * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  */
 class MarkdownPostTest extends TestCase
 {
diff --git a/packages/framework/tests/Feature/PageModelConstructorsTest.php b/packages/framework/tests/Feature/PageModelConstructorsTest.php
index 8e65b72dc00..197a3079ec7 100644
--- a/packages/framework/tests/Feature/PageModelConstructorsTest.php
+++ b/packages/framework/tests/Feature/PageModelConstructorsTest.php
@@ -12,7 +12,7 @@
 /**
  * Test the constructor actions and schema constructors for page models.
  *
- * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  * @covers \Hyde\Framework\Factories\FeaturedImageFactory
  * @covers \Hyde\Framework\Factories\HydePageDataFactory
diff --git a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
index a622b011c00..d6248689649 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSidebarTest.php
@@ -15,7 +15,7 @@
 
 /**
  * @covers \Hyde\Framework\Features\Navigation\DocumentationSidebar
- * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class DocumentationSidebarTest extends TestCase
diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php
index 48d5e2fd774..3e768bbb7e0 100644
--- a/packages/framework/tests/Unit/DocumentationPageTest.php
+++ b/packages/framework/tests/Unit/DocumentationPageTest.php
@@ -14,7 +14,7 @@
 
 /**
  * @covers \Hyde\Pages\DocumentationPage
- * @covers \Hyde\Framework\Concerns\Internal\ConstructsPageSchemas
+ * @covers \Hyde\Framework\Factories\Concerns\HasFactory
  * @covers \Hyde\Framework\Factories\NavigationDataFactory
  */
 class DocumentationPageTest extends TestCase

From ce31f12f43094eab8bca25c2292afb82963b2db8 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:20:56 +0100
Subject: [PATCH 753/768] Delete ConstructsPageSchemas.php

---
 .../Concerns/Internal/ConstructsPageSchemas.php | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php

diff --git a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php b/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
deleted file mode 100644
index 595f5b30a59..00000000000
--- a/packages/framework/src/Framework/Concerns/Internal/ConstructsPageSchemas.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Concerns\Internal;
-
-use Hyde\Framework\Factories\BlogPostDataFactory;
-use Hyde\Framework\Factories\HydePageDataFactory;
-use Hyde\Pages\MarkdownPost;
-
-/**
- * @deprecated Refactor to use factories instead.
- */
-trait ConstructsPageSchemas
-{
-    //
-}

From ea30130417f637a4d1d9162baf611b971dc0ccdc Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:27:25 +0100
Subject: [PATCH 754/768] Extract helper

---
 .../Factories/Concerns/HasFactory.php         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 5e066856e1f..543b9398d07 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -19,7 +19,18 @@ public function constructFactoryData(PageDataFactory $data): void
 
     protected function constructPageSchemas(): void
     {
-        $pageData = new CoreDataObject(
+        $pageData = $this->getCoreDataObject();
+
+        $this->constructFactoryData(new HydePageDataFactory($pageData));
+
+        if ($this instanceof MarkdownPost) {
+            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
+        }
+    }
+
+    protected function getCoreDataObject(): CoreDataObject
+    {
+        return new CoreDataObject(
             $this->matter,
             $this->markdown ?? false,
             static::class,
@@ -28,11 +39,5 @@ protected function constructPageSchemas(): void
             $this->getOutputPath(),
             $this->getRouteKey(),
         );
-
-        $this->constructFactoryData(new HydePageDataFactory($pageData));
-
-        if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
-        }
     }
 }

From 92be24341407a28281b1ee4757e379644f6dc2a5 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:27:36 +0100
Subject: [PATCH 755/768] Make helper public

---
 .../framework/src/Framework/Factories/Concerns/HasFactory.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 543b9398d07..4e264a74a65 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -19,7 +19,7 @@ public function constructFactoryData(PageDataFactory $data): void
 
     protected function constructPageSchemas(): void
     {
-        $pageData = $this->getCoreDataObject();
+        $pageData = $this->toCoreDataObject();
 
         $this->constructFactoryData(new HydePageDataFactory($pageData));
 
@@ -28,7 +28,7 @@ protected function constructPageSchemas(): void
         }
     }
 
-    protected function getCoreDataObject(): CoreDataObject
+    public function toCoreDataObject(): CoreDataObject
     {
         return new CoreDataObject(
             $this->matter,

From 6b8d11b337a220787fc1993dd73c55bec8bee06a Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:34:15 +0100
Subject: [PATCH 756/768] Add more class documentation

---
 .../src/Framework/Factories/Concerns/CoreDataObject.php       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
index 103bd9b6bc3..f3915b99142 100644
--- a/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
+++ b/packages/framework/src/Framework/Factories/Concerns/CoreDataObject.php
@@ -16,6 +16,10 @@
  * It should contain immutable data known at the very start of construction.
  * In addition to the front matter and markdown, the data should contain
  * everything needed to identify the unique page being constructed.
+ *
+ * The benefit of using this class over passing around the page object when constructing a page is
+ * that the latter's state is unpredictable due to the nature of the construction process continuously
+ * mutating the page object. This class on the other hand is immutable, making it highly predictable.
  */
 final class CoreDataObject implements Arrayable, JsonSerializable
 {

From f2d4ed3e370b1a9b1ff40b827b78fc7e6d6d3e90 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:30:35 +0100
Subject: [PATCH 757/768] BlogPostDataFactory now uses the CoreDataObject

---
 .../src/Framework/Factories/BlogPostDataFactory.php        | 7 ++++---
 .../src/Framework/Factories/Concerns/HasFactory.php        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
index 802707d4a91..cd173a2ea3c 100644
--- a/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
+++ b/packages/framework/src/Framework/Factories/BlogPostDataFactory.php
@@ -5,6 +5,7 @@
 namespace Hyde\Framework\Factories;
 
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Features\Blogging\Models\FeaturedImage;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
 use Hyde\Markdown\Contracts\FrontMatter\BlogPostSchema;
@@ -42,10 +43,10 @@ class BlogPostDataFactory extends Concerns\PageDataFactory implements BlogPostSc
     protected readonly ?PostAuthor $author;
     protected readonly ?FeaturedImage $image;
 
-    public function __construct(FrontMatter $matter, Markdown $markdown)
+    public function __construct(CoreDataObject $pageData)
     {
-        $this->matter = $matter;
-        $this->markdown = $markdown;
+        $this->matter = $pageData->matter;
+        $this->markdown = $pageData->markdown;
 
         $this->description = $this->makeDescription();
         $this->category = $this->makeCategory();
diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 4e264a74a65..714f3d5d401 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -24,7 +24,7 @@ protected function constructPageSchemas(): void
         $this->constructFactoryData(new HydePageDataFactory($pageData));
 
         if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostDataFactory($this->matter, $this->markdown));
+            $this->constructFactoryData(new BlogPostDataFactory($pageData));
         }
     }
 

From 7f51c5dc7ab894298151ef7bc7096b28de2e98a7 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:39:23 +0100
Subject: [PATCH 758/768] NavigationDataFactory now uses the CoreDataObject

---
 .../Factories/HydePageDataFactory.php         |  2 +-
 .../Factories/NavigationDataFactory.php       | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index e3c3fa94dce..eeb7c6cee3b 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -68,7 +68,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationDataFactory::make($this->matter, $this->identifier, $this->pageClass, $this->routeKey, $this->title);
+        return NavigationDataFactory::make($this->pageData, $this->title);
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 1861af69c87..d19df538137 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Factories;
 
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use function array_flip;
 use function array_key_exists;
 use function array_merge;
@@ -39,14 +40,21 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     protected readonly ?string $group;
     protected readonly ?bool $hidden;
     protected readonly ?int $priority;
+    private readonly string $title;
+    private readonly string $routeKey;
+    private readonly string $pageClass;
+    private readonly string $identifier;
+    private readonly FrontMatter $matter;
 
     public function __construct(
-        private readonly FrontMatter $matter,
-        private readonly string $identifier,
-        private readonly string $pageClass,
-        private readonly string $routeKey,
-        private readonly string $title,
+        private readonly CoreDataObject $pageData,
+        string $title,
     ) {
+        $this->matter = $this->pageData->matter;
+        $this->identifier = $this->pageData->identifier;
+        $this->pageClass = $this->pageData->pageClass;
+        $this->routeKey = $this->pageData->routeKey;
+        $this->title = $title;
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
         $this->hidden = $this->makeHidden();
@@ -63,10 +71,10 @@ public function toArray(): array
         ];
     }
 
-    public static function make(FrontMatter $matter, string $identifier, string $pageClass, string $routeKey, string $title): NavigationData
+    public static function make(CoreDataObject $pageData, string $title): NavigationData
     {
         return NavigationData::make(
-            (new static($matter, $identifier, $pageClass, $routeKey, $title))->toArray()
+            (new static($pageData, $title))->toArray()
         );
     }
 

From ce50a33092bbbe6db08cf656881c619766cc5346 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 18:40:37 +0000
Subject: [PATCH 759/768] Apply fixes from StyleCI

---
 .../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 d19df538137..4f4c03c055e 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -4,12 +4,12 @@
 
 namespace Hyde\Framework\Factories;
 
-use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use function array_flip;
 use function array_key_exists;
 use function array_merge;
 use function config;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
 use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Markdown\Models\FrontMatter;

From c62743816d96112e3191deb81f0a6397d44778d1 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:41:43 +0100
Subject: [PATCH 760/768] Simplified constructor can now be on single line

---
 .../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 4f4c03c055e..21166d9eeb4 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -73,9 +73,7 @@ public function toArray(): array
 
     public static function make(CoreDataObject $pageData, string $title): NavigationData
     {
-        return NavigationData::make(
-            (new static($pageData, $title))->toArray()
-        );
+        return NavigationData::make((new static($pageData, $title))->toArray());
     }
 
     protected function makeLabel(): ?string

From 4a61277724adf948641391293ea110af0a668d7c Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:42:36 +0100
Subject: [PATCH 761/768] Parameter only used in constructor does not need to
 be a class property

---
 .../src/Framework/Factories/NavigationDataFactory.php  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 21166d9eeb4..5b324bffcef 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -47,13 +47,13 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     private readonly FrontMatter $matter;
 
     public function __construct(
-        private readonly CoreDataObject $pageData,
+        CoreDataObject $pageData,
         string $title,
     ) {
-        $this->matter = $this->pageData->matter;
-        $this->identifier = $this->pageData->identifier;
-        $this->pageClass = $this->pageData->pageClass;
-        $this->routeKey = $this->pageData->routeKey;
+        $this->matter = $pageData->matter;
+        $this->identifier = $pageData->identifier;
+        $this->pageClass = $pageData->pageClass;
+        $this->routeKey = $pageData->routeKey;
         $this->title = $title;
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();

From 758cd617be2f7ad3c80793c7634594505f3c18d2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:43:02 +0100
Subject: [PATCH 762/768] Format constructor

---
 .../src/Framework/Factories/NavigationDataFactory.php       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 5b324bffcef..b24e6880327 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -46,15 +46,13 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     private readonly string $identifier;
     private readonly FrontMatter $matter;
 
-    public function __construct(
-        CoreDataObject $pageData,
-        string $title,
-    ) {
+    public function __construct(CoreDataObject $pageData, string $title) {
         $this->matter = $pageData->matter;
         $this->identifier = $pageData->identifier;
         $this->pageClass = $pageData->pageClass;
         $this->routeKey = $pageData->routeKey;
         $this->title = $title;
+
         $this->label = $this->makeLabel();
         $this->group = $this->makeGroup();
         $this->hidden = $this->makeHidden();

From 0d813d93445b6f46585f69df21afb1ac48223d55 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:43:47 +0100
Subject: [PATCH 763/768] Inline simplified method

---
 .../src/Framework/Factories/HydePageDataFactory.php          | 2 +-
 .../src/Framework/Factories/NavigationDataFactory.php        | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index eeb7c6cee3b..d9d4faf617b 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -68,7 +68,7 @@ protected function makeCanonicalUrl(): ?string
 
     protected function makeNavigation(): ?NavigationData
     {
-        return NavigationDataFactory::make($this->pageData, $this->title);
+        return NavigationData::make((new NavigationDataFactory($this->pageData, $this->title))->toArray());
     }
 
     private function findTitleForPage(): string
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index b24e6880327..42bb5f8ac25 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -69,11 +69,6 @@ public function toArray(): array
         ];
     }
 
-    public static function make(CoreDataObject $pageData, string $title): NavigationData
-    {
-        return NavigationData::make((new static($pageData, $title))->toArray());
-    }
-
     protected function makeLabel(): ?string
     {
         return $this->matter('navigation.label')

From 9a4f5e386e1dabda06aa3b5732129915df15d0f2 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:44:31 +0100
Subject: [PATCH 764/768] Format constructor

---
 .../src/Framework/Factories/HydePageDataFactory.php          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index d9d4faf617b..138ceb40ccd 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -33,15 +33,14 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     private readonly Markdown|false $markdown;
     private readonly FrontMatter $matter;
 
-    public function __construct(
-        private readonly CoreDataObject $pageData,
-    ) {
+    public function __construct(private readonly CoreDataObject $pageData) {
         $this->matter = $this->pageData->matter;
         $this->markdown = $this->pageData->markdown;
         $this->pageClass = $this->pageData->pageClass;
         $this->identifier = $this->pageData->identifier;
         $this->outputPath = $this->pageData->outputPath;
         $this->routeKey = $this->pageData->routeKey;
+
         $this->title = $this->makeTitle();
         $this->canonicalUrl = $this->makeCanonicalUrl();
         $this->navigation = $this->makeNavigation();

From d3cf12e4c455ca8fa75ee233e0c9e79a0e9f5f07 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 19:45:06 +0100
Subject: [PATCH 765/768] Inline local variable as method call is cheap

---
 .../src/Framework/Factories/Concerns/HasFactory.php         | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
index 714f3d5d401..9583f92cb64 100644
--- a/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
+++ b/packages/framework/src/Framework/Factories/Concerns/HasFactory.php
@@ -19,12 +19,10 @@ public function constructFactoryData(PageDataFactory $data): void
 
     protected function constructPageSchemas(): void
     {
-        $pageData = $this->toCoreDataObject();
-
-        $this->constructFactoryData(new HydePageDataFactory($pageData));
+        $this->constructFactoryData(new HydePageDataFactory($this->toCoreDataObject()));
 
         if ($this instanceof MarkdownPost) {
-            $this->constructFactoryData(new BlogPostDataFactory($pageData));
+            $this->constructFactoryData(new BlogPostDataFactory($this->toCoreDataObject()));
         }
     }
 

From 17281a7e78b87ab39c545ee87ac57d5c0a76d044 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sun, 30 Oct 2022 18:45:42 +0000
Subject: [PATCH 766/768] Apply fixes from StyleCI

---
 .../framework/src/Framework/Factories/HydePageDataFactory.php | 3 ++-
 .../src/Framework/Factories/NavigationDataFactory.php         | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/framework/src/Framework/Factories/HydePageDataFactory.php b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
index 138ceb40ccd..7d68ed74855 100644
--- a/packages/framework/src/Framework/Factories/HydePageDataFactory.php
+++ b/packages/framework/src/Framework/Factories/HydePageDataFactory.php
@@ -33,7 +33,8 @@ class HydePageDataFactory extends Concerns\PageDataFactory implements PageSchema
     private readonly Markdown|false $markdown;
     private readonly FrontMatter $matter;
 
-    public function __construct(private readonly CoreDataObject $pageData) {
+    public function __construct(private readonly CoreDataObject $pageData)
+    {
         $this->matter = $this->pageData->matter;
         $this->markdown = $this->pageData->markdown;
         $this->pageClass = $this->pageData->pageClass;
diff --git a/packages/framework/src/Framework/Factories/NavigationDataFactory.php b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
index 42bb5f8ac25..b01bebdb3c2 100644
--- a/packages/framework/src/Framework/Factories/NavigationDataFactory.php
+++ b/packages/framework/src/Framework/Factories/NavigationDataFactory.php
@@ -10,7 +10,6 @@
 use function config;
 use Hyde\Framework\Concerns\InteractsWithFrontMatter;
 use Hyde\Framework\Factories\Concerns\CoreDataObject;
-use Hyde\Framework\Features\Navigation\NavigationData;
 use Hyde\Markdown\Contracts\FrontMatter\SubSchemas\NavigationSchema;
 use Hyde\Markdown\Models\FrontMatter;
 use Hyde\Pages\DocumentationPage;
@@ -46,7 +45,8 @@ class NavigationDataFactory extends Concerns\PageDataFactory implements Navigati
     private readonly string $identifier;
     private readonly FrontMatter $matter;
 
-    public function __construct(CoreDataObject $pageData, string $title) {
+    public function __construct(CoreDataObject $pageData, string $title)
+    {
         $this->matter = $pageData->matter;
         $this->identifier = $pageData->identifier;
         $this->pageClass = $pageData->pageClass;

From b9a98aea6c43643eb9638559ba012308d614b559 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Sun, 30 Oct 2022 22:37:34 +0100
Subject: [PATCH 767/768] Create CoreDataObjectTest.php

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

diff --git a/packages/framework/tests/Unit/CoreDataObjectTest.php b/packages/framework/tests/Unit/CoreDataObjectTest.php
new file mode 100644
index 00000000000..42e68d37099
--- /dev/null
+++ b/packages/framework/tests/Unit/CoreDataObjectTest.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Framework\Factories\Concerns\CoreDataObject;
+use Hyde\Pages\MarkdownPage;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Factories\Concerns\CoreDataObject
+ */
+class CoreDataObjectTest extends TestCase
+{
+    public function testCoreDataObject()
+    {
+        $this->assertInstanceOf(
+            CoreDataObject::class,
+            (new MarkdownPage(
+            'foo',
+        ))->toCoreDataObject());
+    }
+
+    public function testToArray()
+    {
+        $this->assertSame([
+            'pageClass' => MarkdownPage::class,
+            'identifier' => 'foo',
+            'sourcePath' => '_pages/foo.md',
+            'outputPath' => 'foo.html',
+            'routeKey' => 'foo',
+        ], (new MarkdownPage(
+            'foo',
+        ))->toCoreDataObject()->toArray());
+    }
+}

From befd3b21296a2efad39a38cbc5f0ed30e2fb7d71 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Mon, 31 Oct 2022 11:21:40 +0100
Subject: [PATCH 768/768] Update RELEASE_NOTES.md

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

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index be440533c50..acc9eb27ffc 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -16,10 +16,10 @@ This serves two purposes:
 
 #### Abstract
 
-This release contains a plethora of breaking changes compared to the beta versions.
+This beta release contains a plethora of breaking changes compared earlier beta versions.
 So many in fact, it could actually be easier and faster to recreate your project from scratch than to upgrade a particularly complex project.
 
-The good news however, is that this release is the last one containing breaking changes.
+The good news however, is that as HydePHP approaches version 1.0, there will no longer be releases like these with breaking changes.
 
 While I've got your attention: read this the section right after this, as you might not need to make any changes at all.