Merge pull request #847 from mfn/mfn-interface-fix

Finalize "Fix 'TypeNotFound' when an interface defined after another type where it is used"

Author: mfn

CHANGELOG.md

@@ -132,6 +132,8 @@ CHANGELOG
 - Make it easier to extend select fields [\#799 / crissi](https://github.com/rebing/graphql-laravel/pull/799)
 - The `$args` argument, of the `handle` method of the execution middlewares requires `array` as type [\#843 / sforward](https://github.com/rebing/graphql-laravel/pull/843)
 
+### Fixed
+- Fix `TypeNotFound` when an interface defined after another type where it is used [\#828 / kasian-sergeev](https://github.com/rebing/graphql-laravel/pull/828)
 
 ### Removed
 - The method `\Rebing\GraphQL\GraphQLServiceProvider::provides` was removed [\#769 / mfn](https://github.com/rebing/graphql-laravel/pull/769)\

src/Support/Type.php

@@ -97,19 +97,15 @@ public function getFields(): array
     public function getAttributes(): array
     {
         $attributes = $this->attributes();
-        $interfaces = $this->interfaces();
 
-        $attributes = array_merge($this->attributes, [
+        return array_merge($this->attributes, [
             'fields' => function () {
                 return $this->getFields();
             },
+            'interfaces' => function () {
+                return $this->interfaces();
+            },
         ], $attributes);
-
-        if ($interfaces) {
-            $attributes['interfaces'] = $interfaces;
-        }
-
-        return $attributes;
     }
 
     /**

tests/Database/SelectFields/InterfaceTests/InterfaceTest.php

@@ -26,14 +26,17 @@ protected function getEnvironmentSetUp($app): void
         ]);
 
         $app['config']->set('graphql.types', [
+            CommentType::class,
             ExampleInterfaceType::class,
-            InterfaceImpl1Type::class,
             ExampleRelationType::class,
-            LikableInterfaceType::class,
+            InterfaceImpl1Type::class,
+            LikeType::class,
             PostType::class,
-            CommentType::class,
             UserType::class,
-            LikeType::class,
+            // Interface deliberately last to guaranteed lazy loading them
+            // works, otherwise tests without the fix in 9644b66faa8d37e7a1c36969470504614ab1c766
+            // won't work!
+            LikableInterfaceType::class,
         ]);
     }
 

tests/Unit/TypeTest.php

@@ -47,6 +47,19 @@ public function testGetAttributesFieldsClosure(): void
         $attributes['fields']();
     }
 
+    public function testGetAttributesInterfacesClosure(): void
+    {
+        $type = $this->getMockBuilder(ExampleType::class)
+            ->onlyMethods(['interfaces'])
+            ->getMock();
+
+        $type->expects(self::once())
+            ->method('interfaces');
+
+        $attributes = $type->getAttributes();
+        $attributes['interfaces']();
+    }
+
     public function testToArray(): void
     {
         $type = new ExampleType();