Merge branch 'master' of github.com:hydephp/develop

packages/framework/src/Console/Commands/BuildSiteCommand.php

@@ -63,7 +63,7 @@ protected function runPreBuildActions(): void
         if ($this->option('no-api')) {
             $this->info('Disabling external API calls');
             $this->newLine();
-            $config = config('hyde.features');
+            $config = (array) config('hyde.features');
             unset($config[array_search('torchlight', $config)]);
             Config::set(['hyde.features' => $config]);
         }

packages/framework/src/Framework/Concerns/InvokableAction.php

@@ -13,7 +13,7 @@ abstract class InvokableAction
 {
     abstract public function __invoke();
 
-    public static function call(...$args): mixed
+    public static function call(mixed ...$args): mixed
     {
         return (new static(...$args))->__invoke();
     }

packages/framework/src/Framework/Factories/HydePageDataFactory.php

@@ -69,7 +69,7 @@ protected function makeCanonicalUrl(): ?string
         return $this->getCanonicalUrl();
     }
 
-    protected function makeNavigation(): ?NavigationData
+    protected function makeNavigation(): NavigationData
     {
         return NavigationData::make((new NavigationDataFactory($this->pageData, $this->title))->toArray());
     }

packages/framework/src/Framework/Factories/NavigationDataFactory.php

@@ -88,7 +88,7 @@ protected function makeGroup(): ?string
         return $this->searchForGroupInFrontMatter() ?? $this->defaultGroup();
     }
 
-    protected function makeHidden(): ?bool
+    protected function makeHidden(): bool
     {
         return $this->isInstanceOf(MarkdownPost::class)
             || $this->searchForHiddenInFrontMatter()

packages/framework/src/Framework/Features/Documentation/SemanticDocumentationArticle.php

@@ -59,7 +59,7 @@ public function renderFooter(): HtmlString
         return new HtmlString($this->footer);
     }
 
-    protected function process(): self
+    protected function process(): static
     {
         $this->tokenize();
 

packages/framework/src/Framework/Features/Metadata/MetadataBag.php

@@ -62,14 +62,14 @@ public function add(MetadataElementContract|string $element): static
         return $this->addGenericElement($element);
     }
 
-    protected function addElement(string $type, MetadataElementContract $element): MetadataBag
+    protected function addElement(string $type, MetadataElementContract $element): static
     {
         ($this->$type)[$element->uniqueKey()] = $element;
 
         return $this;
     }
 
-    protected function addGenericElement(string $element): MetadataBag
+    protected function addGenericElement(string $element): static
     {
         $this->generics[] = $element;
 

packages/framework/src/Framework/Features/Session/SessionServiceProvider.php

@@ -8,12 +8,12 @@
 
 class SessionServiceProvider extends ServiceProvider
 {
-    public function register()
+    public function register(): void
     {
         $this->app->singleton(Session::class, Session::class);
     }
 
-    public function boot()
+    public function boot(): void
     {
         //
     }

packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php

@@ -101,6 +101,7 @@ protected function getImageType(MarkdownPost $post): string
         return str_ends_with($post->image->getSource(), '.png') ? 'image/png' : 'image/jpeg';
     }
 
+    /** @return numeric-string */
     protected function getImageLength(MarkdownPost $post): string
     {
         /** @todo We might want to add a build warning if the length is zero */

packages/framework/src/Framework/Features/XmlGenerators/SitemapGenerator.php

@@ -97,6 +97,7 @@ protected function getPriority(string $pageClass, string $slug): string
         return (string) $priority;
     }
 
+    /** @return numeric-string */
     protected function getFormattedProcessingTime(): string
     {
         return (string) round((microtime(true) - $this->timeStart) * 1000, 2);

packages/framework/src/Framework/HydeServiceProvider.php

@@ -102,7 +102,7 @@ public function boot(): void
         HydeKernel::getInstance()->readyToBoot();
     }
 
-    protected function initializeConfiguration()
+    protected function initializeConfiguration(): void
     {
         if (YamlConfigurationService::hasFile()) {
             YamlConfigurationService::boot();

packages/framework/src/Framework/Services/BuildTaskService.php

@@ -49,6 +49,9 @@ public function getPostBuildTasks(): array
         );
     }
 
+    /**
+     * @deprecated Public usage of this method is deprecated as the method will be made protected.
+     */
     public static function findTasksInAppDirectory(): array
     {
         $tasks = [];

packages/framework/src/Markdown/Processing/ColoredBlockquotes.php

@@ -39,9 +39,7 @@ protected static function getClassNameFromSignature(string $signature): string
         return str_replace('>', '', $signature);
     }
 
-    /**
-     * @return array (ColoredBlockquotes)[]
-     */
+    /** @return ColoredBlockquotes[] */
     public static function get(): array
     {
         return [

packages/framework/src/Support/Facades/Render.php

@@ -23,6 +23,7 @@
  */
 class Render extends Facade
 {
+    /** @return class-string */
     protected static function getFacadeAccessor(): string
     {
         return \Hyde\Support\Models\Render::class;

packages/framework/src/Support/Models/Route.php

@@ -56,6 +56,7 @@ public function getPage(): HydePage
         return $this->page;
     }
 
+    /** @return class-string<HydePage> */
     public function getPageClass(): string
     {
         return $this->page::class;

packages/framework/tests/Feature/MarkdownServiceTest.php

@@ -285,16 +285,18 @@ public function test_stripIndentation_method_with_trailing_newline()
         $this->assertSame("foo\nbar\nbaz\n", $service->normalizeIndentationLevel($markdown));
     }
 
-    protected function makeService(): MarkdownService
+    protected function makeService(): MarkdownServiceTestClass
     {
-        return new class extends MarkdownService
-        {
-            public array $features = [];
+        return new MarkdownServiceTestClass();
+    }
+}
 
-            public function __construct(string $markdown = '', ?string $sourceModel = null)
-            {
-                parent::__construct($markdown, $sourceModel);
-            }
-        };
+class MarkdownServiceTestClass extends MarkdownService
+{
+    public array $features = [];
+
+    public function __construct(string $markdown = '', ?string $sourceModel = null)
+    {
+        parent::__construct($markdown, $sourceModel);
     }
 }