diff --git a/CHANGELOG.md b/CHANGELOG.md index 83c0fb35fc8..8d81b2d2927 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ This serves two purposes: 1. People can see what changes they might expect in upcoming releases 2. At release time, you can move the Unreleased section changes into a new release version section. +This release mainly makes internal changes to the Framework API. If you are an end user, most of the changes are not relevant. +However, if you are a package developer, or if you have published Blade views or otherwise extended Hyde you may want to take a look as there are internal breaking changes. + ### Added - Added Hyde::makeTitle() helper, an improved version of Hyde::titleFromSlug() - Added new helper method render() to MarkdownDocuments to compile the Markdown to HTML, fixes https://github.com/hydephp/develop/issues/109 @@ -30,6 +33,10 @@ This serves two purposes: - Updates the codebase to use the new Hyde::makeTitle() helper - Several internal changes to how page models are structured, https://github.com/hydephp/develop/pull/122 - Internal: Separate the MarkdownDocument into a dedicated abstract page class, https://github.com/hydephp/develop/pull/126 +- Moved `Hyde\Framework\Models\BladePage` to new namespace `Hyde\Framework\Models\Pages\BladePage` +- Moved `Hyde\Framework\Models\MarkdownPage` to new namespace `Hyde\Framework\Models\Pages\MarkdownPage` +- Moved `Hyde\Framework\Models\MarkdownPost` to new namespace `Hyde\Framework\Models\Pages\MarkdownPost` +- Moved `Hyde\Framework\Models\DocumentationPage` to new namespace `Hyde\Framework\Models\Pages\DocumentationPage` ### Deprecated - Deprecated Hyde::titleFromSlug(), use Hyde::makeTitle() instead diff --git a/packages/framework/resources/views/components/article-excerpt.blade.php b/packages/framework/resources/views/components/article-excerpt.blade.php index 2bd4e095677..d1e893e4a97 100644 --- a/packages/framework/resources/views/components/article-excerpt.blade.php +++ b/packages/framework/resources/views/components/article-excerpt.blade.php @@ -1,47 +1,48 @@ @php -/** @var \Hyde\Framework\Models\MarkdownPost $post */ + /** @var \Hyde\Framework\Models\Pages\MarkdownPost $post */ @endphp
-@if(Hyde::uriPath()) - -@endif - -
- -

- {{ $post->matter['title'] ?? $post->title }} -

- -
+ @if(Hyde::uriPath()) + + @endif - + + @isset($post->matter['description']) +
+

+ {{ $post->matter['description'] }} +

+
+ @endisset - +
\ No newline at end of file diff --git a/packages/framework/resources/views/components/blog-post-feed.blade.php b/packages/framework/resources/views/components/blog-post-feed.blade.php index f7a720a3c32..9d1000de1be 100644 --- a/packages/framework/resources/views/components/blog-post-feed.blade.php +++ b/packages/framework/resources/views/components/blog-post-feed.blade.php @@ -1,3 +1,3 @@ -@foreach(\Hyde\Framework\Models\MarkdownPost::getLatestPosts() as $post) - @include('hyde::components.article-excerpt') +@foreach(\Hyde\Framework\Models\Pages\MarkdownPost::getLatestPosts() as $post) + @include('hyde::components.article-excerpt') @endforeach \ No newline at end of file diff --git a/packages/framework/resources/views/pages/documentation-search.blade.php b/packages/framework/resources/views/pages/documentation-search.blade.php index a935e2f4914..e13d92d54c6 100644 --- a/packages/framework/resources/views/pages/documentation-search.blade.php +++ b/packages/framework/resources/views/pages/documentation-search.blade.php @@ -1,13 +1,19 @@ @php - $page = new \Hyde\Framework\Models\DocumentationPage([], '', 'Search', 'search'); - $title = 'Search'; - $currentPage = $page->getCurrentPagePath(); - $markdown = ''; + $page = new \Hyde\Framework\Models\Pages\DocumentationPage([], '', 'Search', 'search'); + $title = 'Search'; + $currentPage = $page->getCurrentPagePath(); + $markdown = ''; @endphp @extends('hyde::layouts.docs') @section('content') -

Search the documentation site

- - @include('hyde::components.docs.search-input') +

Search the documentation site

+ + @include('hyde::components.docs.search-input') @endsection \ No newline at end of file diff --git a/packages/framework/src/Actions/CreatesNewPageSourceFile.php b/packages/framework/src/Actions/CreatesNewPageSourceFile.php index e2e29d6a267..0ad45092676 100644 --- a/packages/framework/src/Actions/CreatesNewPageSourceFile.php +++ b/packages/framework/src/Actions/CreatesNewPageSourceFile.php @@ -6,9 +6,9 @@ use Hyde\Framework\Exceptions\FileConflictException; 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\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; use Illuminate\Support\Str; /** diff --git a/packages/framework/src/Actions/GeneratesDocumentationSearchIndexFile.php b/packages/framework/src/Actions/GeneratesDocumentationSearchIndexFile.php index 6f96a3b8b60..399c2de018e 100644 --- a/packages/framework/src/Actions/GeneratesDocumentationSearchIndexFile.php +++ b/packages/framework/src/Actions/GeneratesDocumentationSearchIndexFile.php @@ -5,7 +5,7 @@ use Hyde\Framework\Concerns\InteractsWithDirectories; use Hyde\Framework\Contracts\ActionContract; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Framework\Models\Parsers\DocumentationPageParser; use Hyde\Framework\Services\CollectionService; use Illuminate\Support\Collection; diff --git a/packages/framework/src/Commands/HydeBuildStaticSiteCommand.php b/packages/framework/src/Commands/HydeBuildStaticSiteCommand.php index abef40ae4df..e3232eb5d9b 100644 --- a/packages/framework/src/Commands/HydeBuildStaticSiteCommand.php +++ b/packages/framework/src/Commands/HydeBuildStaticSiteCommand.php @@ -8,10 +8,10 @@ use Hyde\Framework\Concerns\Internal\TransfersMediaAssetsForBuildCommands; use Hyde\Framework\Helpers\Features; 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\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\BuildHookService; use Hyde\Framework\Services\CollectionService; use Hyde\Framework\Services\DiscoveryService; diff --git a/packages/framework/src/Commands/HydeMakePageCommand.php b/packages/framework/src/Commands/HydeMakePageCommand.php index 72b82d65093..4e3994b5c52 100644 --- a/packages/framework/src/Commands/HydeMakePageCommand.php +++ b/packages/framework/src/Commands/HydeMakePageCommand.php @@ -4,9 +4,9 @@ use Hyde\Framework\Actions\CreatesNewPageSourceFile; use Hyde\Framework\Exceptions\UnsupportedPageTypeException; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; +use Hyde\Framework\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; use LaravelZero\Framework\Commands\Command; /** diff --git a/packages/framework/src/Concerns/FacadeHelpers/HydeSmartDocsFacade.php b/packages/framework/src/Concerns/FacadeHelpers/HydeSmartDocsFacade.php index c32c24134d3..932ba292faa 100644 --- a/packages/framework/src/Concerns/FacadeHelpers/HydeSmartDocsFacade.php +++ b/packages/framework/src/Concerns/FacadeHelpers/HydeSmartDocsFacade.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Concerns\FacadeHelpers; use Hyde\Framework\Helpers\Features; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; /** * Provide static facade methods, and instance helpers for HydeSmartDocs. @@ -16,7 +16,7 @@ trait HydeSmartDocsFacade /** * Create a new HydeSmartDocs instance, process, and return it. * - * @param DocumentationPage $page The source page object + * @param \Hyde\Framework\Models\Pages\DocumentationPage $page The source page object * @param string $html compiled HTML content * @return static new processed instance */ diff --git a/packages/framework/src/Concerns/GeneratesPageMetadata.php b/packages/framework/src/Concerns/GeneratesPageMetadata.php index 799d350461c..a81b8abe538 100644 --- a/packages/framework/src/Concerns/GeneratesPageMetadata.php +++ b/packages/framework/src/Concerns/GeneratesPageMetadata.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Concerns; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; /** * Generates metadata for page models that have front matter. diff --git a/packages/framework/src/Concerns/HasPageMetadata.php b/packages/framework/src/Concerns/HasPageMetadata.php index c248155050a..b597c65cefc 100644 --- a/packages/framework/src/Concerns/HasPageMetadata.php +++ b/packages/framework/src/Concerns/HasPageMetadata.php @@ -4,7 +4,7 @@ use Hyde\Framework\Helpers\Meta; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Framework\Services\RssFeedService; use Hyde\Framework\Services\SitemapService; diff --git a/packages/framework/src/Concerns/Internal/FileHelpers.php b/packages/framework/src/Concerns/Internal/FileHelpers.php index 2a508da34fb..22f8f02b895 100644 --- a/packages/framework/src/Concerns/Internal/FileHelpers.php +++ b/packages/framework/src/Concerns/Internal/FileHelpers.php @@ -2,7 +2,7 @@ namespace Hyde\Framework\Concerns\Internal; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; /** * Offloads file helper methods for the Hyde Facade. diff --git a/packages/framework/src/Concerns/Internal/FluentPathHelpers.php b/packages/framework/src/Concerns/Internal/FluentPathHelpers.php index e4345459fb6..e50f234e233 100644 --- a/packages/framework/src/Concerns/Internal/FluentPathHelpers.php +++ b/packages/framework/src/Concerns/Internal/FluentPathHelpers.php @@ -2,10 +2,10 @@ namespace Hyde\Framework\Concerns\Internal; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +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\Framework\StaticPageBuilder; diff --git a/packages/framework/src/Concerns/Markdown/HasConfigurableMarkdownFeatures.php b/packages/framework/src/Concerns/Markdown/HasConfigurableMarkdownFeatures.php index 2f5ca27be00..ccecba291d3 100644 --- a/packages/framework/src/Concerns/Markdown/HasConfigurableMarkdownFeatures.php +++ b/packages/framework/src/Concerns/Markdown/HasConfigurableMarkdownFeatures.php @@ -4,7 +4,7 @@ use Hyde\Framework\Helpers\Features; use Hyde\Framework\Helpers\Markdown; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; /** * Allow the Markdown service to have configurable features. diff --git a/packages/framework/src/Contracts/AbstractMarkdownPage.php b/packages/framework/src/Contracts/AbstractMarkdownPage.php index 00836113b4c..e15aaa80ff2 100644 --- a/packages/framework/src/Contracts/AbstractMarkdownPage.php +++ b/packages/framework/src/Contracts/AbstractMarkdownPage.php @@ -12,9 +12,9 @@ * * Extends the AbstractPage class to provide relevant * helpers for Markdown-based page model classes. - * @see \Hyde\Framework\Models\MarkdownPage - * @see \Hyde\Framework\Models\MarkdownPost - * @see \Hyde\Framework\Models\DocumentationPage + * @see \Hyde\Framework\Models\Pages\MarkdownPage + * @see \Hyde\Framework\Models\Pages\MarkdownPost + * @see \Hyde\Framework\Models\Pages\DocumentationPage * @see \Hyde\Framework\Contracts\AbstractPage * * @test \Hyde\Framework\Testing\Feature\AbstractPageTest diff --git a/packages/framework/src/HydeServiceProvider.php b/packages/framework/src/HydeServiceProvider.php index acc5e8c7c7f..b7f417a7814 100644 --- a/packages/framework/src/HydeServiceProvider.php +++ b/packages/framework/src/HydeServiceProvider.php @@ -5,10 +5,10 @@ use Composer\InstalledVersions; use Hyde\Framework\Concerns\RegistersDefaultDirectories; use Hyde\Framework\Contracts\AssetServiceContract; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +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 Illuminate\Support\ServiceProvider; diff --git a/packages/framework/src/Models/BladePage.php b/packages/framework/src/Models/Pages/BladePage.php similarity index 97% rename from packages/framework/src/Models/BladePage.php rename to packages/framework/src/Models/Pages/BladePage.php index ba9a535e25c..fa18b3bd353 100644 --- a/packages/framework/src/Models/BladePage.php +++ b/packages/framework/src/Models/Pages/BladePage.php @@ -1,6 +1,6 @@ 'Hyde\Framework\Models\BladePage', + BladePage::class => 'Hyde\Framework\Models\Pages\BladePage', MarkdownPage::class => 'Hyde\Framework\Models\Parsers\MarkdownPageParser', MarkdownPost::class => 'Hyde\Framework\Models\Parsers\MarkdownPostParser', DocumentationPage::class => 'Hyde\Framework\Models\Parsers\DocumentationPageParser', diff --git a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php index dae2ac0705f..a0e542d602b 100644 --- a/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php +++ b/packages/framework/tests/Feature/Actions/CreatesNewPageSourceFileTest.php @@ -6,8 +6,8 @@ use Hyde\Framework\Exceptions\FileConflictException; use Hyde\Framework\Exceptions\UnsupportedPageTypeException; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Testing\TestCase; /** diff --git a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php index 3047bfbeecd..5eebfb3d4e8 100644 --- a/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php +++ b/packages/framework/tests/Feature/Commands/StaticSiteBuilderPostModuleTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Feature\Commands; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Framework\StaticPageBuilder; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Feature/DarkmodeFeatureTest.php b/packages/framework/tests/Feature/DarkmodeFeatureTest.php index 626209449d0..c99d2131847 100644 --- a/packages/framework/tests/Feature/DarkmodeFeatureTest.php +++ b/packages/framework/tests/Feature/DarkmodeFeatureTest.php @@ -3,8 +3,8 @@ namespace Hyde\Framework\Testing\Feature; use Hyde\Framework\Helpers\Features; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; 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 42c766022f9..ec2fa1b9043 100644 --- a/packages/framework/tests/Feature/DiscoveryServiceTest.php +++ b/packages/framework/tests/Feature/DiscoveryServiceTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Feature; 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\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\Parsers\DocumentationPageParser; use Hyde\Framework\Models\Parsers\MarkdownPageParser; use Hyde\Framework\Models\Parsers\MarkdownPostParser; diff --git a/packages/framework/tests/Feature/DocumentationPageParserTest.php b/packages/framework/tests/Feature/DocumentationPageParserTest.php index 079fee2a699..d188f2ee3a4 100644 --- a/packages/framework/tests/Feature/DocumentationPageParserTest.php +++ b/packages/framework/tests/Feature/DocumentationPageParserTest.php @@ -4,7 +4,7 @@ use Exception; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Framework\Models\Parsers\DocumentationPageParser; use Hyde\Framework\Services\CollectionService; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Feature/HydeDocsIndexPathTest.php b/packages/framework/tests/Feature/HydeDocsIndexPathTest.php index 9d85ec911f7..64e75482f09 100644 --- a/packages/framework/tests/Feature/HydeDocsIndexPathTest.php +++ b/packages/framework/tests/Feature/HydeDocsIndexPathTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Feature; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Testing\TestCase; class HydeDocsIndexPathTest extends TestCase diff --git a/packages/framework/tests/Feature/MarkdownPageTest.php b/packages/framework/tests/Feature/MarkdownPageTest.php index 7ec2ff078e7..14fb260a4c3 100644 --- a/packages/framework/tests/Feature/MarkdownPageTest.php +++ b/packages/framework/tests/Feature/MarkdownPageTest.php @@ -4,7 +4,7 @@ use Exception; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPage; use Hyde\Framework\Models\Parsers\MarkdownPageParser; use Hyde\Framework\Services\CollectionService; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Feature/Services/CollectionServiceTest.php b/packages/framework/tests/Feature/Services/CollectionServiceTest.php index c02b4ee16eb..012445bb816 100644 --- a/packages/framework/tests/Feature/Services/CollectionServiceTest.php +++ b/packages/framework/tests/Feature/Services/CollectionServiceTest.php @@ -3,9 +3,9 @@ namespace Hyde\Framework\Testing\Feature\Services; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Framework\Services\CollectionService; use Hyde\Testing\TestCase; use Illuminate\Support\Facades\File; diff --git a/packages/framework/tests/Feature/Services/HasConfigurableMarkdownFeaturesTest.php b/packages/framework/tests/Feature/Services/HasConfigurableMarkdownFeaturesTest.php index 6601814822a..dbe7ef86a8a 100644 --- a/packages/framework/tests/Feature/Services/HasConfigurableMarkdownFeaturesTest.php +++ b/packages/framework/tests/Feature/Services/HasConfigurableMarkdownFeaturesTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Feature\Services; use Hyde\Framework\Concerns\Markdown\HasConfigurableMarkdownFeatures; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Testing\TestCase; use Illuminate\Support\Facades\Config; diff --git a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php index e036beee358..6840b8ca2d3 100644 --- a/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php +++ b/packages/framework/tests/Feature/Services/HydeSmartDocsTest.php @@ -4,7 +4,7 @@ use Hyde\Framework\Actions\MarkdownConverter; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Framework\Services\HydeSmartDocs; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php index 708d57094c7..1e4f8730901 100644 --- a/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php +++ b/packages/framework/tests/Feature/SourceDirectoriesCanBeChangedTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Feature; 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\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\CollectionService; use Hyde\Framework\Services\DiscoveryService; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Feature/StaticPageBuilderTest.php b/packages/framework/tests/Feature/StaticPageBuilderTest.php index 968312ae065..22bec742bbc 100644 --- a/packages/framework/tests/Feature/StaticPageBuilderTest.php +++ b/packages/framework/tests/Feature/StaticPageBuilderTest.php @@ -4,10 +4,10 @@ use Hyde\Framework\Hyde; use Hyde\Framework\HydeServiceProvider; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +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\StaticPageBuilder; use Hyde\Testing\ResetsApplication; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php index 3b9edf9b394..aec2e920631 100644 --- a/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php +++ b/packages/framework/tests/Unit/BlogPostFrontMatterIsOptionalTest.php @@ -26,7 +26,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\MarkdownPost::getLatestPosts() as $post) + '@foreach(\Hyde\Framework\Models\Pages\MarkdownPost::getLatestPosts() as $post) @include(\'hyde::components.article-excerpt\') @endforeach' ); diff --git a/packages/framework/tests/Unit/DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.php b/packages/framework/tests/Unit/DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.php index 7a614725657..284a4b8d01f 100644 --- a/packages/framework/tests/Unit/DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.php +++ b/packages/framework/tests/Unit/DiscoveryServiceCanFindModelFromCustomSourceFilePathTest.php @@ -2,10 +2,10 @@ namespace Hyde\Framework\Testing\Unit; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +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\Testing\TestCase; use Illuminate\Support\Facades\Config; diff --git a/packages/framework/tests/Unit/DocumentationPageParserTest.php b/packages/framework/tests/Unit/DocumentationPageParserTest.php index 60b89faf915..12b02eb05bd 100644 --- a/packages/framework/tests/Unit/DocumentationPageParserTest.php +++ b/packages/framework/tests/Unit/DocumentationPageParserTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Unit; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Framework\Models\Parsers\DocumentationPageParser; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Unit/DocumentationPageTest.php b/packages/framework/tests/Unit/DocumentationPageTest.php index fcd8015dee1..17b1ee3c18b 100644 --- a/packages/framework/tests/Unit/DocumentationPageTest.php +++ b/packages/framework/tests/Unit/DocumentationPageTest.php @@ -3,11 +3,11 @@ namespace Hyde\Framework\Testing\Unit; use Hyde\Framework\HydeServiceProvider; -use Hyde\Framework\Models\DocumentationPage; +use Hyde\Framework\Models\Pages\DocumentationPage; use Hyde\Testing\TestCase; /** - * @covers \Hyde\Framework\Models\DocumentationPage + * @covers \Hyde\Framework\Models\Pages\DocumentationPage */ class DocumentationPageTest extends TestCase { diff --git a/packages/framework/tests/Unit/FluentPathHelpersTest.php b/packages/framework/tests/Unit/FluentPathHelpersTest.php index 4c45f0f2143..69f4811314f 100644 --- a/packages/framework/tests/Unit/FluentPathHelpersTest.php +++ b/packages/framework/tests/Unit/FluentPathHelpersTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Unit; 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\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; /** diff --git a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php index 04a81b73a22..e9b4d3924f5 100644 --- a/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php +++ b/packages/framework/tests/Unit/GetLatestMarkdownPostsTest.php @@ -3,12 +3,12 @@ namespace Hyde\Framework\Testing\Unit; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; use Illuminate\Support\Collection; /** - * @see \Hyde\Framework\Models\MarkdownPost::latest() + * @see \Hyde\Framework\Models\Pages\MarkdownPost::latest() */ class GetLatestMarkdownPostsTest extends TestCase { diff --git a/packages/framework/tests/Unit/HasDynamicTitleTest.php b/packages/framework/tests/Unit/HasDynamicTitleTest.php index 50b9832e2c4..476e182d2d2 100644 --- a/packages/framework/tests/Unit/HasDynamicTitleTest.php +++ b/packages/framework/tests/Unit/HasDynamicTitleTest.php @@ -2,7 +2,7 @@ namespace Hyde\Framework\Testing\Unit; -use Hyde\Framework\Models\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPage; use Hyde\Testing\TestCase; /** diff --git a/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php b/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php index c6695c0f199..41e2f81550a 100644 --- a/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php +++ b/packages/framework/tests/Unit/HasPageMetadataRssFeedLinkTest.php @@ -2,10 +2,10 @@ namespace Hyde\Framework\Testing\Unit; -use Hyde\Framework\Models\BladePage; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +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\Testing\TestCase; /** diff --git a/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php b/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php index 42bbf9c9ca3..9aa697cc007 100644 --- a/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php +++ b/packages/framework/tests/Unit/MarkdownPageModelConstructorArgumentsAreOptionalTest.php @@ -2,9 +2,9 @@ namespace Hyde\Framework\Testing\Unit; -use Hyde\Framework\Models\DocumentationPage; -use Hyde\Framework\Models\MarkdownPage; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\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 50a8dc0b834..8463384947f 100644 --- a/packages/framework/tests/Unit/MarkdownPostHelpersTest.php +++ b/packages/framework/tests/Unit/MarkdownPostHelpersTest.php @@ -2,11 +2,11 @@ namespace Hyde\Framework\Testing\Unit; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; /** - * @see \Hyde\Framework\Models\MarkdownPost + * @see \Hyde\Framework\Models\Pages\MarkdownPost */ class MarkdownPostHelpersTest extends TestCase { diff --git a/packages/framework/tests/Unit/MarkdownPostParserTest.php b/packages/framework/tests/Unit/MarkdownPostParserTest.php index 1db9a027670..3b0d95bd964 100644 --- a/packages/framework/tests/Unit/MarkdownPostParserTest.php +++ b/packages/framework/tests/Unit/MarkdownPostParserTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Unit; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Framework\Models\Parsers\MarkdownPostParser; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php index 54fcc2e16e4..ba94aa0ff83 100644 --- a/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php +++ b/packages/framework/tests/Unit/PageModelGetAllFilesHelperTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Unit; 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\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; /** diff --git a/packages/framework/tests/Unit/PageModelGetHelperTest.php b/packages/framework/tests/Unit/PageModelGetHelperTest.php index e1f7a8f2068..d432037e9dd 100644 --- a/packages/framework/tests/Unit/PageModelGetHelperTest.php +++ b/packages/framework/tests/Unit/PageModelGetHelperTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Unit; 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\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\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 2782dbccd75..c3ea20f8eff 100644 --- a/packages/framework/tests/Unit/PageModelParseHelperTest.php +++ b/packages/framework/tests/Unit/PageModelParseHelperTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Unit; 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\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; /** diff --git a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php index e334070003a..c67c8172913 100644 --- a/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php +++ b/packages/framework/tests/Unit/SourceFilesInCustomDirectoriesCanBeCompiledTest.php @@ -3,10 +3,10 @@ namespace Hyde\Framework\Testing\Unit; 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\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\Framework\StaticPageBuilder; use Hyde\Testing\TestCase; diff --git a/packages/framework/tests/Unit/ValidatesExistenceTest.php b/packages/framework/tests/Unit/ValidatesExistenceTest.php index 0f7135ca130..22ac4a05c97 100644 --- a/packages/framework/tests/Unit/ValidatesExistenceTest.php +++ b/packages/framework/tests/Unit/ValidatesExistenceTest.php @@ -4,7 +4,7 @@ use Hyde\Framework\Concerns\ValidatesExistence; use Hyde\Framework\Exceptions\FileNotFoundException; -use Hyde\Framework\Models\BladePage; +use Hyde\Framework\Models\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 1a6704261b7..408b703d47c 100644 --- a/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php +++ b/packages/framework/tests/Unit/Views/ArticleExcerptViewTest.php @@ -3,7 +3,7 @@ namespace Hyde\Framework\Testing\Unit\Views; use Hyde\Framework\Hyde; -use Hyde\Framework\Models\MarkdownPost; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\Testing\TestCase; use Illuminate\Support\Facades\Blade; diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php index caaf4a070ad..2a0c49aace2 100644 --- a/packages/realtime-compiler/src/Routing/PageRouter.php +++ b/packages/realtime-compiler/src/Routing/PageRouter.php @@ -5,10 +5,10 @@ use Desilva\Microserve\Request; use Desilva\Microserve\Response; 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\Models\Pages\BladePage; +use Hyde\Framework\Models\Pages\DocumentationPage; +use Hyde\Framework\Models\Pages\MarkdownPage; +use Hyde\Framework\Models\Pages\MarkdownPost; use Hyde\RealtimeCompiler\Actions\Compiler; use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel; use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;