Progress towards PHPStan level 5 (#1015)

docs/class-reference.md

@@ -216,9 +216,11 @@ static function isInputType($type): bool
 
 ```php
 /**
+ * @return (Type&NamedType)|null
+ *
  * @api
  */
-static function getNamedType($type): GraphQL\Type\Definition\Type
+static function getNamedType(GraphQL\Type\Definition\Type $type): GraphQL\Type\Definition\Type
 ```
 
 ```php
@@ -2293,7 +2295,7 @@ static function fromArray(array $node): GraphQL\Language\AST\Node
 /**
  * Convert AST node to serializable array
  *
- * @return mixed[]
+ * @return array<string, mixed>
  *
  * @api
  */
@@ -2349,9 +2351,9 @@ static function astFromValue($value, GraphQL\Type\Definition\InputType $type)
  * | Null Value           | null          |
  *
  * @param VariableNode|NullValueNode|IntValueNode|FloatValueNode|StringValueNode|BooleanValueNode|EnumValueNode|ListValueNode|ObjectValueNode|null $valueNode
- * @param mixed[]|null                                                                                                                             $variables
+ * @param array<string, mixed>|null                                                                                                                $variables
  *
- * @return mixed[]|stdClass|null
+ * @return mixed
  *
  * @throws Exception
  *
@@ -2381,16 +2383,15 @@ static function valueFromAST(
  * | Enum                 | Mixed         |
  * | Null                 | null          |
  *
- * @param Node         $valueNode
- * @param mixed[]|null $variables
+ * @param array<string, mixed>|null $variables
  *
  * @return mixed
  *
  * @throws Exception
  *
  * @api
  */
-static function valueFromASTUntyped($valueNode, array $variables = null)
+static function valueFromASTUntyped(GraphQL\Language\AST\Node $valueNode, array $variables = null)
 ```
 
 ```php
@@ -2403,7 +2404,7 @@ static function valueFromASTUntyped($valueNode, array $variables = null)
  *
  * @api
  */
-static function typeFromAST(GraphQL\Type\Schema $schema, $inputTypeNode): GraphQL\Type\Definition\Type
+static function typeFromAST(GraphQL\Type\Schema $schema, GraphQL\Language\AST\Node $inputTypeNode): GraphQL\Type\Definition\Type
 ```
 
 ```php

phpcs.xml.dist

@@ -18,6 +18,9 @@
     <file>tests</file>
 
     <rule ref="Doctrine">
+        <!-- Prevents useful type assertions -->
+        <exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable" />
+
         <!-- We will rely on PHPStan instead of these -->
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint" />

src/Type/Definition/Type.php

@@ -217,14 +217,17 @@ public static function isInputType($type): bool
     }
 
     /**
+     * @return (Type&NamedType)|null
+     *
      * @api
      */
-    public static function getNamedType($type): ?Type
+    public static function getNamedType(?Type $type): ?Type
     {
         while ($type instanceof WrappingType) {
             $type = $type->getWrappedType();
         }
 
+        // @phpstan-ignore-next-line non-wrapped types must be named types
         return $type;
     }
 

src/Utils/TypeInfo.php

@@ -406,7 +406,7 @@ public function getFieldDef(): ?FieldDefinition
     }
 
     /**
-     * @return mixed|null
+     * @return mixed any value is possible
      */
     public function getDefaultValue()
     {

src/Validator/Rules/FieldsOnCorrectType.php

@@ -7,8 +7,10 @@
 use GraphQL\Error\Error;
 use GraphQL\Language\AST\FieldNode;
 use GraphQL\Language\AST\NodeKind;
+use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\TypeWithFields;
+use GraphQL\Type\Definition\UnionType;
 use GraphQL\Type\Schema;
 use GraphQL\Utils\Utils;
 use GraphQL\Validator\ValidationContext;
@@ -69,6 +71,8 @@ public function getVisitor(ValidationContext $context): array
     protected function getSuggestedTypeNames(Schema $schema, Type $type, string $fieldName): array
     {
         if (Type::isAbstractType($type)) {
+            /** @var InterfaceType|UnionType $type must be abstract type inside this if */
+
             $suggestedObjectTypes = [];
             $interfaceUsageCount  = [];