GraphQL: Errors with nullish ManyToOne-Relation when using new ResolverFactory (for version 3.2) (#6092)

jotwea · josef.wagner · web-flow · commit 1bfa3c05a39c · 2024-04-03T15:43:38.000+02:00
* fix(graphql): null cases in ResolverFactory

* fix: make PropertyMetadataFactoryInterface nullable for backwards compatibility

* fix(graphql): pass propertyMetadataFactory from FieldsBuilder to ResolverFactory

* use getBuiltinTypes

---------

Co-authored-by: josef.wagner &lt;josef.wagner@hf-solutions.co&gt;
diff --git a/GraphQl/Resolver/Factory/DataCollectorResolverFactory.php b/GraphQl/Resolver/Factory/DataCollectorResolverFactory.php
@@ -15,6 +15,7 @@
 
 use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface;
 use ApiPlatform\Metadata\GraphQl\Operation;
+use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;
 use GraphQL\Type\Definition\ResolveInfo;
 use Symfony\Component\HttpFoundation\RequestStack;
 
@@ -24,7 +25,7 @@ public function __construct(private readonly ResolverFactoryInterface $resolverF
     {
     }
 
-    public function __invoke(?string $resourceClass = null, ?string $rootClass = null, ?Operation $operation = null): callable
+    public function __invoke(?string $resourceClass = null, ?string $rootClass = null, ?Operation $operation = null, ?PropertyMetadataFactoryInterface $propertyMetadataFactory = null): callable
     {
         return function (?array $source, array $args, $context, ResolveInfo $info) use ($resourceClass, $rootClass, $operation) {
             if ($this->requestStack && null !== $request = $this->requestStack->getCurrentRequest()) {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`use ApiPlatform\GraphQl\Resolver\Factory\ResolverFactoryInterface;`
`17`	`17`	`use ApiPlatform\Metadata\GraphQl\Operation;`
	`18`	`+use ApiPlatform\Metadata\Property\Factory\PropertyMetadataFactoryInterface;`
`18`	`19`	`use GraphQL\Type\Definition\ResolveInfo;`
`19`	`20`	`use Symfony\Component\HttpFoundation\RequestStack;`
`20`	`21`
`@@ -24,7 +25,7 @@ public function __construct(private readonly ResolverFactoryInterface $resolverF`
`24`	`25`	`{`
`25`	`26`	`}`
`26`	`27`
`27`		`- public function __invoke(?string $resourceClass = null, ?string $rootClass = null, ?Operation $operation = null): callable`
	`28`	`+ public function __invoke(?string $resourceClass = null, ?string $rootClass = null, ?Operation $operation = null, ?PropertyMetadataFactoryInterface $propertyMetadataFactory = null): callable`
`28`	`29`	`{`
`29`	`30`	`return function (?array $source, array $args, $context, ResolveInfo $info) use ($resourceClass, $rootClass, $operation) {`
`30`	`31`	`if ($this->requestStack && null !== $request = $this->requestStack->getCurrentRequest()) {`