Generalize handle of Field type

Author: mfn

phpstan-baseline.neon

@@ -6,12 +6,6 @@ parameters:
 			count: 1
 			path: src/GraphQL.php
 
-		-
-			rawMessage: 'Cannot access offset ''name'' on array<string, mixed>|Rebing\GraphQL\Support\Field.'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 2
-			path: src/GraphQL.php
-
 		-
 			rawMessage: Instanceof between Error and Error will always evaluate to true.
 			identifier: instanceof.alwaysTrue
@@ -25,7 +19,7 @@ parameters:
 			path: src/GraphQL.php
 
 		-
-			rawMessage: 'Parameter #1 $config of class GraphQL\Type\Definition\ObjectType constructor expects array{name?: string|null, description?: string|null, resolveField?: (callable(mixed, array<string, mixed>, mixed, GraphQL\Type\Definition\ResolveInfo): mixed)|null, argsMapper?: (callable(array<string, mixed>, GraphQL\Type\Definition\FieldDefinition, GraphQL\Language\AST\FieldNode, mixed): mixed)|null, fields: (callable(): iterable)|iterable, interfaces?: (callable(): iterable<callable(): GraphQL\Type\Definition\InterfaceType|GraphQL\Type\Definition\InterfaceType>)|iterable<(callable(): GraphQL\Type\Definition\InterfaceType)|GraphQL\Type\Definition\InterfaceType>, isTypeOf?: (callable(mixed, mixed, GraphQL\Type\Definition\ResolveInfo): (bool|GraphQL\Deferred|null))|null, astNode?: GraphQL\Language\AST\ObjectTypeDefinitionNode|null, ...}, non-empty-array<string, array<non-empty-array<string, mixed>|(ArrayAccess&Rebing\GraphQL\Support\Field)>|string> given.'
+			rawMessage: 'Parameter #1 $config of class GraphQL\Type\Definition\ObjectType constructor expects array{name?: string|null, description?: string|null, resolveField?: (callable(mixed, array<string, mixed>, mixed, GraphQL\Type\Definition\ResolveInfo): mixed)|null, argsMapper?: (callable(array<string, mixed>, GraphQL\Type\Definition\FieldDefinition, GraphQL\Language\AST\FieldNode, mixed): mixed)|null, fields: (callable(): iterable)|iterable, interfaces?: (callable(): iterable<callable(): GraphQL\Type\Definition\InterfaceType|GraphQL\Type\Definition\InterfaceType>)|iterable<(callable(): GraphQL\Type\Definition\InterfaceType)|GraphQL\Type\Definition\InterfaceType>, isTypeOf?: (callable(mixed, mixed, GraphQL\Type\Definition\ResolveInfo): (bool|GraphQL\Deferred|null))|null, astNode?: GraphQL\Language\AST\ObjectTypeDefinitionNode|null, ...}, non-empty-array<string, array|string> given.'
 			identifier: argument.type
 			count: 1
 			path: src/GraphQL.php

src/GraphQL.php

@@ -363,9 +363,8 @@ protected function buildObjectTypeFromFields(array $fields, array $opts = []): O
         foreach ($fields as $name => $field) {
             if (\is_string($field)) {
                 $field = $this->app->make($field);
-                /** @var Field $field */
-                $field = $field->toArray();
-            } elseif ($field instanceof Field) {
+            }
+            if ($field instanceof Field) {
                 $field = $field->toArray();
             }
             $name = is_numeric($name) ? $field['name'] : $name;