chore: bring codebase up to phpstan level 9

dshafik · Oct 1, 2024 · f2c47e7 · f2c47e7
1 parent 8ff35aa
commit f2c47e7
Show file tree

Hide file tree

Showing 98 changed files with 648 additions and 193 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -3,5 +3,5 @@ includes:
 parameters:
     paths:
         - src/
-    level: 5
+    level: 9
     treatPhpDocTypesAsCertain: false
diff --git a/src/Bag/Attributes/Attribute.php b/src/Bag/Attributes/Attribute.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bag\Attributes;
+
+interface Attribute
+{
+}
diff --git a/src/Bag/Attributes/Bag.php b/src/Bag/Attributes/Bag.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class Bag
+class Bag implements AttributeInterface
 {
     public const PUBLIC = 1;
     public const PROTECTED = 2;

diff --git a/src/Bag/Attributes/Cast.php b/src/Bag/Attributes/Cast.php
@@ -5,13 +5,17 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Casts\CastsPropertyGet;
 use Bag\Casts\CastsPropertySet;
 use Illuminate\Support\Collection;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Cast
+class Cast implements AttributeInterface
 {
+    /**
+     * @var array<array-key,mixed>
+     */
     protected array $parameters = [];
 
     /**
@@ -22,6 +26,9 @@ public function __construct(protected string $casterClassname, mixed ...$paramet
         $this->parameters = $parameters;
     }
 
+    /**
+     * @param Collection<array-key,mixed> $properties
+     */
     public function cast(string $propertyType, string $propertyName, Collection $properties): mixed
     {
         /** @var CastsPropertySet $cast */
@@ -30,6 +37,9 @@ public function cast(string $propertyType, string $propertyName, Collection $pro
         return $cast->set($propertyType, $propertyName, $properties);
     }
 
+    /**
+     * @param Collection<array-key,mixed> $properties
+     */
     public function transform(string $propertyName, Collection $properties): mixed
     {
         /** @var CastsPropertyGet $cast */

diff --git a/src/Bag/Attributes/CastInput.php b/src/Bag/Attributes/CastInput.php
@@ -5,12 +5,16 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Casts\CastsPropertySet;
 use Illuminate\Support\Collection;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class CastInput
+class CastInput implements AttributeInterface
 {
+    /**
+     * @var array<array-key,mixed>
+     */
     protected array $parameters = [];
 
     public function __construct(protected string $casterClassname, mixed ...$parameters)
@@ -19,7 +23,8 @@ public function __construct(protected string $casterClassname, mixed ...$paramet
     }
 
     /**
-     * @param  class-string<CastsPropertySet>  $propertyName
+     * @param class-string<CastsPropertySet> $propertyName
+     * @param Collection<array-key,mixed> $properties
      */
     public function cast(string $propertyType, string $propertyName, Collection $properties): mixed
     {

diff --git a/src/Bag/Attributes/CastOutput.php b/src/Bag/Attributes/CastOutput.php
@@ -5,19 +5,26 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Casts\CastsPropertyGet;
 use Illuminate\Support\Collection;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class CastOutput
+class CastOutput implements AttributeInterface
 {
+    /**
+     * @var array<array-key,mixed>
+     */
     protected array $parameters = [];
 
     public function __construct(protected string $casterClassname, mixed ...$parameters)
     {
         $this->parameters = $parameters;
     }
 
+    /**
+     * @param Collection<array-key,mixed> $properties
+     */
     public function transform(string $propertyName, Collection $properties): mixed
     {
         /** @var CastsPropertyGet $cast */

diff --git a/src/Bag/Attributes/Collection.php b/src/Bag/Attributes/Collection.php
@@ -5,12 +5,13 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class Collection
+class Collection implements AttributeInterface
 {
     /**
-     * @param class-string<\Illuminate\Support\Collection> $collectionClass
+     * @param class-string<\Illuminate\Support\Collection<array-key,mixed>> $collectionClass
      */
     public function __construct(
         public string $collectionClass

diff --git a/src/Bag/Attributes/Computed.php b/src/Bag/Attributes/Computed.php
@@ -5,8 +5,9 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
-class Computed
+class Computed implements AttributeInterface
 {
 }
diff --git a/src/Bag/Attributes/Factory.php b/src/Bag/Attributes/Factory.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_CLASS)]
-class Factory
+class Factory implements AttributeInterface
 {
     /**
      * @param class-string<Factory> $factoryClass

diff --git a/src/Bag/Attributes/Hidden.php b/src/Bag/Attributes/Hidden.php
@@ -5,8 +5,9 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Hidden
+class Hidden implements AttributeInterface
 {
 }
diff --git a/src/Bag/Attributes/HiddenFromJson.php b/src/Bag/Attributes/HiddenFromJson.php
@@ -5,8 +5,9 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class HiddenFromJson
+class HiddenFromJson implements AttributeInterface
 {
 }
diff --git a/src/Bag/Attributes/Laravel/FromRouteParameter.php b/src/Bag/Attributes/Laravel/FromRouteParameter.php
@@ -4,8 +4,11 @@
 
 namespace Bag\Attributes\Laravel;
 
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER)]
-class FromRouteParameter
+use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
+
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
+class FromRouteParameter implements AttributeInterface
 {
     public function __construct(
         public ?string $parameterName = null,

diff --git a/src/Bag/Attributes/Laravel/FromRouteParameterProperty.php b/src/Bag/Attributes/Laravel/FromRouteParameterProperty.php
@@ -4,8 +4,11 @@
 
 namespace Bag\Attributes\Laravel;
 
-#[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_PARAMETER)]
-class FromRouteParameterProperty
+use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
+
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
+class FromRouteParameterProperty implements AttributeInterface
 {
     public function __construct(
         public string $parameterName,

diff --git a/src/Bag/Attributes/MapInputName.php b/src/Bag/Attributes/MapInputName.php
@@ -5,10 +5,11 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Mappers\MapperInterface;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER | Attribute::IS_REPEATABLE)]
-class MapInputName extends MapName
+class MapInputName extends MapName implements AttributeInterface
 {
     /**
      * @param  class-string<MapperInterface>  $mapper

diff --git a/src/Bag/Attributes/MapName.php b/src/Bag/Attributes/MapName.php
@@ -5,14 +5,17 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Mappers\MapperInterface;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class MapName
+class MapName implements AttributeInterface
 {
     /**
-     * @param  class-string<MapperInterface>|null  $input
-     * @param  class-string<MapperInterface>|null  $output
+     * @param class-string<MapperInterface>|null $input
+     * @param class-string<MapperInterface>|null $output
+     * @param array<array-key,mixed> $inputParams
+     * @param array<array-key,mixed> $outputParams
      */
     public function __construct(public ?string $input = null, public ?string $output = null, public array $inputParams = [], public array $outputParams = [])
     {

diff --git a/src/Bag/Attributes/MapOutputName.php b/src/Bag/Attributes/MapOutputName.php
@@ -5,10 +5,11 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Bag\Mappers\MapperInterface;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class MapOutputName extends MapName
+class MapOutputName extends MapName implements AttributeInterface
 {
     /**
      * @param  class-string<MapperInterface>  $mapper

diff --git a/src/Bag/Attributes/Transforms.php b/src/Bag/Attributes/Transforms.php
@@ -5,11 +5,15 @@
 namespace Bag\Attributes;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Illuminate\Support\Collection;
 
 #[Attribute(Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
-class Transforms
+class Transforms implements AttributeInterface
 {
+    /**
+     * @var Collection<array-key, string>
+     */
     public Collection $types;
 
     public function __construct(string ...$types)

diff --git a/src/Bag/Attributes/Validation/Between.php b/src/Bag/Attributes/Validation/Between.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Between extends Rule
+class Between extends Rule implements AttributeInterface
 {
     public function __construct(int $min, int $max)
     {

diff --git a/src/Bag/Attributes/Validation/Boolean.php b/src/Bag/Attributes/Validation/Boolean.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Boolean extends Rule
+class Boolean extends Rule implements AttributeInterface
 {
     public function __construct()
     {

diff --git a/src/Bag/Attributes/Validation/Decimal.php b/src/Bag/Attributes/Validation/Decimal.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Decimal extends Rule
+class Decimal extends Rule implements AttributeInterface
 {
     public function __construct(int $minPlaces, ?int $maxPlaces = null)
     {

diff --git a/src/Bag/Attributes/Validation/Email.php b/src/Bag/Attributes/Validation/Email.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Email extends Rule
+class Email extends Rule implements AttributeInterface
 {
     public function __construct(
         bool $rfc = true,

diff --git a/src/Bag/Attributes/Validation/Enum.php b/src/Bag/Attributes/Validation/Enum.php
@@ -6,9 +6,10 @@
 
 use Attribute;
 use BackedEnum;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Enum extends Rule
+class Enum extends Rule implements AttributeInterface
 {
     /**
      * @type class-string<BackedEnum>

diff --git a/src/Bag/Attributes/Validation/Exists.php b/src/Bag/Attributes/Validation/Exists.php
@@ -5,10 +5,11 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 use Illuminate\Database\Eloquent\Model;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Exists extends Rule
+class Exists extends Rule implements AttributeInterface
 {
     /**
      * @param string|class-string<Model> $table

diff --git a/src/Bag/Attributes/Validation/In.php b/src/Bag/Attributes/Validation/In.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class In extends Rule
+class In extends Rule implements AttributeInterface
 {
     public function __construct(mixed ... $values)
     {

diff --git a/src/Bag/Attributes/Validation/Integer.php b/src/Bag/Attributes/Validation/Integer.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Integer extends Rule
+class Integer extends Rule implements AttributeInterface
 {
     public function __construct()
     {

diff --git a/src/Bag/Attributes/Validation/Max.php b/src/Bag/Attributes/Validation/Max.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Max extends Rule
+class Max extends Rule implements AttributeInterface
 {
     public function __construct(int $maximum)
     {

diff --git a/src/Bag/Attributes/Validation/Min.php b/src/Bag/Attributes/Validation/Min.php
@@ -5,9 +5,10 @@
 namespace Bag\Attributes\Validation;
 
 use Attribute;
+use Bag\Attributes\Attribute as AttributeInterface;
 
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
-class Min extends Rule
+class Min extends Rule implements AttributeInterface
 {
     public function __construct(int $minimum)
     {