Properly encode enum values when used as arguments

Author: jorrit

src/SchemaGenerator/CodeGenerator/ArgumentsObjectClassBuilder.php

@@ -52,6 +52,17 @@ public function addListArgument(string $argumentName, string $typeName)
         $this->addListSetter($argumentName, $upperCamelCaseArg, $typeName);
     }
 
+    /**
+     * @param string $argumentName
+     * @param string $typeName
+     */
+    public function addInputEnumArgument(string $argumentName, string $typeName)
+    {
+        $upperCamelCaseArg = StringLiteralFormatter::formatUpperCamelCase($argumentName);
+        $this->addProperty($argumentName);
+        $this->addEnumSetter($argumentName, $upperCamelCaseArg, $typeName);
+    }
+
     /**
      * @param string $argumentName
      * @param string $typeName

src/SchemaGenerator/CodeGenerator/ObjectClassBuilder.php

@@ -57,6 +57,24 @@ protected function addListSetter(string $propertyName, string $upperCamelName, s
         $this->classFile->addMethod($method);
     }
 
+    /**
+     * @param string $propertyName
+     * @param string $upperCamelName
+     * @param string $objectClass
+     */
+    protected function addEnumSetter(string $propertyName, string $upperCamelName, string $objectClass)
+    {
+        $lowerCamelName = lcfirst(str_replace('_', '', $objectClass));
+        $method         = "public function set$upperCamelName($$lowerCamelName)
+{
+    \$this->$propertyName = new RawObject($$lowerCamelName);
+
+    return \$this;
+}";
+        $this->classFile->addMethod($method);
+        $this->classFile->addImport('GraphQL\\RawObject');
+    }
+
     /**
      * @param string $propertyName
      * @param string $upperCamelName

src/SchemaGenerator/SchemaClassGenerator.php

@@ -255,6 +255,8 @@ protected function generateArgumentsObject(string $argsObjectName, array $argume
                 } else {
                     if ($typeKind === FieldTypeKindEnum::SCALAR) {
                         $objectBuilder->addScalarArgument($name);
+                    } elseif ($typeKind === FieldTypeKindEnum::ENUM_OBJECT) {
+                        $objectBuilder->addInputEnumArgument($name, $typeName);
                     } else {
                         $objectBuilder->addInputObjectArgument($name, $typeName);
                     }

tests/SchemaClassGeneratorTest.php

@@ -446,6 +446,50 @@ public function testGenerateArgumentsObjectWithScalarArgs()
         );
     }
 
+    /**
+     * @covers \GraphQL\SchemaGenerator\SchemaClassGenerator::generateArgumentsObject
+     * @covers \GraphQL\SchemaGenerator\SchemaClassGenerator::generateObject
+     */
+    public function testGenerateArgumentsObjectWithEnumArg()
+    {
+        $objectName = 'WithMultipleEnumArg';
+        // Add mock responses
+        $this->mockHandler->append(new Response(200, [], json_encode([
+            'data' => [
+                '__type' => [
+                    'name' => 'Some',
+                    'kind' => FieldTypeKindEnum::ENUM_OBJECT,
+                    'enumValues' => [
+                        [
+                            'name' => 'some_value',
+                            'description' => null,
+                        ]
+                    ]
+                ]
+            ]
+        ])));
+        $argsArray  = [
+            [
+                'name' => 'enumProperty',
+                'description' => null,
+                'defaultValue' => null,
+                'type' => [
+                    'name' => 'Some',
+                    'kind' => FieldTypeKindEnum::ENUM_OBJECT,
+                    'description' => null,
+                    'ofType' => null,
+                ]
+            ]
+        ];
+        $this->classGenerator->generateArgumentsObject('WithMultipleEnumArg', $argsArray);
+
+        $objectName .= 'ArgumentsObject';
+        $this->assertFileEquals(
+            static::getExpectedFilesDir() . "/arguments_objects/$objectName.php",
+            static::getGeneratedFilesDir() . "/$objectName.php"
+        );
+    }
+
     /**
      * @covers \GraphQL\SchemaGenerator\SchemaClassGenerator::generateArgumentsObject
      * @covers \GraphQL\SchemaGenerator\SchemaClassGenerator::generateObject

tests/files_expected/arguments_objects/WithMultipleEnumArgArgumentsObject.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace GraphQL\Tests\SchemaObject;
+
+use GraphQL\SchemaObject\ArgumentsObject;
+use GraphQL\RawObject;
+
+class WithMultipleEnumArgArgumentsObject extends ArgumentsObject
+{
+    protected $enumProperty;
+
+    public function setEnumProperty($some)
+    {
+        $this->enumProperty = new RawObject($some);
+    
+        return $this;
+    }
+}