Merge 362a77d into 8df55fd

webonyx · Oct 29, 2021 · 90217f8 · 90217f8
2 parents 8df55fd + 362a77d
commit 90217f8
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 #### Unreleased
 
+#### 14.11.0
+
+- Allow field definitions to be defined as any `iterable`, not just `array`
+
 #### 14.10.0
 
 Feat:

diff --git a/src/Type/Definition/FieldDefinition.php b/src/Type/Definition/FieldDefinition.php
@@ -12,6 +12,7 @@
 use GraphQL\Utils\Utils;
 use function is_array;
 use function is_callable;
+use function is_iterable;
 use function is_string;
 use function sprintf;
 
@@ -95,9 +96,9 @@ public static function defineFieldMap(Type $type, $fields) : array
         if (is_callable($fields)) {
             $fields = $fields();
         }
-        if (! is_array($fields)) {
+        if (! is_iterable($fields)) {
             throw new InvariantViolation(
-                sprintf('%s fields must be an array or a callable which returns such an array.', $type->name)
+                sprintf('%s fields must be an iterable or a callable which returns such an iterable.', $type->name)
             );
         }
         $map = [];

diff --git a/src/Type/Definition/InputObjectType.php b/src/Type/Definition/InputObjectType.php
@@ -11,6 +11,7 @@
 use function count;
 use function is_array;
 use function is_callable;
+use function is_iterable;
 use function is_string;
 use function sprintf;
 
@@ -80,9 +81,9 @@ protected function initializeFields() : void
             $fields = $fields();
         }
 
-        if (! is_array($fields)) {
+        if (! is_iterable($fields)) {
             throw new InvariantViolation(
-                sprintf('%s fields must be an array or a callable which returns such an array.', $this->name)
+                sprintf('%s fields must be an iterable or a callable which returns such an iterable.', $this->name)
             );
         }
 

diff --git a/tests/Type/DefinitionTest.php b/tests/Type/DefinitionTest.php
@@ -4,6 +4,7 @@
 
 namespace GraphQL\Tests\Type;
 
+use Generator;
 use GraphQL\Error\InvariantViolation;
 use GraphQL\Error\Warning;
 use GraphQL\Tests\PHPUnit\ArraySubsetAsserts;
@@ -15,9 +16,11 @@
 use GraphQL\Type\Definition\InputObjectField;
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\InterfaceType;
+use GraphQL\Type\Definition\IntType;
 use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
+use GraphQL\Type\Definition\StringType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
 use GraphQL\Type\Schema;
@@ -2082,4 +2085,27 @@ public function testThrowsWhenLazyLoadedFieldHasInvalidArgs() : void
 
         $objType->assertValid();
     }
+
+    public function testReturningFieldsUsingYield()
+    {
+        $type = new ObjectType([
+            'name'   => 'Query',
+            'fields' => static function () : Generator {
+                yield 'url'    => ['type' => Type::string()];
+                yield 'width'  => ['type' => Type::int()];
+            },
+        ]);
+
+        $blogSchema = new Schema(['query' => $type]);
+
+        self::assertSame($blogSchema->getQueryType(), $type);
+
+        $field = $type->getField('url');
+        self::assertSame($field->name, 'url');
+        self::assertInstanceOf(StringType::class, $field->getType());
+
+        $field = $type->getField('width');
+        self::assertSame($field->name, 'width');
+        self::assertInstanceOf(IntType::class, $field->getType());
+    }
 }