Skip to content

Commit 50c738c

Browse files
jotweajosef.wagner
and
josef.wagner
authored
fix(graphql): check inheritance in ResolverProvider (#6314)
* fix(graphql): check inheritance in ResolverProvider * fix(graphql): add unit test for interitance case --------- Co-authored-by: josef.wagner <[email protected]>
1 parent a59fbee commit 50c738c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

src/GraphQl/State/Provider/ResolverProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ private function getResourceClass(?object $item, ?string $resourceClass, string
6969
return $itemClass;
7070
}
7171

72-
if ($resourceClass !== $itemClass) {
72+
if ($resourceClass !== $itemClass && !$item instanceof $resourceClass) {
7373
throw new \UnexpectedValueException(sprintf($errorMessage, (new \ReflectionClass($resourceClass))->getShortName(), (new \ReflectionClass($itemClass))->getShortName()));
7474
}
7575

src/GraphQl/Tests/State/Provider/ResolverProviderTest.php

+17
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
use ApiPlatform\GraphQl\Resolver\QueryItemResolverInterface;
1717
use ApiPlatform\GraphQl\State\Provider\ResolverProvider;
18+
use ApiPlatform\GraphQl\Tests\Fixtures\ApiResource\ChildFoo;
19+
use ApiPlatform\GraphQl\Tests\Fixtures\ApiResource\ParentFoo;
20+
use ApiPlatform\Metadata\GraphQl\Query;
1821
use ApiPlatform\Metadata\GraphQl\QueryCollection;
1922
use ApiPlatform\State\ProviderInterface;
2023
use PHPUnit\Framework\TestCase;
@@ -35,4 +38,18 @@ public function testProvide(): void
3538
$provider = new ResolverProvider($decorated, $resolverLocator);
3639
$this->assertEquals($res, $provider->provide($operation, [], $context));
3740
}
41+
42+
public function testProvideInheritedClass(): void
43+
{
44+
$res = new ChildFoo();
45+
$operation = new Query(class: ParentFoo::class, resolver: 'foo');
46+
$context = [];
47+
$decorated = $this->createMock(ProviderInterface::class);
48+
$resolverMock = $this->createMock(QueryItemResolverInterface::class);
49+
$resolverMock->expects($this->once())->method('__invoke')->willReturn($res);
50+
$resolverLocator = $this->createMock(ContainerInterface::class);
51+
$resolverLocator->expects($this->once())->method('get')->with('foo')->willReturn($resolverMock);
52+
$provider = new ResolverProvider($decorated, $resolverLocator);
53+
$this->assertEquals($res, $provider->provide($operation, [], $context));
54+
}
3855
}

0 commit comments

Comments
 (0)