fix(graphql): name and key should be the same for an enum without Enum suffix in class name (#5369)

alanpoulain · web-flow · commit f7c70b17d195 · 2023-01-25T18:04:16.000+01:00
diff --git a/src/GraphQl/Type/TypeBuilder.php b/src/GraphQl/Type/TypeBuilder.php
@@ -240,13 +240,12 @@ public function getPaginatedCollectionType(GraphQLType $resourceType, Operation
     public function getEnumType(Operation $operation): GraphQLType
     {
         $enumName = $operation->getShortName();
-        $enumKey = $enumName;
         if (!str_ends_with($enumName, 'Enum')) {
-            $enumKey = sprintf('%sEnum', $enumName);
+            $enumName = sprintf('%sEnum', $enumName);
         }
 
-        if ($this->typesContainer->has($enumKey)) {
-            return $this->typesContainer->get($enumKey);
+        if ($this->typesContainer->has($enumName)) {
+            return $this->typesContainer->get($enumName);
         }
 
         /** @var FieldsBuilderEnumInterface|FieldsBuilderInterface $fieldsBuilder */
@@ -268,7 +267,7 @@ public function getEnumType(Operation $operation): GraphQLType
         }
 
         $enumType = new EnumType($enumConfig);
-        $this->typesContainer->set($enumKey, $enumType);
+        $this->typesContainer->set($enumName, $enumType);
 
         return $enumType;
     }
diff --git a/tests/GraphQl/Type/TypeBuilderTest.php b/tests/GraphQl/Type/TypeBuilderTest.php
@@ -590,7 +590,7 @@ public function testGetEnumType(): void
         $this->fieldsBuilderLocatorProphecy->get('api_platform.graphql.fields_builder')->willReturn($fieldsBuilderProphecy->reveal());
 
         self::assertEquals(new EnumType([
-            'name' => $enumName,
+            'name' => 'GamePlayModeEnum',
             'description' => $enumDescription,
             'values' => $enumValues,
         ]), $this->typeBuilder->getEnumType($operation));

Original file line number	Diff line number	Diff line change
`@@ -240,13 +240,12 @@ public function getPaginatedCollectionType(GraphQLType $resourceType, Operation`
`240`	`240`	`public function getEnumType(Operation $operation): GraphQLType`
`241`	`241`	`{`
`242`	`242`	`$enumName = $operation->getShortName();`
`243`		`- $enumKey = $enumName;`
`244`	`243`	`if (!str_ends_with($enumName, 'Enum')) {`
`245`		`- $enumKey = sprintf('%sEnum', $enumName);`
	`244`	`+ $enumName = sprintf('%sEnum', $enumName);`
`246`	`245`	`}`
`247`	`246`
`248`		`- if ($this->typesContainer->has($enumKey)) {`
`249`		`- return $this->typesContainer->get($enumKey);`
	`247`	`+ if ($this->typesContainer->has($enumName)) {`
	`248`	`+ return $this->typesContainer->get($enumName);`
`250`	`249`	`}`
`251`	`250`
`252`	`251`	`/** @var FieldsBuilderEnumInterface\|FieldsBuilderInterface $fieldsBuilder */`
`@@ -268,7 +267,7 @@ public function getEnumType(Operation $operation): GraphQLType`
`268`	`267`	`}`
`269`	`268`
`270`	`269`	`$enumType = new EnumType($enumConfig);`
`271`		`- $this->typesContainer->set($enumKey, $enumType);`
	`270`	`+ $this->typesContainer->set($enumName, $enumType);`
`272`	`271`
`273`	`272`	`return $enumType;`
`274`	`273`	`}`