graphql-php v15 (#542)

* psr/container v2

* Implement replacement for Picotainer

* Replace Picotainer with LazyContainer in tests and documentation for version >=6

* Fix tests for phpdocumentor/type-resolver minor update

* run cs-fix script

* Fix some cs-fixer errors manually

* fix return type

* abandon psr/container ^1

* Test for LazyContainer

* Normalize RootTypeMapperInterface

* end-to-end test with enums in mutation and as single-returned field

* Bump ecodev/graphql-upload and webonyx/graphql-php"

* Fix some tests for webonyx ^15.0

* clearer types to fix tests

* clearer types to fix failing tests for webonyx 15

* clearer types to fix failing tests for webonyx 15

* fix failing tests for webonyx 15.
Make clearer types.

* fix failing tests for webonyx 15.
Make clearer types.

* fix some breaking changes for webonyx 15

* fix breaking changes for webonyx 15

* Update continuous_integration.yml

Remove support for PHP 8.0 test matrix

* Specify PHP 8.1 minimum support

Co-authored-by: Jacob Thomason <jacob@thomason.xxx>

Author: l-you

.github/workflows/continuous_integration.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         install-args: ['', '--prefer-lowest']
-        php-version: ['8.0', '8.1', '8.2']
+        php-version: ['8.1', '8.2']
       fail-fast: false
 
     steps:

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "ext-json": "*",
         "doctrine/annotations": "1.13.2",
         "composer/package-versions-deprecated": "^1.8",
@@ -26,12 +26,12 @@
         "symfony/expression-language": "^4 || ^5 || ^6",
         "thecodingmachine/cache-utils": "^1",
         "thecodingmachine/class-explorer": "^1.1.0",
-        "webonyx/graphql-php": "^v14.9.0"
+        "webonyx/graphql-php": "^v15.0"
     },
     "require-dev": {
         "beberlei/porpaginas": "^1.2",
         "doctrine/coding-standard": "^9.0 || ^10.0",
-        "ecodev/graphql-upload": "^6.1",
+        "ecodev/graphql-upload": "^7.0",
         "laminas/laminas-diactoros": "^2",
         "myclabs/php-enum": "^1.6.6",
         "php-coveralls/php-coveralls": "^2.1",

src/Exceptions/GraphQLAggregateException.php

@@ -64,6 +64,8 @@ private function updateCode(): void
      * If many exceptions are passed, they are bundled in the GraphQLAggregateException
      *
      * @param (ClientAware&Throwable)[] $exceptions
+     *
+     * @throws GraphQLAggregateException|Throwable
      */
     public static function throwExceptions(array $exceptions): void
     {

src/Exceptions/WebonyxErrorHandler.php

@@ -7,22 +7,26 @@
 use GraphQL\Error\ClientAware;
 use GraphQL\Error\Error;
 use GraphQL\Error\FormattedError;
+use GraphQL\Executor\ExecutionResult;
+use Throwable;
 
 use function array_map;
 
 /**
  * A custom error handler and error formatter for Webonyx that can read the GraphQLAggregateExceptionInterface
  * and the GraphQLExceptionInterface.
+ *
+ * @phpstan-import-type SerializableError from ExecutionResult
  */
 final class WebonyxErrorHandler
 {
-    /** @return mixed[] */
-    public static function errorFormatter(Error $error): array
+    /** @return SerializableError */
+    public static function errorFormatter(Throwable $error): array
     {
         $formattedError = FormattedError::createFromException($error);
         $previous = $error->getPrevious();
         if ($previous instanceof GraphQLExceptionInterface && ! empty($previous->getExtensions())) {
-            $formattedError['extensions'] += $previous->getExtensions();
+            $formattedError['extensions'] = isset($formattedError['extensions']) ? $previous->getExtensions() + $formattedError['extensions'] : $previous->getExtensions();
         }
 
         return $formattedError;

src/FieldsBuilder.php

@@ -6,6 +6,7 @@
 
 use Doctrine\Common\Annotations\AnnotationException;
 use GraphQL\Type\Definition\FieldDefinition;
+use GraphQL\Type\Definition\InputType;
 use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\OutputType;
 use GraphQL\Type\Definition\Type;
@@ -895,7 +896,7 @@ private function getInputFieldsByMethodAnnotations(string|object $controller, Re
             if (! in_array($name, $constructerParameters)) {
                 $inputFieldDescriptor->setTargetMethodOnSource($methodName);
             }
-
+            assert($type instanceof InputType);
             $inputFieldDescriptor->setType($type);
             $inputFieldDescriptor->setInjectSource($injectSource);
 
@@ -990,7 +991,7 @@ private function getInputFieldsByPropertyAnnotations(string|object $controller,
                 if (! $inputType && $isUpdate && $type instanceof NonNull) {
                     $type = $type->getWrappedType();
                 }
-
+                assert($type instanceof InputType);
                 $inputFieldDescriptor->setType($type);
                 $inputFieldDescriptor->setInjectSource(false);
                 $inputFieldDescriptor->setTargetPropertyOnSource($refProperty->getName());

src/InputField.php

@@ -5,11 +5,11 @@
 namespace TheCodingMachine\GraphQLite;
 
 use GraphQL\Error\ClientAware;
+use GraphQL\Language\AST\InputValueDefinitionNode;
 use GraphQL\Type\Definition\InputObjectField;
 use GraphQL\Type\Definition\InputType;
 use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\NonNull;
-use GraphQL\Type\Definition\NullableType;
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
 use TheCodingMachine\GraphQLite\Exceptions\GraphQLAggregateException;
@@ -19,11 +19,15 @@
 use TheCodingMachine\GraphQLite\Parameters\MissingArgumentException;
 use TheCodingMachine\GraphQLite\Parameters\ParameterInterface;
 use TheCodingMachine\GraphQLite\Parameters\SourceParameter;
+use Throwable;
 
 /**
  * A GraphQL input field that maps to a PHP method automatically.
  *
  * @internal
+ *
+ * @phpstan-import-type InputObjectFieldConfig from InputObjectField
+ * @phpstan-import-type ArgumentType from InputObjectField
  */
 class InputField extends InputObjectField
 {
@@ -33,14 +37,12 @@ class InputField extends InputObjectField
     private bool $forConstructorHydration = false;
 
     /**
-     * @param InputType|(NullableType&Type) $type
+     * @param (Type&InputType) $type
      * @param array<string, ParameterInterface> $arguments Indexed by argument name.
-     * @param ResolverInterface $originalResolver A pointer to the resolver being called (but not wrapped by any field middleware)
-     * @param callable $resolver The resolver actually called
      * @param mixed|null $defaultValue the default value set for this field
-     * @param array<string, mixed> $additionalConfig
+     * @param array{defaultValue?: mixed,description?: string|null,astNode?: InputValueDefinitionNode|null}|null $additionalConfig
      */
-    public function __construct(string $name, $type, array $arguments, ResolverInterface|null $originalResolver, callable|null $resolver, string|null $comment, bool $isUpdate, bool $hasDefaultValue, mixed $defaultValue, array $additionalConfig = [])
+    public function __construct(string $name, InputType $type, array $arguments, ResolverInterface|null $originalResolver, callable|null $resolver, string|null $comment, bool $isUpdate, bool $hasDefaultValue, mixed $defaultValue, array|null $additionalConfig = null)
     {
         $config = [
             'name' => $name,
@@ -77,8 +79,18 @@ public function __construct(string $name, $type, array $arguments, ResolverInter
                 return $result;
             };
         }
+        if ($additionalConfig !== null) {
+            if (isset($additionalConfig['astNode'])) {
+                $config['astNode'] = $additionalConfig['astNode'];
+            }
+            if (isset($additionalConfig['defaultValue'])) {
+                $config['defaultValue'] = $additionalConfig['defaultValue'];
+            }
+            if (isset($additionalConfig['description'])) {
+                $config['description'] = $additionalConfig['description'];
+            }
+        }
 
-        $config += $additionalConfig;
         parent::__construct($config);
     }
 
@@ -167,6 +179,7 @@ public static function fromFieldDescriptor(InputFieldDescriptor $fieldDescriptor
     private function paramsToArguments(array $parameters, object|null $source, array $args, mixed $context, ResolveInfo $info, callable $resolve): array
     {
         $toPassArgs = [];
+        /** @var (ClientAware&Throwable)[] $exceptions */
         $exceptions = [];
         foreach ($parameters as $parameter) {
             try {

src/InputFieldDescriptor.php

@@ -26,8 +26,8 @@
 class InputFieldDescriptor
 {
     private string $name;
-    /** @var InputType|(NullableType&Type) */
-    private $type;
+    /** @var (InputType&Type)|(InputType&Type&NullableType) */
+    private InputType $type;
     /** @var array<string, ParameterInterface> */
     private array $parameters = [];
     /** @var callable|null */
@@ -95,14 +95,14 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
-    /** @return InputType|(NullableType&Type) */
-    public function getType()
+    /** @return ((InputType&Type)|(InputType&Type&NullableType))  */
+    public function getType(): InputType
     {
         return $this->type;
     }
 
-    /** @param InputType|(NullableType&Type) $type */
-    public function setType($type): void
+    /** @param (InputType&Type)  $type */
+    public function setType(InputType $type): void
     {
         $this->type = $type;
     }

src/InputTypeUtils.php

@@ -4,6 +4,9 @@
 
 namespace TheCodingMachine\GraphQLite;
 
+use GraphQL\Type\Definition\Argument;
+use GraphQL\Type\Definition\InputObjectField;
+use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\InputType;
 use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\Type;
@@ -22,6 +25,11 @@
 use function assert;
 use function ltrim;
 
+/**
+ * @phpstan-import-type FieldConfig from InputObjectType
+ * @phpstan-import-type ArgumentConfig from Argument
+ * @phpstan-import-type InputObjectFieldConfig from InputObjectField
+ */
 class InputTypeUtils
 {
     public function __construct(
@@ -96,15 +104,15 @@ private function resolveSelf(Type $type, ReflectionClass $reflectionClass): Type
      *
      * @param ParameterInterface[] $args
      *
-     * @return array<string, array<string, mixed|InputType>>
+     * @return array{defaultValue?:mixed,type:\GraphQL\Type\Definition\Type&InputType}[]
      */
     public static function getInputTypeArgs(array $args): array
     {
         $inputTypeArgs = array_filter($args, static function (ParameterInterface $parameter) {
             return $parameter instanceof InputTypeParameterInterface;
         });
 
-        return array_map(static function (InputTypeParameterInterface $parameter) {
+        return array_map(static function (InputTypeParameterInterface $parameter): array {
             $desc = [
                 'type' => $parameter->getType(),
             ];

src/Mappers/PorpaginasTypeMapper.php

@@ -43,7 +43,7 @@ public function canMapClassToType(string $className): bool
      * Maps a PHP fully qualified class name to a GraphQL type.
      *
      * @param class-string<object> $className The exact class name to look for (this function does not look into parent classes).
-     * @param (OutputType&Type)|null $subType An optional sub-type if the main class is an iterator that needs to be typed.
+     * @param (OutputType&Type&NamedType)|null $subType An optional sub-type if the main class is an iterator that needs to be typed.
      *
      * @return MutableObjectType|MutableInterfaceType
      *
@@ -62,15 +62,16 @@ public function mapClassToType(string $className, OutputType|null $subType): Mut
     }
 
     /**
-     * @param OutputType&Type $subType
+     * @param OutputType&Type&NamedType $subType
      *
      * @return MutableObjectType|MutableInterfaceType
      */
     private function getObjectType(OutputType $subType): MutableInterface
     {
         /** @var mixed $name - invalid vendor mapping */
-        $name = $subType->name;
+        $name = $subType->name();
 
+        /** @noinspection PhpConditionAlreadyCheckedInspection */
         if ($name === null) {
             throw new RuntimeException('Cannot get name property from sub type ' . $subType::class);
         }

src/Mappers/Proxys/MutableAdapterTrait.php

@@ -99,7 +99,14 @@ public function getFields(): array
 
             $this->finalFields = $this->type->getFields();
             foreach ($this->fieldsCallables as $fieldsCallable) {
-                $this->finalFields = FieldDefinition::defineFieldMap($this, $fieldsCallable()) + $this->finalFields;
+                /**
+                 * @var FieldDefinition[] $fields
+                 */
+                $fields =  FieldDefinition::defineFieldMap($this, $fieldsCallable()) + $this->finalFields;
+
+
+
+                $this->finalFields = $fields;
             }
             if (empty($this->finalFields)) {
                 throw NoFieldsException::create($this->name);