PHPStan level 6 (#1039)

Author: spawnia

CHANGELOG.md

@@ -29,6 +29,9 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Call previously unused methods `EnumType::parseValue()` and `EnumType::parseLiteral()`
 - Strongly type `PromiseAdapter::createRejected()` to require `\Throwable`
 - Move members specific to `NamedType` out of `Type`: `$name`, `$description`, `$config`, `isBuiltInType()`, `assertValid()`
+- Always convert recursively when calling `Node::toArray()`
+- Make `Directive::$config['args']` use the same definition style as `FieldDefinition::$config['args']`
+- Rename `FieldArgument` to `Argument`
 
 ### Added
 
@@ -42,6 +45,7 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Add SDL validation rule `UniqueOperationTypes` (#995)
 - Add ability to remove custom validation rules after adding them via `DocumentValidator::removeRule()`
 - Allow lazy enum values
+- Make `Node` implement `JsonSerializable`
 
 ### Optimized
 
@@ -91,6 +95,8 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Remove `WrappingType::getWrappedType()` argument `$recurse` in favor of `WrappingType::getInnermostType()`
 - Remove `Type::assertType()`
 - Remove `ListOfType::$ofType`, `ListOfType::getOfType()` and `NonNull::getOfType()`
+- Remove option `commentDescriptions` from `BuildSchema::buildAST()`, `BuildSchema::build()` and `Printer::doPrint()`
+- Remove parameter `$options` from `ASTDefinitionBuilder`
 
 ## 14.11.3
 

benchmarks/Utils/SchemaGenerator.php

@@ -178,7 +178,9 @@ protected function createFieldArgs(string $fieldName, string $typeName): array
     }
 
     /**
+     * @param mixed                $root
      * @param array<string, mixed> $args
+     * @param mixed                $context
      */
     public function resolveField($root, array $args, $context, ResolveInfo $resolveInfo): string
     {

docs/type-definitions/directives.md

@@ -38,7 +38,6 @@ In **graphql-php** custom directive is an instance of `GraphQL\Type\Definition\D
 use GraphQL\Language\DirectiveLocation;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\Directive;
-use GraphQL\Type\Definition\FieldArgument;
 
 $trackDirective = new Directive([
     'name' => 'track',
@@ -47,12 +46,11 @@ $trackDirective = new Directive([
         DirectiveLocation::FIELD,
     ],
     'args' => [
-        new FieldArgument([
-            'name' => 'details',
+        'details' => [
             'type' => Type::string(),
             'description' => 'String with additional details of field usage scenario',
             'defaultValue' => ''
-        ])
+        ]
     ]
 ]);
 ```

examples/01-blog/Blog/Type/CommentType.php

@@ -9,6 +9,7 @@
 use GraphQL\Examples\Blog\Data\User;
 use GraphQL\Examples\Blog\Type\Field\HtmlField;
 use GraphQL\Examples\Blog\Types;
+use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 
@@ -27,7 +28,7 @@ public function __construct()
                 'parent' => Types::comment(),
                 'isAnonymous' => Types::boolean(),
                 'replies' => [
-                    'type' => Types::listOf(Types::comment()),
+                    'type' => new ListOfType(Types::comment()),
                     'args' => [
                         'after' => Types::int(),
                         'limit' => [

examples/01-blog/Blog/Type/ImageType.php

@@ -8,6 +8,7 @@
 use GraphQL\Examples\Blog\AppContext;
 use GraphQL\Examples\Blog\Data\Image;
 use GraphQL\Examples\Blog\Types;
+use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 use UnexpectedValueException;
@@ -36,7 +37,7 @@ public function __construct()
                     },
                 ],
                 'nonNullFieldWithError' => [
-                    'type' => Types::nonNull(Types::string()),
+                    'type' => new NonNull(Types::string()),
                     'resolve' => static function (): void {
                         throw new Exception('Non-null field with exception');
                     },

examples/01-blog/Blog/Type/QueryType.php

@@ -10,6 +10,8 @@
 use GraphQL\Examples\Blog\Data\Story;
 use GraphQL\Examples\Blog\Data\User;
 use GraphQL\Examples\Blog\Types;
+use GraphQL\Type\Definition\ListOfType;
+use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
@@ -25,15 +27,15 @@ public function __construct()
                     'type' => Types::user(),
                     'description' => 'Returns user by id (in range of 1-5)',
                     'args' => [
-                        'id' => Types::nonNull(Types::id()),
+                        'id' => new NonNull(Types::id()),
                     ],
                 ],
                 'viewer' => [
                     'type' => Types::user(),
                     'description' => 'Represents currently logged-in user (for the sake of example - simply returns user with id == 1)',
                 ],
                 'stories' => [
-                    'type' => Types::listOf(Types::story()),
+                    'type' => new ListOfType(Types::story()),
                     'description' => 'Returns subset of stories posted for this blog',
                     'args' => [
                         'after' => [

examples/01-blog/Blog/Type/StoryType.php

@@ -11,6 +11,7 @@
 use GraphQL\Examples\Blog\Data\User;
 use GraphQL\Examples\Blog\Type\Field\HtmlField;
 use GraphQL\Examples\Blog\Types;
+use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 
@@ -26,10 +27,10 @@ public function __construct()
             'fields' => static fn (): array => [
                 'id' => Types::id(),
                 'author' => Types::user(),
-                'mentions' => Types::listOf(Types::mention()),
+                'mentions' => new ListOfType(Types::mention()),
                 'totalCommentCount' => Types::int(),
                 'comments' => [
-                    'type' => Types::listOf(Types::comment()),
+                    'type' => new ListOfType(Types::comment()),
                     'args' => [
                         'after' => [
                             'type' => Types::id(),
@@ -42,7 +43,7 @@ public function __construct()
                     ],
                 ],
                 'likes' => [
-                    'type' => Types::listOf(Types::user()),
+                    'type' => new ListOfType(Types::user()),
                     'args' => [
                         'limit' => [
                             'type' => Types::int(),
@@ -51,8 +52,8 @@ public function __construct()
                         ],
                     ],
                 ],
-                'likedBy' => Types::listOf(Types::user()),
-                'affordances' => Types::listOf(Types::storyAffordances()),
+                'likedBy' => new ListOfType(Types::user()),
+                'affordances' => new ListOfType(Types::storyAffordances()),
                 'hasViewerLiked' => Types::boolean(),
 
                 'body' => HtmlField::build('body'),

examples/01-blog/Blog/Type/UserType.php

@@ -7,8 +7,10 @@
 use Exception;
 use GraphQL\Examples\Blog\Data\DataSource;
 use GraphQL\Examples\Blog\Data\Image;
+use GraphQL\Examples\Blog\Data\Story;
 use GraphQL\Examples\Blog\Data\User;
 use GraphQL\Examples\Blog\Types;
+use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 
@@ -29,7 +31,7 @@ public function __construct()
                     'type' => Types::image(),
                     'description' => 'User photo URL',
                     'args' => [
-                        'size' => Types::nonNull(Types::imageSize()),
+                        'size' => new NonNull(Types::imageSize()),
                     ],
                 ],
                 'firstName' => [
@@ -68,7 +70,7 @@ public function resolvePhoto(User $user, array $args): Image
         return DataSource::getUserPhoto($user->id, $args['size']);
     }
 
-    public function resolveLastStoryPosted(User $user)
+    public function resolveLastStoryPosted(User $user): ?Story
     {
         return DataSource::findLastStoryFor($user->id);
     }

examples/01-blog/Blog/Types.php

@@ -17,8 +17,6 @@
 use GraphQL\Examples\Blog\Type\SearchResultType;
 use GraphQL\Examples\Blog\Type\StoryType;
 use GraphQL\Examples\Blog\Type\UserType;
-use GraphQL\Type\Definition\ListOfType;
-use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ScalarType;
 use GraphQL\Type\Definition\Type;
 
@@ -173,20 +171,4 @@ public static function string(): ScalarType
     {
         return Type::string();
     }
-
-    /**
-     * @param Type|callable():Type $type
-     */
-    public static function listOf($type): ListOfType
-    {
-        return new ListOfType($type);
-    }
-
-    /**
-     * @param Type|callable():Type $type
-     */
-    public static function nonNull($type): NonNull
-    {
-        return new NonNull($type);
-    }
 }

generate-class-reference.php

@@ -64,6 +64,7 @@
 ];
 
 /**
+ * @param ReflectionClass<object>                               $class
  * @param array{constants?: bool, props?: bool, methods?: bool} $options
  */
 function renderClass(ReflectionClass $class, array $options): string