Allow FieldDefinitions in ObjectBuilder::setFields() (#100)

simPod · Sep 14, 2021 · 70bde76 · 70bde76
1 parent 70b0aa3
commit 70bde76
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 18 deletions.
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -12,5 +12,9 @@
     <file>src</file>
     <file>tests</file>
 
-    <rule ref="Doctrine" />
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification" />
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification" />
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification" />
+    </rule>
 </ruleset>
diff --git a/src/Builder/EnumBuilder.php b/src/Builder/EnumBuilder.php
@@ -41,9 +41,6 @@ public function addValue(string $value, ?string $name = null, ?string $descripti
         return $this;
     }
 
-    /**
-     * @return mixed[]
-     */
     public function build(): array
     {
         $parameters           = parent::build();

diff --git a/src/Builder/FieldBuilder.php b/src/Builder/FieldBuilder.php
@@ -81,7 +81,7 @@ public function setDeprecationReason(string $reason): self
     }
 
     /**
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     public function build(): array
     {

diff --git a/src/Builder/InterfaceBuilder.php b/src/Builder/InterfaceBuilder.php
@@ -19,9 +19,6 @@ public function setResolveType(callable $resolveType): self
         return $this;
     }
 
-    /**
-     * @return mixed[]
-     */
     public function build(): array
     {
         $parameters                = parent::build();

diff --git a/src/Builder/ObjectBuilder.php b/src/Builder/ObjectBuilder.php
@@ -4,6 +4,7 @@
 
 namespace SimPod\GraphQLUtils\Builder;
 
+use GraphQL\Type\Definition\FieldDefinition;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\ResolveInfo;
 
@@ -12,7 +13,7 @@ class ObjectBuilder extends TypeBuilder
     /** @var InterfaceType[] */
     private array $interfaces = [];
 
-    /** @var callable|mixed[][] */
+    /** @var callable():array<FieldDefinition|array<string, mixed>>|array<FieldDefinition|array<string, mixed>> */
     private $fields = [];
 
     /** @var callable(mixed, array<mixed>, mixed, ResolveInfo) : mixed|null */
@@ -37,7 +38,7 @@ public function addInterface(InterfaceType $interfaceType): self
     }
 
     /**
-     * @param callable|mixed[][] $fields
+     * @param callable():array<FieldDefinition|array<string, mixed>>|array<FieldDefinition|array<string, mixed>> $fields
      *
      * @return static
      */
@@ -60,9 +61,6 @@ public function setFieldResolver(callable $fieldResolver): self
         return $this;
     }
 
-    /**
-     * @return mixed[]
-     */
     public function build(): array
     {
         $parameters                 = parent::build();

diff --git a/src/Builder/TypeBuilder.php b/src/Builder/TypeBuilder.php
@@ -36,7 +36,7 @@ public function setDescription(string $description): self
     }
 
     /**
-     * @return mixed[]
+     * @return array<string, mixed>
      */
     public function build(): array
     {

diff --git a/src/Builder/UnionBuilder.php b/src/Builder/UnionBuilder.php
@@ -49,9 +49,6 @@ public function setTypes(array $types): self
         return $this;
     }
 
-    /**
-     * @return mixed[]
-     */
     public function build(): array
     {
         $parameters                = parent::build();

diff --git a/tests/Builder/ObjectBuilderTest.php b/tests/Builder/ObjectBuilderTest.php
@@ -4,6 +4,7 @@
 
 namespace SimPod\GraphQLUtils\Tests\Builder;
 
+use GraphQL\Type\Definition\FieldDefinition;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\Type;
 use PHPUnit\Framework\TestCase;
@@ -35,6 +36,7 @@ public function __construct()
             ->setFields(
                 [
                     FieldBuilder::create('SomeField', Type::string())->build(),
+                    FieldDefinition::create(FieldBuilder::create('Another', Type::string())->build()),
                 ]
             )
             ->setFieldResolver($fieldResolver)
@@ -45,7 +47,7 @@ public function __construct()
         self::assertArrayHasKey('fields', $object);
         self::assertIsArray($object['fields']);
         self::assertSame($fieldResolver, $object['resolveField']);
-        self::assertCount(1, $object['fields']);
+        self::assertCount(2, $object['fields']);
     }
 
     public function testInvalidName(): void
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,7 @@ public function setDeprecationReason(string $reason): self @@
         }
         /**
-         * @return mixed[]
+         * @return array<string, mixed>
          */
         public function build(): array
         {
@@ Expand Down @@