Fix PHPStan errors

nuwave · Dec 27, 2024 · f0ddbeb · f0ddbeb
1 parent 8080404
commit f0ddbeb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/src/Bind/BindDefinition.php b/src/Bind/BindDefinition.php
@@ -5,6 +5,7 @@
 use GraphQL\Language\AST\FieldDefinitionNode;
 use GraphQL\Language\AST\InputObjectTypeDefinitionNode;
 use GraphQL\Language\AST\InputValueDefinitionNode;
+use GraphQL\Language\AST\NamedTypeNode;
 use GraphQL\Language\AST\TypeNode;
 use Illuminate\Database\Eloquent\Model;
 use Nuwave\Lighthouse\Exceptions\DefinitionException;
@@ -17,7 +18,7 @@
 use function property_exists;
 
 /**
- * @template TClass
+ * @template-covariant TClass of object
  * @property-read class-string<TClass> $class
  * @property-read string $column
  * @property-read array<string> $with
@@ -80,7 +81,11 @@ private function valueType(TypeNode $typeNode): string
             return $this->valueType($typeNode->type);
         }
 
-        return $typeNode->name->value;
+        if ($typeNode instanceof NamedTypeNode) {
+            return $typeNode->name->value;
+        }
+
+        return '';
     }
 
     public function isModelBinding(): bool

diff --git a/src/Bind/BindDirective.php b/src/Bind/BindDirective.php
@@ -19,6 +19,9 @@
 
 class BindDirective extends BaseDirective implements ArgumentValidation, ArgTransformerDirective, ArgDirectiveForArray, ArgManipulator, InputFieldManipulator
 {
+    /**
+     * @var \Nuwave\Lighthouse\Bind\BindDefinition<object>|null
+     */
     private ?BindDefinition $definition = null;
     private mixed $binding;
 
@@ -66,6 +69,9 @@ class: String!
 GRAPHQL;
     }
 
+    /**
+     * @return \Nuwave\Lighthouse\Bind\BindDefinition<object>
+     */
     private function bindDefinition(): BindDefinition
     {
         return $this->definition ??= new BindDefinition(

diff --git a/src/Bind/ModelBinding.php b/src/Bind/ModelBinding.php
@@ -13,7 +13,9 @@
 class ModelBinding
 {
     /**
+     * @param int|string|array<int|string> $value
      * @param \Nuwave\Lighthouse\Bind\BindDefinition<\Illuminate\Database\Eloquent\Model> $definition
+     * @return \Illuminate\Database\Eloquent\Model|\Illuminate\Database\Eloquent\Collection<string, \Illuminate\Database\Eloquent\Model>|null
      */
     public function __invoke(int|string|array $value, BindDefinition $definition): Model|EloquentCollection|null
     {
@@ -30,7 +32,7 @@ public function __invoke(int|string|array $value, BindDefinition $definition): M
     }
 
     /**
-     * @param \Illuminate\Database\Eloquent\Collection<\Illuminate\Database\Eloquent\Model> $results
+     * @param \Illuminate\Database\Eloquent\Collection<int, \Illuminate\Database\Eloquent\Model> $results
      */
     private function modelInstance(EloquentCollection $results): ?Model
     {
@@ -45,8 +47,11 @@ private function modelInstance(EloquentCollection $results): ?Model
      * Binding collections should be returned with the original values
      * as keys to allow us to validate the binding when non-optional.
      * @see \Nuwave\Lighthouse\Bind\BindDirective::rules()
-     * @param \Illuminate\Database\Eloquent\Collection<\Illuminate\Database\Eloquent\Model> $results
-     * @return \Illuminate\Database\Eloquent\Collection<\Illuminate\Database\Eloquent\Model>
+     *
+     * @param \Illuminate\Database\Eloquent\Collection<int, \Illuminate\Database\Eloquent\Model> $results
+     * @param \Illuminate\Support\Collection<int, mixed> $values
+     * @param \Nuwave\Lighthouse\Bind\BindDefinition<\Illuminate\Database\Eloquent\Model> $definition
+     * @return \Illuminate\Database\Eloquent\Collection<string, \Illuminate\Database\Eloquent\Model>
      */
     private function modelCollection(
         EloquentCollection $results,

diff --git a/src/Bind/Validation/BindingExists.php b/src/Bind/Validation/BindingExists.php
@@ -26,7 +26,7 @@ public function setValidator(Validator $validator): self
     }
 
     /**
-     * @param callable(string): \Illuminate\Translation\PotentiallyTranslatedString $fail
+     * @param \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString $fail
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
@@ -47,7 +47,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 continue;
             }
 
-            $this->validator->addFailure("$attribute.$key", 'exists');
+            $this->validator?->addFailure("$attribute.$key", 'exists');
         }
     }
 }
diff --git a/tests/Utils/Bind/SpyCallableClassBinding.php b/tests/Utils/Bind/SpyCallableClassBinding.php
@@ -11,6 +11,10 @@
 final class SpyCallableClassBinding
 {
     private mixed $value = null;
+
+    /**
+     * @var \Nuwave\Lighthouse\Bind\BindDefinition<object>|null
+     */
     private ?BindDefinition $definition = null;
 
     /**
@@ -21,6 +25,7 @@ public function __construct(
     ) {}
 
     /**
+     * @param \Nuwave\Lighthouse\Bind\BindDefinition<object> $definition
      * @return TReturn
      */
     public function __invoke(mixed $value, BindDefinition $definition): mixed
@@ -31,6 +36,9 @@ public function __invoke(mixed $value, BindDefinition $definition): mixed
         return $this->return;
     }
 
+    /**
+     * @param \Nuwave\Lighthouse\Bind\BindDefinition<object> $definition
+     */
     public function assertCalledWith(mixed $value, BindDefinition $definition): void
     {
         Assert::assertSame($value, $this->value);

diff --git a/tests/Utils/Resolvers/SpyResolver.php b/tests/Utils/Resolvers/SpyResolver.php
@@ -9,6 +9,9 @@
  */
 final class SpyResolver
 {
+    /**
+     * @var array<string, mixed>
+     */
     private array $args = [];
 
     /**
@@ -19,6 +22,7 @@ public function __construct(
     ) {}
 
     /**
+     * @param array<string, mixed> $args
      * @return TReturn
      */
     public function __invoke(mixed $root, array $args): mixed