BREAKING upgrade to webonyx/graphql-php 15

`TypesInterface::get()` return type is stricter. And all breaking
changes from webonyx/graphql-php also applies.

Author: PowerKiKi

composer.json

@@ -39,7 +39,7 @@
         "php": "^8.2",
         "doctrine/orm": "^2.15",
         "psr/container": "^1.1 || ^2.0",
-        "webonyx/graphql-php": "^14.11"
+        "webonyx/graphql-php": "^15.7"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "@stable",

composer.lock

@@ -9,9 +9,11 @@ parameters:
     checkMissingIterableValueType: false
     checkGenericClassInNonGenericObjectType: false
     ignoreErrors:
-        - '~^Parameter #1 \$wrappedType of static method GraphQL\\Type\\Definition\\Type::~'
         - '~^Parameter #2 \$type of static method GraphQL\\Doctrine\\Utils::getOperatorTypeName~'
         - '~^Parameter #1 \$method of method GraphQL\\Doctrine\\Factory\\AbstractFieldsConfigurationFactory\:\:getMethodFullName\(\) expects ReflectionMethod, ReflectionFunctionAbstract given\.$~'
         - '~^Parameter #3 \$subject of function preg_replace expects array\|string, string\|null given\.$~'
         - '~^Parameter #2 \$type of method GraphQL\\Doctrine\\Factory\\AbstractFactory::adjustNamespace\(\) expects string, string\|null given\.$~'
         - '~^Parameter #1 \$driver of method Doctrine\\Persistence\\Mapping\\Driver\\MappingDriverChain\:\:setDefaultDriver\(\) expects Doctrine\\Persistence\\Mapping\\Driver\\MappingDriver, Doctrine\\Persistence\\Mapping\\Driver\\MappingDriver\|null given\.$~'
+        - '~^Parameter \#1 \$type of static method GraphQL\\Type\\Definition\\Type\:\:nonNull\(\) expects~'
+        - '~^Parameter \#1 \$config of class GraphQL\\Type\\Definition\\InputObjectType constructor expects~'
+        - '~^Parameter \#1 \$config of method GraphQL\\Type\\Definition\\InputObjectType\:\:__construct~'

phpstan.neon.dist

@@ -8,6 +8,7 @@
 use GraphQL\Doctrine\Attribute\Exclude;
 use GraphQL\Doctrine\Attribute\Reader\Reader;
 use GraphQL\Doctrine\Types;
+use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\Type;
 use ReflectionClass;
 use ReflectionProperty;
@@ -48,7 +49,7 @@ final protected function isPropertyExcluded(ReflectionProperty $property): bool
      *  - `MyType[]|null`
      *  - `Collection<MyType>`
      */
-    final protected function getTypeFromPhpDeclaration(ReflectionClass $class, null|string|Type $typeDeclaration, bool $isEntityId = false): ?Type
+    final protected function getTypeFromPhpDeclaration(ReflectionClass $class, null|string|Type $typeDeclaration, bool $isEntityId = false): null|Type
     {
         if ($typeDeclaration === null || $typeDeclaration instanceof Type) {
             return $typeDeclaration;
@@ -70,6 +71,7 @@ final protected function getTypeFromPhpDeclaration(ReflectionClass $class, null|
             $type = Type::nonNull($type);
         }
 
+        // @phpstan-ignore-next-line
         return $type;
     }
 
@@ -97,7 +99,7 @@ private function adjustNamespace(ReflectionClass $class, string $type): string
     /**
      * Returns a type from our registry.
      */
-    final protected function getTypeFromRegistry(string $type, bool $isEntityId): Type
+    final protected function getTypeFromRegistry(string $type, bool $isEntityId): NamedType
     {
         if ($this->types->isEntity($type) && $isEntityId) {
             // @phpstan-ignore-next-line

src/Factory/AbstractFactory.php

@@ -134,6 +134,7 @@ final protected function reflectionTypeToType(ReflectionNamedType $reflectionTyp
             $type = Type::nonNull($type);
         }
 
+        // @phpstan-ignore-next-line
         return $type;
     }
 
@@ -227,7 +228,7 @@ final protected function throwIfNotInputType(ReflectionParameter $param, Abstrac
         }
 
         if ($type instanceof WrappingType) {
-            $type = $type->getWrappedType(true);
+            $type = $type->getInnermostType();
         }
 
         if (!($type instanceof InputType)) {

src/Factory/AbstractFieldsConfigurationFactory.php

@@ -67,13 +67,13 @@ private function applyGroups(ClassMetadata $metadata, InputObjectType $type, arr
         $groups = $type->getField('groups')->getType();
 
         /** @var InputObjectType $unwrapped */
-        $unwrapped = $groups->getWrappedType(true);
+        $unwrapped = $groups->getInnermostType();
 
         /** @var ListOfType $conditions */
         $conditions = $unwrapped->getField('conditions')->getType();
 
         /** @var InputObjectType $typeFields */
-        $typeFields = $conditions->getWrappedType(true);
+        $typeFields = $conditions->getInnermostType();
         foreach ($filter['groups'] ?? [] as $group) {
             $this->applyJoinsAndFilters($metadata, $alias, $typeFields, $group['joins'] ?? [], $group['conditions'] ?? []);
             $this->applyCollectedDqlConditions($group);

src/Factory/FilteredQueryBuilderFactory.php

@@ -6,6 +6,7 @@
 
 use GraphQL\Doctrine\Exception;
 use GraphQL\Doctrine\Factory\AbstractFactory;
+use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\Type;
 use ReflectionClass;
 
@@ -20,7 +21,7 @@ abstract class AbstractTypeFactory extends AbstractFactory
      * @param class-string $className class name of Doctrine entity
      * @param string $typeName GraphQL type name
      */
-    abstract public function create(string $className, string $typeName): Type;
+    abstract public function create(string $className, string $typeName): NamedType;
 
     /**
      * Get the description of a class from the doc block.

src/Factory/Type/AbstractTypeFactory.php

@@ -18,10 +18,8 @@ final class EntityIDTypeFactory extends AbstractTypeFactory
      *
      * @param class-string $className class name of Doctrine entity
      * @param string $typeName GraphQL type name
-     *
-     * @return EntityIDType
      */
-    public function create(string $className, string $typeName): Type
+    public function create(string $className, string $typeName): EntityIDType
     {
         $identifiers = $this->entityManager->getClassMetadata($className)->getIdentifier();
         if (count($identifiers) > 1) {

src/Factory/Type/EntityIDTypeFactory.php

@@ -44,10 +44,8 @@ final class FilterGroupConditionTypeFactory extends AbstractTypeFactory
      *
      * @param class-string $className class name of Doctrine entity
      * @param string $typeName GraphQL type name
-     *
-     * @return InputObjectType
      */
-    public function create(string $className, string $typeName): Type
+    public function create(string $className, string $typeName): InputObjectType
     {
         $type = new InputObjectType([
             'name' => $typeName,
@@ -247,8 +245,14 @@ private function getOperators(string $fieldName, LeafType $leafType, bool $isAss
      */
     private function getFieldType(string $typeName, string $fieldName, array $operators): InputObjectType
     {
+        $fieldTypeName = $typeName . ucfirst($fieldName);
+        if ($this->types->has($fieldTypeName)) {
+            // @phpstan-ignore-next-line
+            return $this->types->get($fieldTypeName);
+        }
+
         $fieldType = new InputObjectType([
-            'name' => $typeName . ucfirst($fieldName),
+            'name' => $fieldTypeName,
             'description' => 'Type to specify a condition on a specific field',
             'fields' => $this->getOperatorConfiguration($operators),
         ]);

src/Factory/Type/FilterGroupConditionTypeFactory.php

@@ -19,10 +19,8 @@ final class FilterGroupJoinTypeFactory extends AbstractTypeFactory
      *
      * @param class-string $className class name of Doctrine entity
      * @param string $typeName GraphQL type name
-     *
-     * @return InputObjectType
      */
-    public function create(string $className, string $typeName): Type
+    public function create(string $className, string $typeName): InputObjectType
     {
         $type = new InputObjectType([
             'name' => $typeName,