Fix named types resolving

overblog · Dec 22, 2021 · 2c02009 · 2c02009
1 parent 7dcee7f
commit 2c02009
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Resolver/TypeResolver.php b/src/Resolver/TypeResolver.php
@@ -51,6 +51,9 @@ public function resolve($alias): ?Type
         if (!isset($this->cache[$alias])) {
             $type = $this->baseType($alias);
             $this->cache[$alias] = $type;
+            if (isset($type->name) && $type->name !== $alias) {
+                $this->cache[$type->name] = $type;
+            }
         }
 
         return $this->cache[$alias];

diff --git a/tests/Functional/MultipleSchema/MultipleSchemaTest.php b/tests/Functional/MultipleSchema/MultipleSchemaTest.php
@@ -4,6 +4,7 @@
 
 namespace Overblog\GraphQLBundle\Tests\Functional\MultipleSchema;
 
+use Overblog\GraphQLBundle\Resolver\UnresolvableException;
 use Overblog\GraphQLBundle\Tests\Functional\TestCase;
 
 final class MultipleSchemaTest extends TestCase
@@ -73,11 +74,13 @@ public function testInternalSchema(): void
         $this->assertGraphQL($query, $expectedData, null, [], 'internal');
     }
 
-    public function testUnknownTypeShouldReturnNull(): void
+    public function testUnknownTypeShouldThrowAnUnresolvableException(): void
     {
         // @phpstan-ignore-next-line
         $schema = $this->getContainer()->get('overblog_graphql.request_executor')->getSchema('public');
-        $this->assertNull($schema->getType('unknown'));
+        $this->expectException(UnresolvableException::class);
+        $this->expectExceptionMessage('Could not find type with alias "unknown". Did you forget to define it?');
+        $schema->getType('unknown');
     }
 
     private function assertSchemaQueryTypeName(string $typeName): void