fix Enum not resolved in first level input arguments (thecodingmachine#561)

* fix enumtypemapper not handling enums passed as input via variables
due to a missing ltrim not being carried over from the myclabsenumtypemapper the FQCN of the enum most of the time had a leading backslash resulting it not being found in the cache or duplication once with and once without leading backslash
excluding of enums is not done on the NS getClassList method but reather later in the AbstractTypeMapper so EnumTypeMapper can actually find Enums (this whole implementation was previously working by accident)

* remove php8.1 conditions

Author: Lappihuan

src/Mappers/AbstractTypeMapper.php

@@ -30,6 +30,7 @@
 use TheCodingMachine\GraphQLite\Types\MutableObjectType;
 use TheCodingMachine\GraphQLite\Types\ResolvableMutableInputInterface;
 
+use UnitEnum;
 use function assert;
 
 /**
@@ -114,6 +115,10 @@ private function buildMap(): GlobTypeMapperCache
         $classes = $this->getClassList();
 
         foreach ($classes as $className => $refClass) {
+            // Enum's are not types
+            if ($refClass->isEnum()) {
+                continue;
+            }
             $annotationsCache = $this->mapClassToAnnotationsCache->get($refClass, function () use ($refClass, $className) {
                 $annotationsCache = new GlobAnnotationsCache();
 
@@ -186,6 +191,10 @@ private function buildMapClassToExtendTypeArray(): GlobExtendTypeMapperCache
 
         $classes = $this->getClassList();
         foreach ($classes as $refClass) {
+            // Enum's are not types
+            if ($refClass->isEnum()) {
+                continue;
+            }
             $annotationsCache = $this->mapClassToExtendAnnotationsCache->get($refClass, function () use ($refClass) {
                 $extendAnnotationsCache = new GlobExtendAnnotationsCache();
 

src/Mappers/Root/EnumTypeMapper.php

@@ -8,6 +8,7 @@
 use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\OutputType;
 use GraphQL\Type\Definition\Type as GraphQLType;
+use MyCLabs\Enum\Enum;
 use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\Types\Object_;
@@ -94,13 +95,14 @@ private function map(Type $type): EnumType|null
     /** @param class-string $enumClass */
     private function mapByClassName(string $enumClass): EnumType|null
     {
-        if (isset($this->cache[$enumClass])) {
-            return $this->cache[$enumClass];
-        }
-
         if (! enum_exists($enumClass)) {
             return null;
         }
+        /** @var class-string<Enum> $enumClass */
+        $enumClass = ltrim($enumClass, '\\');
+        if (isset($this->cache[$enumClass])) {
+            return $this->cache[$enumClass];
+        }
 
         // phpcs:disable SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable
         /** @var class-string<UnitEnum> $enumClass */
@@ -119,7 +121,7 @@ private function mapByClassName(string $enumClass): EnumType|null
 
         $type = new EnumType($enumClass, $typeName, $useValues);
 
-        return $this->cacheByName[$typeName] = $this->cache[$enumClass] = $type;
+        return $this->cacheByName[$type->name] = $this->cache[$enumClass] = $type;
     }
 
     private function getTypeName(ReflectionClass $reflectionClass): string
@@ -178,7 +180,6 @@ private function getNameToClassMapping(): array
                 return $nameToClassMapping;
             });
         }
-
         return $this->nameToClassMapping;
     }
 }

src/Utils/Namespaces/NS.php

@@ -61,13 +61,6 @@ public function getClassList(): array
                 }
 
                 $refClass = new ReflectionClass($className);
-                // Enum's are not classes
-                if (interface_exists(UnitEnum::class)) {
-                    // @phpstan-ignore-next-line - Remove this after minimum supported PHP version is >= 8.1
-                    if ($refClass->isEnum()) {
-                        continue;
-                    }
-                }
 
                 $this->classes[$className] = $refClass;
             }

tests/Integration/EndToEndTest.php

@@ -1175,7 +1175,62 @@ public function testEndToEndEnums3(): void
         $this->assertSame(['echoProductType' => 'NON_FOOD'], $this->getSuccessResult($result));
     }
 
-    /** @requires PHP >= 8.1 */
+    public function testEndToEndMutationNativeEnums(): void
+    {
+        $schema = $this->mainContainer->get(Schema::class);
+        assert($schema instanceof Schema);
+
+        $gql = '
+        mutation($size:Size!) {
+            singleEnum(size: $size)
+        }
+        ';
+        $result = GraphQL::executeQuery(
+            $schema,
+            $gql,
+            variableValues: [
+                'size' => Size::L->name,
+            ],
+        );
+
+        $this->assertSame([
+            'singleEnum' => 'L',
+        ], $this->getSuccessResult($result));
+    }
+
+    public function testEndToEndInputVars(): void
+    {
+        $schema = $this->mainContainer->get(Schema::class);
+        assert($schema instanceof Schema);
+
+        $queryString = '
+            mutation ($contact: ContactInput!) {
+                saveContact(contact: $contact) {
+                    name,
+                    birthDate
+                }
+            }
+        ';
+
+        $result = GraphQL::executeQuery(
+            $schema,
+            $queryString,
+            variableValues: [
+                'contact' => [
+                    'name' => "foo",
+                    'birthDate' => "1942-12-24T00:00:00+00:00"
+                ]
+            ]
+        );
+
+        $this->assertSame([
+            'saveContact' => [
+                'name' => 'foo',
+                'birthDate' => '1942-12-24T00:00:00+00:00'
+            ],
+        ], $this->getSuccessResult($result));
+    }
+
     public function testEndToEndNativeEnums(): void
     {
         $schema = $this->mainContainer->get(Schema::class);