Enabled Strict types and improved type hinting

src/Data/LinkHeaders.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints\Data;
 
 use Fig\Link\GenericLinkProvider;
@@ -30,7 +32,7 @@ public function setLinkProvider(EvolvableLinkProviderInterface $linkProvider): s
         return $this;
     }
 
-    public function addLink(EvolvableLinkInterface|string|array $uri, string|array|null $rel = null, ?array $attributes = []): static
+    public function addLink(EvolvableLinkInterface|string|array $uri, string|array|null $rel = null, array $attributes = []): static
     {
         if (is_array($uri)) {
             foreach ($uri as $data) {
@@ -71,9 +73,9 @@ public function addLink(EvolvableLinkInterface|string|array $uri, string|array|n
 
     public function addFromString(string $link): static
     {
-        $links = explode(',', trim($link));
-        foreach ($links as $link) {
-            $parts = explode('; ', trim($link));
+        $explodedLinks = explode(',', trim($link));
+        foreach ($explodedLinks as $explodedLink) {
+            $parts = explode('; ', trim($explodedLink));
             $uri = trim(array_shift($parts), '<>');
             $rel = null;
             $attributes = [];
@@ -96,14 +98,14 @@ public function addFromString(string $link): static
         return $this;
     }
 
-    public function makeUnique()
+    public function makeUnique(): static
     {
         $handledHashes = [];
 
         foreach ($this->getLinkProvider()->getLinks() as $link) {
             /** @var Link $link */
-            $hash = md5($link->getHref(), serialize($link->getRels()));
-            if (! in_array($hash, $handledHashes)) {
+            $hash = md5($link->getHref().serialize($link->getRels()));
+            if (! in_array($hash, $handledHashes, true)) {
                 $handledHashes[] = $hash;
 
                 continue;
@@ -115,18 +117,18 @@ public function makeUnique()
         return $this;
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         return trim(collect($this->getLinkProvider()->getLinks())
             ->map([static::class, 'linkToString'])
             ->filter()
             ->implode(','));
     }
 
-    public static function linkToString(LinkInterface $link)
+    public static function linkToString(LinkInterface $link): ?string
     {
         if ($link->isTemplated()) {
-            return;
+            return null;
         }
 
         $attributes = ['', sprintf('rel="%s"', implode(' ', $link->getRels()))];

src/Events/GenerateEarlyHints.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;

src/Listeners/AddDefaultHeaders.php

@@ -1,20 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints\Listeners;
 
 use Illuminate\Support\Facades\Event;
 use JustBetter\Http3EarlyHints\Events\GenerateEarlyHints;
 
 class AddDefaultHeaders
 {
-    public function handle(GenerateEarlyHints $event)
+    public function handle(GenerateEarlyHints $event): void
     {
         foreach (config('http3earlyhints.default_headers', []) as $header) {
             $event->linkHeaders->addFromString($header);
         }
     }
 
-    public static function register()
+    public static function register(): void
     {
         Event::listen(GenerateEarlyHints::class, static::class);
     }

src/Listeners/AddFromBody.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints\Listeners;
 
 use Fig\Link\Link;

src/Middleware/AddHttp3EarlyHints.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints\Middleware;
 
 use Closure;
@@ -26,7 +28,10 @@ public function handle(Request $request, Closure $next, ?int $sizeLimit = null):
         $lastPath = Str::afterLast($request->path(), '/');
         if (
             $request->format() !== 'html'
-            || (str_contains($lastPath, '.') && ! in_array(Str::afterLast($lastPath, '.'), config('http3earlyhints.extensions', ['', 'php', 'html'])))
+            || (
+                str_contains($lastPath, '.')
+                && ! in_array(Str::afterLast($lastPath, '.'), config('http3earlyhints.extensions', ['', 'php', 'html']), true)
+            )
         ) {
             $this->skipCurrentRequest = true;
 
@@ -84,15 +89,15 @@ public function terminate(Request $request, SymfonyResponse $response): void
         $this->handleGeneratingLinkHeaders($request, $response);
     }
 
-    public function handleGeneratingLinkHeaders(Request $request, SymfonyResponse $response)
+    public function handleGeneratingLinkHeaders(Request $request, SymfonyResponse $response): ?LinkHeaders
     {
         if (
-            ! $response instanceof Response
+            $this->skipCurrentRequest
+            || ! $response instanceof Response
             || $response->isRedirection()
             || ! $response->isSuccessful()
-            || $this->skipCurrentRequest
         ) {
-            return;
+            return null;
         }
         $linkHeaders = $this->generateLinkHeaders($request, $response, $this->sizeLimit);
 
@@ -112,7 +117,7 @@ protected function generateLinkHeaders(Request $request, SymfonyResponse $respon
 
         $this->linkHeaders->makeUnique();
 
-        $sizeLimit = $sizeLimit ?? max(1, intval(config('http3earlyhints.size_limit', 32 * 1024)));
+        $sizeLimit = $sizeLimit ?? max(1, (int) config('http3earlyhints.size_limit', 32 * 1024));
         $headersText = $this->linkHeaders->__toString();
 
         while (strlen($headersText) > $sizeLimit) {
@@ -126,18 +131,17 @@ protected function generateLinkHeaders(Request $request, SymfonyResponse $respon
     /**
      * Add Link Header
      */
-    private function addLinkHeaders(SymfonyResponse $response, LinkHeaders $linkHeaders): SymfonyResponse
+    private function addLinkHeaders(SymfonyResponse $response, LinkHeaders $linkHeaders): void
     {
         $link = $linkHeaders->__toString();
         if (! $link || ! $response instanceof Response) {
-            return $response;
+            return;
         }
+
         if ($response->headers->get('Link')) {
             $link = $response->headers->get('Link').','.$link;
         }
 
         $response->header('Link', $link);
-
-        return $response;
     }
 }

src/ServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JustBetter\Http3EarlyHints;
 
 use Illuminate\Support\ServiceProvider as LaravelServiceProvider;
@@ -10,10 +12,8 @@ class ServiceProvider extends LaravelServiceProvider
 {
     /**
      * Perform post-registration booting of services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         $this->mergeConfigFrom(__DIR__.'/config.php', 'http3earlyhints');
 

src/config.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     /**
      * This works by building a cache of links after the first request, how long should we keep them for in seconds?