Merge pull request #888 from ruudk/remove-addDefaultFallBackToTypeLoader

Remove `addDefaultFallBackToTypeLoader`
overblog · Dec 22, 2021 · ebdcfe0 · ebdcfe0
2 parents 18a0fa0 + 2c02009
commit ebdcfe0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/src/Definition/Type/ExtensibleSchema.php b/src/Definition/Type/ExtensibleSchema.php
@@ -4,19 +4,17 @@
 
 namespace Overblog\GraphQLBundle\Definition\Type;
 
-use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Schema;
 use GraphQL\Type\SchemaConfig;
 use Overblog\GraphQLBundle\Definition\Type\SchemaExtension\SchemaExtensionInterface;
-use Overblog\GraphQLBundle\Resolver\UnresolvableException;
 
 class ExtensibleSchema extends Schema
 {
     public function __construct($config)
     {
-        parent::__construct($this->addDefaultFallBackToTypeLoader(
+        parent::__construct(
             $config instanceof SchemaConfig ? $config : SchemaConfig::create($config)
-        ));
+        );
     }
 
     /** @var SchemaExtensionInterface[] */
@@ -53,28 +51,4 @@ public function processExtensions()
 
         return $this;
     }
-
-    private function addDefaultFallBackToTypeLoader(SchemaConfig $schemaConfig): SchemaConfig
-    {
-        $typeLoader = $schemaConfig->typeLoader;
-        $loaderWrapper = null;
-        $loaderWrapper = function ($name) use ($typeLoader, &$schemaConfig, &$loaderWrapper): ?Type {
-            $type = null;
-            try {
-                $type = $typeLoader($name);
-            } catch (UnresolvableException $e) {
-                // second chance for types with un-registered name in TypeResolver
-                // we disabled the custom typeLoader to force default loader usage
-                $schemaConfig->typeLoader = null;
-                $type = $this->getType($name);
-                $schemaConfig->typeLoader = $loaderWrapper; // @phpstan-ignore-line
-            }
-
-            return $type;
-        };
-
-        $schemaConfig->typeLoader = $loaderWrapper; // @phpstan-ignore-line
-
-        return $schemaConfig;
-    }
 }
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