Remove Utils::find(), Utils::every() and Utils::invariant() (#1082)

spawnia · web-flow · commit 914d91e717ac · 2022-03-03T12:07:56.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -111,6 +111,7 @@ You can find and compare releases at the [GitHub release page](https://github.co
 - Remove parameter `$options` from `ASTDefinitionBuilder`
 - Remove `FieldDefinition::create()` in favor of `new FieldDefinition()`
 - Remove `GraphQL\Exception\InvalidArgument`
+- Remove `Utils::find()`, `Utils::every()` and `Utils::invariant()`
 
 ## 14.11.5
 
diff --git a/benchmarks/HugeSchemaBench.php b/benchmarks/HugeSchemaBench.php
@@ -67,9 +67,7 @@ private function createLazySchema(): Schema
         return new Schema(
             SchemaConfig::create()
                 ->setQuery($this->schemaGenerator->buildQueryType())
-                ->setTypeLoader(function (string $name): Type {
-                    return $this->schemaGenerator->loadType($name);
-                })
+                ->setTypeLoader(fn (string $name): Type => $this->schemaGenerator->loadType($name))
         );
     }
 }
diff --git a/benchmarks/Utils/SchemaGenerator.php b/benchmarks/Utils/SchemaGenerator.php
@@ -76,9 +76,7 @@ protected function createType(int $nestingLevel, ?string $typeName = null): Obje
 
         $type = new ObjectType([
             'name' => $typeName,
-            'fields' => function () use ($typeName, $nestingLevel): array {
-                return $this->createTypeFields($typeName, $nestingLevel + 1);
-            },
+            'fields' => fn (): array => $this->createTypeFields($typeName, $nestingLevel + 1),
         ]);
 
         $this->objectTypes[$typeName] = $type;
@@ -128,15 +126,13 @@ protected function createTypeFields(string $typeName, int $nestingLevel): array
                 'name' => $name,
                 'type' => Type::listOf($type),
                 'args' => $this->createFieldArgs($name, $typeName),
-                'resolve' => static function (): array {
-                    return [
-                        'string1',
-                        'string2',
-                        'string3',
-                        'string4',
-                        'string5',
-                    ];
-                },
+                'resolve' => static fn (): array => [
+                    'string1',
+                    'string2',
+                    'string3',
+                    'string4',
+                    'string5',
+                ],
             ];
         }
 
diff --git a/docs/data-fetching.md b/docs/data-fetching.md
@@ -201,6 +201,7 @@ Here is an example of **BlogStory** resolver for field **author** that uses defe
 
     return new GraphQL\Deferred(function () use ($blogStory) {
         MyUserBuffer::loadBuffered();
+
         return MyUserBuffer::get($blogStory['authorId']);
     });
 }
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -58,9 +58,7 @@ $queryType = new ObjectType([
             'args' => [
                 'message' => Type::nonNull(Type::string()),
             ],
-            'resolve' => function ($rootValue, $args) {
-                return $rootValue['prefix'] . $args['message'];
-            }
+            'resolve' => fn ($rootValue, $args) => $rootValue['prefix'] . $args['message'],
         ],
     ],
 ]);
diff --git a/docs/schema-definition.md b/docs/schema-definition.md
@@ -37,9 +37,7 @@ $queryType = new ObjectType([
     'fields' => [
         'hello' => [
             'type' => Type::string(),
-            'resolve' => function() {
-                return 'Hello World!';
-            }
+            'resolve' => fn () => 'Hello World!',
         ],
         'hero' => [
             'type' => $characterInterface,
@@ -48,9 +46,7 @@ $queryType = new ObjectType([
                     'type' => $episodeEnum
                 ]
             ],
-            'resolve' => function ($rootValue, $args) {
-                return StarWarsData::getHero(isset($args['episode']) ? $args['episode'] : null);
-            },
+            'resolve' => fn ($rootValue, $args) => StarWarsData::getHero(isset($args['episode']) ? $args['episode'] : null),
         ]
     ]
 ]);
@@ -64,8 +60,8 @@ $mutationType = new ObjectType([
                 'episode' => $episodeEnum,
                 'review' => $reviewInputObject
             ],
-            'resolve' => function($rootValue, $args) {
-                // TODOC
+            'resolve' => function ($rootValue, $args) {
+                // TODO
             }
         ]
     ]
diff --git a/examples/00-hello-world/graphql.php b/examples/00-hello-world/graphql.php
@@ -25,9 +25,7 @@
                 'args' => [
                     'message' => ['type' => Type::string()],
                 ],
-                'resolve' => static function ($rootValue, array $args): string {
-                    return $rootValue['prefix'] . $args['message'];
-                },
+                'resolve' => static fn ($rootValue, array $args): string => $rootValue['prefix'] . $args['message'],
             ],
         ],
     ]);
@@ -41,9 +39,7 @@
                     'x' => ['type' => Type::int()],
                     'y' => ['type' => Type::int()],
                 ],
-                'resolve' => static function ($calc, array $args): int {
-                    return $args['x'] + $args['y'];
-                },
+                'resolve' => static fn ($calc, array $args): int => $args['x'] + $args['y'],
             ],
         ],
     ]);
diff --git a/examples/01-blog/Blog/Type/QueryType.php b/examples/01-blog/Blog/Type/QueryType.php
@@ -63,9 +63,7 @@ public function __construct()
                 ],
                 'hello' => Type::string(),
             ],
-            'resolveField' => function ($rootValue, $args, $context, ResolveInfo $info) {
-                return $this->{$info->fieldName}($rootValue, $args, $context, $info);
-            },
+            'resolveField' => fn ($rootValue, array $args, $context, ResolveInfo $info) => $this->{$info->fieldName}($rootValue, $args, $context, $info),
         ]);
     }
 
diff --git a/examples/03-standard-server/graphql.php b/examples/03-standard-server/graphql.php
@@ -25,9 +25,7 @@
                 'args' => [
                     'message' => ['type' => Type::string()],
                 ],
-                'resolve' => static function (array $rootValue, array $args): string {
-                    return $rootValue['prefix'] . $args['message'];
-                },
+                'resolve' => static fn (array $rootValue, array $args): string => $rootValue['prefix'] . $args['message'],
             ],
         ],
     ]);
@@ -41,9 +39,7 @@
                     'x' => ['type' => Type::int()],
                     'y' => ['type' => Type::int()],
                 ],
-                'resolve' => static function (array $rootValue, array $args): int {
-                    return $args['x'] + $args['y'];
-                },
+                'resolve' => static fn (array $rootValue, array $args): int => $args['x'] + $args['y'],
             ],
         ],
     ]);
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -160,6 +160,11 @@ parameters:
 			count: 1
 			path: src/Validator/Rules/OverlappingFieldsCanBeMerged.php
 
+		-
+			message: "#^Instanceof between mixed and GraphQL\\\\Language\\\\AST\\\\NodeList will always evaluate to false\\.$#"
+			count: 1
+			path: tests/Language/VisitorTest.php
+
 		-
 			message: "#^Method GraphQL\\\\Tests\\\\Language\\\\VisitorTest\\:\\:getNodeByPath\\(\\) return type with generic class GraphQL\\\\Language\\\\AST\\\\NodeList does not specify its types\\: T$#"
 			count: 1
diff --git a/src/Executor/ExecutionResult.php b/src/Executor/ExecutionResult.php
@@ -167,9 +167,8 @@ public function toArray(int $debug = DebugFlag::NONE): array
         $result = [];
 
         if (count($this->errors) > 0) {
-            $errorsHandler = $this->errorsHandler ?? static function (array $errors, callable $formatter): array {
-                return array_map($formatter, $errors);
-            };
+            $errorsHandler = $this->errorsHandler
+                ?? static fn (array $errors, callable $formatter): array => array_map($formatter, $errors);
 
             $handledErrors = $errorsHandler(
                 $this->errors,
diff --git a/src/Executor/ReferenceExecutor.php b/src/Executor/ReferenceExecutor.php
@@ -540,7 +540,7 @@ function ($results, $responseName) use ($path, $parentType, $rootValue, $fields)
 
                 $promise = $this->getPromise($result);
                 if ($promise !== null) {
-                    return $promise->then(static function ($resolvedResult) use ($responseName, $results) {
+                    return $promise->then(static function ($resolvedResult) use ($responseName, $results): array {
                         $results[$responseName] = $resolvedResult;
 
                         return $results;
@@ -926,9 +926,7 @@ protected function promiseReduce(array $values, callable $callback, $initialValu
             function ($previous, $value) use ($callback) {
                 $promise = $this->getPromise($previous);
                 if ($promise !== null) {
-                    return $promise->then(static function ($resolved) use ($callback, $value) {
-                        return $callback($resolved, $value);
-                    });
+                    return $promise->then(static fn ($resolved) => $callback($resolved, $value));
                 }
 
                 return $callback($previous, $value);
@@ -1034,26 +1032,18 @@ protected function completeAbstractValue(
 
         $promise = $this->getPromise($runtimeType);
         if ($promise !== null) {
-            return $promise->then(function ($resolvedRuntimeType) use (
-                $returnType,
+            return $promise->then(fn ($resolvedRuntimeType) => $this->completeObjectValue(
+                $this->ensureValidRuntimeType(
+                    $resolvedRuntimeType,
+                    $returnType,
+                    $info,
+                    $result
+                ),
                 $fieldNodes,
                 $info,
                 $path,
-                &$result
-            ) {
-                return $this->completeObjectValue(
-                    $this->ensureValidRuntimeType(
-                        $resolvedRuntimeType,
-                        $returnType,
-                        $info,
-                        $result
-                    ),
-                    $fieldNodes,
-                    $info,
-                    $path,
-                    $result
-                );
-            });
+                $result
+            ));
         }
 
         return $this->completeObjectValue(
diff --git a/src/Executor/Values.php b/src/Executor/Values.php
@@ -139,15 +139,12 @@ public static function getVariableValues(Schema $schema, NodeList $varDefNodes,
      */
     public static function getDirectiveValues(Directive $directiveDef, Node $node, ?array $variableValues = null): ?array
     {
-        $directiveNode = Utils::find(
-            $node->directives,
-            static function (DirectiveNode $directive) use ($directiveDef): bool {
-                return $directive->name->value === $directiveDef->name;
-            }
-        );
+        $directiveDefName = $directiveDef->name;
 
-        if ($directiveNode !== null) {
-            return self::getArgumentValues($directiveDef, $directiveNode, $variableValues);
+        foreach ($node->directives as $directive) {
+            if ($directive->name->value === $directiveDefName) {
+                return self::getArgumentValues($directiveDef, $directive, $variableValues);
+            }
         }
 
         return null;
diff --git a/src/Language/Parser.php b/src/Language/Parser.php
@@ -1088,9 +1088,7 @@ private function parseSchemaDefinition(): SchemaDefinitionNode
 
         $operationTypes = $this->many(
             Token::BRACE_L,
-            function (): OperationTypeDefinitionNode {
-                return $this->parseOperationTypeDefinition();
-            },
+            fn (): OperationTypeDefinitionNode => $this->parseOperationTypeDefinition(),
             Token::BRACE_R
         );
 
@@ -1395,9 +1393,7 @@ private function parseInputFieldsDefinition(): NodeList
         return $this->peek(Token::BRACE_L)
             ? $this->many(
                 Token::BRACE_L,
-                function (): InputValueDefinitionNode {
-                    return $this->parseInputValueDefinition();
-                },
+                fn (): InputValueDefinitionNode => $this->parseInputValueDefinition(),
                 Token::BRACE_R
             )
             : new NodeList([]);
diff --git a/src/Language/Printer.php b/src/Language/Printer.php
@@ -49,7 +49,6 @@
 use GraphQL\Language\AST\UnionTypeExtensionNode;
 use GraphQL\Language\AST\VariableDefinitionNode;
 use GraphQL\Language\AST\VariableNode;
-use GraphQL\Utils\Utils;
 use function implode;
 use function json_encode;
 use function str_replace;
@@ -118,9 +117,13 @@ protected function p(?Node $node, bool $isDescription = false): string
                     $argStrings[] = $this->p($arg);
                 }
 
-                $noIndent = Utils::every($argStrings, static function (string $arg): bool {
-                    return strpos($arg, "\n") === false;
-                });
+                $noIndent = true;
+                foreach ($argStrings as $argString) {
+                    if (strpos($argString, "\n") !== false) {
+                        $noIndent = false;
+                        break;
+                    }
+                }
 
                 return $this->addDescription($node->description, 'directive @'
                     . $this->p($node->name)
@@ -175,9 +178,13 @@ protected function p(?Node $node, bool $isDescription = false): string
                     $argStrings[] = $this->p($item);
                 }
 
-                $noIndent = Utils::every($argStrings, static function (string $arg): bool {
-                    return strpos($arg, "\n") === false;
-                });
+                $noIndent = true;
+                foreach ($argStrings as $argString) {
+                    if (strpos($argString, "\n") !== false) {
+                        $noIndent = false;
+                        break;
+                    }
+                }
 
                 return $this->addDescription(
                     $node->description,
diff --git a/src/Type/Definition/ResolveInfo.php b/src/Type/Definition/ResolveInfo.php
@@ -216,11 +216,13 @@ public function lookAhead(array $options = []): QueryPlan
     }
 
     /**
-     * @return bool[]
+     * @return array<string, bool>
      */
     private function foldSelectionSet(SelectionSetNode $selectionSet, int $descend): array
     {
+        /** @var array<string, bool> $fields */
         $fields = [];
+
         foreach ($selectionSet->selections as $selectionNode) {
             if ($selectionNode instanceof FieldNode) {
                 $fields[$selectionNode->name->value] = $descend > 0 && $selectionNode->selectionSet !== null
diff --git a/src/Type/Introspection.php b/src/Type/Introspection.php
diff --git a/src/Utils/BreakingChangesFinder.php b/src/Utils/BreakingChangesFinder.php
diff --git a/src/Utils/BuildClientSchema.php b/src/Utils/BuildClientSchema.php
diff --git a/src/Utils/SchemaExtender.php b/src/Utils/SchemaExtender.php
diff --git a/src/Utils/SchemaPrinter.php b/src/Utils/SchemaPrinter.php
diff --git a/src/Utils/Utils.php b/src/Utils/Utils.php

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ private function createLazySchema(): Schema`
`67`	`67`	`return new Schema(`
`68`	`68`	`SchemaConfig::create()`
`69`	`69`	`->setQuery($this->schemaGenerator->buildQueryType())`
`70`		`- ->setTypeLoader(function (string $name): Type {`
`71`		`- return $this->schemaGenerator->loadType($name);`
`72`		`- })`
	`70`	`+ ->setTypeLoader(fn (string $name): Type => $this->schemaGenerator->loadType($name))`
`73`	`71`	`);`
`74`	`72`	`}`
`75`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@ Here is an example of BlogStory resolver for field author that uses defe`
`201`	`201`
`202`	`202`	`return new GraphQL\Deferred(function () use ($blogStory) {`
`203`	`203`	`MyUserBuffer::loadBuffered();`
	`204`	`+`
`204`	`205`	`return MyUserBuffer::get($blogStory['authorId']);`
`205`	`206`	`});`
`206`	`207`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ $queryType = new ObjectType([`
`37`	`37`	`'fields' => [`
`38`	`38`	`'hello' => [`
`39`	`39`	`'type' => Type::string(),`
`40`		`- 'resolve' => function() {`
`41`		`- return 'Hello World!';`
`42`		`- }`
	`40`	`+ 'resolve' => fn () => 'Hello World!',`
`43`	`41`	`],`
`44`	`42`	`'hero' => [`
`45`	`43`	`'type' => $characterInterface,`
`@@ -48,9 +46,7 @@ $queryType = new ObjectType([`
`48`	`46`	`'type' => $episodeEnum`
`49`	`47`	`]`
`50`	`48`	`],`
`51`		`- 'resolve' => function ($rootValue, $args) {`
`52`		`- return StarWarsData::getHero(isset($args['episode']) ? $args['episode'] : null);`
`53`		`- },`
	`49`	`+ 'resolve' => fn ($rootValue, $args) => StarWarsData::getHero(isset($args['episode']) ? $args['episode'] : null),`
`54`	`50`	`]`
`55`	`51`	`]`
`56`	`52`	`]);`
`@@ -64,8 +60,8 @@ $mutationType = new ObjectType([`
`64`	`60`	`'episode' => $episodeEnum,`
`65`	`61`	`'review' => $reviewInputObject`
`66`	`62`	`],`
`67`		`- 'resolve' => function($rootValue, $args) {`
`68`		`- // TODOC`
	`63`	`+ 'resolve' => function ($rootValue, $args) {`
	`64`	`+ // TODO`
`69`	`65`	`}`
`70`	`66`	`]`
`71`	`67`	`]`