Merge pull request #12 from jorrit/enumquerymethod

Add enum fields as scalar fields to query objects

Author: mghoneimy

src/SchemaGenerator/SchemaClassGenerator.php

@@ -99,6 +99,11 @@ private function appendQueryObjectFields(QueryObjectClassBuilder $queryObjectBui
 
             if ($typeKind === FieldTypeKindEnum::SCALAR) {
                 $queryObjectBuilder->addScalarField($name, $fieldArray['isDeprecated'], $fieldArray['deprecationReason']);
+            } elseif ($typeKind === FieldTypeKindEnum::ENUM_OBJECT) {
+                if (!array_key_exists($typeName, $this->generatedObjects)) {
+                    $this->generateEnumObject($typeName);
+                }
+                $queryObjectBuilder->addScalarField($name, $fieldArray['isDeprecated'], $fieldArray['deprecationReason']);
             } else {
 
                 // Generate nested type object if it wasn't generated

tests/QueryObjectClassBuilderTest.php

@@ -82,6 +82,7 @@ public function testAddMultipleSimpleSelectors()
         $objectName .= 'QueryObject';
         $classBuilder->addScalarField('first_name', false, null);
         $classBuilder->addScalarField('last_name', true, 'is deprecated');
+        $classBuilder->addScalarField('gender', false, null);
         $classBuilder->build();
 
         $this->assertFileEquals(

tests/SchemaClassGeneratorTest.php

@@ -414,7 +414,7 @@ public function testGenerateInputObjectWithNestedObjectValues()
     public function testGenerateArgumentsObjectWithScalarArgs()
     {
         $objectName = 'WithMultipleScalarArgs';
-        $argsArray  = [
+        $argsArray = [
             [
                 'name' => 'scalarProperty',
                 'description' => null,
@@ -468,7 +468,7 @@ public function testGenerateArgumentsObjectWithListArgs()
                 ]
             ]
         ])));
-        $argsArray  = [
+        $argsArray = [
             [
                 'name' => 'listProperty',
                 'description' => null,
@@ -542,7 +542,7 @@ public function testGenerateArgumentsObjectWithInputObjectArgs()
         ])));
 
         $objectName = 'WithMultipleInputObjectArgs';
-        $argsArray  = [
+        $argsArray = [
             [
                 'name' => 'objectProperty',
                 'description' => null,
@@ -581,7 +581,7 @@ public function testGenerateArgumentsObjectWithInputObjectArgs()
      */
     public function testGenerateQueryObjectWithScalarFields()
     {
-        $objectName  = 'MultipleSimpleSelectors';
+        $objectName = 'MultipleSimpleSelectors';
         // Add mock responses
         $this->mockHandler->append(new Response(200, [], json_encode([
             'data' => [
@@ -613,11 +613,45 @@ public function testGenerateQueryObjectWithScalarFields()
                                 'ofType' => null,
                             ],
                             'args' => null,
+                        ], [
+                            'name' => 'gender',
+                            'description' => null,
+                            'isDeprecated' => false,
+                            'deprecationReason' => null,
+                            'type' => [
+                                'name' => 'Gender',
+                                'kind' => FieldTypeKindEnum::ENUM_OBJECT,
+                                'description' => null,
+                                'ofType' => null,
+                            ],
+                            'args' => null,
                         ]
                     ]
                 ]
             ]
         ])));
+        $this->mockHandler->append(new Response(200, [], json_encode([
+            'data' => [
+                '__type' => [
+                    'name' => 'Gender',
+                    'kind' => FieldTypeKindEnum::ENUM_OBJECT,
+                    'enumValues' => [
+                        [
+                            "name" => 'UNKNOWN',
+                            'description' => null
+                        ],
+                        [
+                            'name' => 'FEMALE',
+                            'description' => null
+                        ],
+                        [
+                            'name' => 'MALE',
+                            'description' => null
+                        ],
+                    ],
+                ],
+            ],
+        ])));
         $this->classGenerator->generateQueryObject($objectName);
 
         $objectName .= 'QueryObject';
@@ -634,7 +668,7 @@ public function testGenerateQueryObjectWithScalarFields()
      */
     public function testGenerateQueryObjectWithObjectFields()
     {
-        $objectName  = 'MultipleObjectSelectors';
+        $objectName = 'MultipleObjectSelectors';
         // Add mock responses
         $this->mockHandler->append(new Response(200, [], json_encode([
             'data' => [
@@ -749,7 +783,8 @@ class TransparentSchemaClassGenerator extends SchemaClassGenerator
     public function __construct(
         Client $client,
         string $writeDir = ''
-    ) {
+    )
+    {
         parent::__construct($client, $writeDir, 'GraphQL\\Tests\\SchemaObject');
     }
 

tests/files_expected/query_objects/MultipleSimpleSelectorsQueryObject.php

@@ -24,4 +24,11 @@ public function selectLastName()
 
         return $this;
     }
+
+    public function selectGender()
+    {
+        $this->selectField("gender");
+    
+        return $this;
+    }
 }