Merge pull request #824 from hydephp/refactor-BuildService-to-not-use-deprecated-method

emmadesilva · web-flow · commit a2221357c389 · 2023-01-09T14:59:00.000+01:00
Refactor build service to not use deprecated method
diff --git a/packages/framework/src/Framework/Services/BuildService.php b/packages/framework/src/Framework/Services/BuildService.php
@@ -10,6 +10,7 @@
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Hyde;
+use Hyde\Pages\Concerns\HydePage;
 use Hyde\Support\Models\Route;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
@@ -40,7 +41,7 @@ public function __construct(OutputStyle $output)
 
     public function compileStaticPages(): void
     {
-        collect(Hyde::getDiscoveredPageTypes())->each(function (string $pageClass): void {
+        collect($this->getPageTypes())->each(function (string $pageClass): void {
             $this->compilePagesForClass($pageClass);
         });
     }
@@ -121,4 +122,12 @@ protected function safeOutputDirectories(): array
     {
         return config('hyde.safe_output_directories', ['_site', 'docs', 'build']);
     }
+
+    /** @return array<class-string<\Hyde\Pages\Concerns\HydePage> */
+    protected function getPageTypes(): array
+    {
+        return Hyde::pages()->map(function (HydePage $page): string {
+            return $page::class;
+        })->unique()->values()->toArray();
+    }
 }
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -76,6 +76,12 @@ public function test_all_page_types_can_be_compiled()
         $this->file('_docs/docs.md');
 
         $this->artisan('build')
+            ->expectsOutput('Creating Html Pages...')
+            ->expectsOutput('Creating Blade Pages...')
+            ->expectsOutput('Creating Markdown Pages...')
+            ->expectsOutput('Creating Markdown Posts...')
+            ->expectsOutput('Creating Documentation Pages...')
+            ->doesntExpectOutputToContain('Creating')
             ->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/html.html'));
@@ -91,6 +97,26 @@ public function test_all_page_types_can_be_compiled()
         unlink(Hyde::path('_site/docs/docs.html'));
     }
 
+    public function test_only_progress_bars_for_types_with_pages_are_shown()
+    {
+        $this->file('_pages/blade.blade.php');
+        $this->file('_pages/markdown.md');
+
+        $this->artisan('build')
+            ->doesntExpectOutput('Creating Html Pages...')
+            ->expectsOutput('Creating Blade Pages...')
+            ->expectsOutput('Creating Markdown Pages...')
+            ->doesntExpectOutput('Creating Markdown Posts...')
+            ->doesntExpectOutput('Creating Documentation Pages...')
+            ->doesntExpectOutputToContain('Creating')
+            ->assertExitCode(0);
+
+        $this->assertFileExists(Hyde::path('_site/blade.html'));
+        $this->assertFileExists(Hyde::path('_site/markdown.html'));
+        unlink(Hyde::path('_site/blade.html'));
+        unlink(Hyde::path('_site/markdown.html'));
+    }
+
     public function test_print_initial_information_allows_api_to_be_disabled()
     {
         $this->artisan('build --no-api')

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`use Hyde\Framework\Actions\StaticPageBuilder;`
`11`	`11`	`use Hyde\Framework\Concerns\InteractsWithDirectories;`
`12`	`12`	`use Hyde\Hyde;`
	`13`	`+use Hyde\Pages\Concerns\HydePage;`
`13`	`14`	`use Hyde\Support\Models\Route;`
`14`	`15`	`use Illuminate\Console\Concerns\InteractsWithIO;`
`15`	`16`	`use Illuminate\Console\OutputStyle;`
`@@ -40,7 +41,7 @@ public function __construct(OutputStyle $output)`
`40`	`41`
`41`	`42`	`public function compileStaticPages(): void`
`42`	`43`	`{`
`43`		`- collect(Hyde::getDiscoveredPageTypes())->each(function (string $pageClass): void {`
	`44`	`+ collect($this->getPageTypes())->each(function (string $pageClass): void {`
`44`	`45`	`$this->compilePagesForClass($pageClass);`
`45`	`46`	`});`
`46`	`47`	`}`
`@@ -121,4 +122,12 @@ protected function safeOutputDirectories(): array`
`121`	`122`	`{`
`122`	`123`	`return config('hyde.safe_output_directories', ['_site', 'docs', 'build']);`
`123`	`124`	`}`
	`125`	`+`
	`126`	`+ /** @return array<class-string<\Hyde\Pages\Concerns\HydePage> */`
	`127`	`+ protected function getPageTypes(): array`
	`128`	`+ {`
	`129`	`+ return Hyde::pages()->map(function (HydePage $page): string {`
	`130`	`+ return $page::class;`
	`131`	`+ })->unique()->values()->toArray();`
	`132`	`+ }`
`124`	`133`	`}`