declare_strict_types

ElegantEngineeringTech · Jan 11, 2025 · d692f56 · d692f56
1 parent b227300
commit d692f56
Show file tree

Hide file tree

Showing 51 changed files with 120 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -20,19 +20,19 @@
     "require": {
         "php": "^8.2",
         "spatie/laravel-package-tools": "^1.16",
-        "illuminate/contracts": "^10.0||^11.0"
+        "illuminate/contracts": "^11.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.14",
-        "nunomaduro/collision": "^8.1.1||^7.10.0",
-        "larastan/larastan": "^2.9",
-        "orchestra/testbench": "^9.0.0||^8.22.0",
-        "pestphp/pest": "^2.34",
-        "pestphp/pest-plugin-arch": "^2.7",
-        "pestphp/pest-plugin-laravel": "^2.3",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3"
+        "laravel/pint": "^1.0",
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^3.0.0",
+        "orchestra/testbench": "^9.0",
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-arch": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "files": [

diff --git a/config/seo.php b/config/seo.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     'defaults' => [

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -9,4 +9,5 @@ parameters:
         - database
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
+    noEnvCallsOutsideOfConfig: false
     checkModelProperties: true
diff --git a/pint.json b/pint.json
@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "declare_strict_types": true
+    }
+}
diff --git a/src/Concerns/HasSeo.php b/src/Concerns/HasSeo.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Concerns;
 
 use Elegantly\Seo\SeoManager;

diff --git a/src/Contracts/Taggable.php b/src/Contracts/Taggable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Contracts;
 
 use Elegantly\Seo\SeoTags;

diff --git a/src/Facades/SeoManager.php b/src/Facades/SeoManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Facades;
 
 use Illuminate\Support\Facades\Facade;

diff --git a/src/Middleware/SeoNoIndexMiddleware.php b/src/Middleware/SeoNoIndexMiddleware.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Middleware;
 
 use Closure;

diff --git a/src/OpenGraph/Audio.php b/src/OpenGraph/Audio.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/OpenGraph/Image.php b/src/OpenGraph/Image.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/OpenGraph/Locale.php b/src/OpenGraph/Locale.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/OpenGraph/OpenGraph.php b/src/OpenGraph/OpenGraph.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/OpenGraph/Verticals/Article.php b/src/OpenGraph/Verticals/Article.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph\Verticals;
 
 use Carbon\Carbon;

diff --git a/src/OpenGraph/Verticals/Book.php b/src/OpenGraph/Verticals/Book.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph\Verticals;
 
 use Carbon\Carbon;

diff --git a/src/OpenGraph/Verticals/Profile.php b/src/OpenGraph/Verticals/Profile.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph\Verticals;
 
 /**

diff --git a/src/OpenGraph/Verticals/Vertical.php b/src/OpenGraph/Verticals/Vertical.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph\Verticals;
 
 use Carbon\Carbon;

diff --git a/src/OpenGraph/Verticals/Website.php b/src/OpenGraph/Verticals/Website.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph\Verticals;
 
 /**

diff --git a/src/OpenGraph/Video.php b/src/OpenGraph/Video.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\OpenGraph;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/Schemas/Schema.php b/src/Schemas/Schema.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Schemas;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/Schemas/WebPage.php b/src/Schemas/WebPage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Schemas;
 
 use Illuminate\Support\Facades\Request;

diff --git a/src/SeoImage.php b/src/SeoImage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo;
 
 use Elegantly\Seo\OpenGraph\Image;

diff --git a/src/SeoManager.php b/src/SeoManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo;
 
 use Closure;
@@ -227,7 +229,7 @@ public function setImage(null|SeoImage|string $value): static
             $this->twitter->image = $value?->toTwitter();
         }
         if ($this->webpage) {
-            $this->webpage->put('image', $value?->secure_url ?? $value?->url);
+            $this->webpage->put('image', $value->secure_url ?? $value?->url);
         }
 
         return $this;
@@ -266,7 +268,7 @@ public function setLocale(
         if ($this->opengraph) {
             $this->opengraph->locale = new Locale(
                 locale: $value,
-                alternate: $this->opengraph->locale?->alternate ?? [],
+                alternate: $this->opengraph->locale->alternate ?? [],
             );
         }
 
@@ -286,7 +288,7 @@ public function setAlternates(?array $value): static
                         return $href;
                     }
 
-                    return new Alternate($hrelang, $href);
+                    return new Alternate((string) $hrelang, $href);
                 })
                 ->values()
                 ->all();
@@ -298,7 +300,7 @@ public function setAlternates(?array $value): static
 
         if ($this->opengraph) {
             $this->opengraph->locale = new Locale(
-                locale: $this->opengraph->locale?->locale ?? App::getLocale(),
+                locale: $this->opengraph->locale->locale ?? App::getLocale(),
                 alternate: collect($value)
                     ->where('hreflang', '!=', 'x-default')
                     ->map(fn ($item) => $item->toOpenGraph())
@@ -389,7 +391,7 @@ public static function default(
                 title: $title,
                 url: $url,
                 description: $description,
-                image: $image?->secure_url ?? $image?->url,
+                image: $image->secure_url ?? $image?->url,
             ),
         );
     }

diff --git a/src/SeoServiceProvider.php b/src/SeoServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo;
 
 use Spatie\LaravelPackageTools\Package;

diff --git a/src/SeoTags.php b/src/SeoTags.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo;
 
 use Elegantly\Seo\Tags\TagVoid;

diff --git a/src/Standard/Alternate.php b/src/Standard/Alternate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Standard;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/Standard/Standard.php b/src/Standard/Standard.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Standard;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/Tags/Link.php b/src/Tags/Link.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 use Illuminate\Support\Collection;

diff --git a/src/Tags/Meta.php b/src/Tags/Meta.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 use Illuminate\Support\Collection;

diff --git a/src/Tags/Script.php b/src/Tags/Script.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 use Illuminate\Support\Collection;

diff --git a/src/Tags/Tag.php b/src/Tags/Tag.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 abstract class Tag extends TagVoid

diff --git a/src/Tags/TagVoid.php b/src/Tags/TagVoid.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 use Elegantly\Seo\Traits\DeepClone;
@@ -18,7 +20,7 @@ abstract class TagVoid implements Htmlable
     public ?Collection $properties = null;
 
     /**
-     * @return Collection<string, string>
+     * @return Collection<string, non-falsy-string>
      */
     public function toProperties(): Collection
     {

diff --git a/src/Tags/Title.php b/src/Tags/Title.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Tags;
 
 class Title extends Tag

diff --git a/src/Traits/DeepClone.php b/src/Traits/DeepClone.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Traits;
 
 trait DeepClone

diff --git a/src/Twitter/Cards/Card.php b/src/Twitter/Cards/Card.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Twitter\Cards;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/Twitter/Cards/Summary.php b/src/Twitter/Cards/Summary.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Twitter\Cards;
 
 use Elegantly\Seo\Twitter\Image;

diff --git a/src/Twitter/Cards/SummaryLargeImage.php b/src/Twitter/Cards/SummaryLargeImage.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Twitter\Cards;
 
 class SummaryLargeImage extends Summary

diff --git a/src/Twitter/Image.php b/src/Twitter/Image.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Seo\Twitter;
 
 use Elegantly\Seo\Contracts\Taggable;

diff --git a/src/helpers.php b/src/helpers.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Elegantly\Seo\Concerns\HasSeo;
 use Elegantly\Seo\SeoManager;
 

diff --git a/tests/ArchTest.php b/tests/ArchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 arch('it will not use debugging functions')
     ->expect(['dd', 'dump', 'ray'])
     ->each->not->toBeUsed();
diff --git a/tests/Features/SeoManagerTest.php b/tests/Features/SeoManagerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Elegantly\Seo\Facades\SeoManager;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Request;