Remove deprecated values from Enum

Author: ruudk

UPGRADE.md

@@ -8,6 +8,7 @@ UPGRADE FROM 0.14 to 1.0
 * Removed deprecated `argsBuilder` from `Field`
 * Removed deprecated `args` from `Field`
 * Removed deprecated `builders` from `Type`
+* Removed deprecated `values` from `Enum`
 
 UPGRADE FROM 0.13 to 0.14
 =========================

src/Annotation/Enum.php

@@ -22,23 +22,11 @@ final class Enum extends Annotation
      */
     public ?string $name;
 
-    /**
-     * @var array<\Overblog\GraphQLBundle\Annotation\EnumValue>
-     *
-     * @deprecated
-     */
-    public array $values;
-
     /**
      * @param string|null      $name   The GraphQL name of the enum
-     * @param array<EnumValue> $values An array of @GQL\EnumValue @deprecated
      */
-    public function __construct(?string $name = null, array $values = [])
+    public function __construct(?string $name = null)
     {
         $this->name = $name;
-        $this->values = $values;
-        if (!empty($values)) {
-            @trigger_error('The attributes "values" on annotation @GQL\Enum is deprecated as of 0.14 and will be removed in 1.0. Use the @GQL\EnumValue annotation on the class itself instead.', E_USER_DEPRECATED);
-        }
     }
 }

src/Config/Parser/MetadataParser/MetadataParser.php

@@ -431,7 +431,7 @@ private static function scalarMetadataToGQLConfiguration(ReflectionClass $reflec
     private static function enumMetadataToGQLConfiguration(ReflectionClass $reflectionClass, Metadata\Enum $enumMetadata): array
     {
         $metadatas = static::getMetadatas($reflectionClass);
-        $enumValues = array_merge(self::getMetadataMatching($metadatas, Metadata\EnumValue::class), $enumMetadata->values);
+        $enumValues = self::getMetadataMatching($metadatas, Metadata\EnumValue::class);
 
         $values = [];
 

tests/Config/Parser/AnnotationParserTest.php

@@ -50,15 +50,4 @@ public function testNoDoctrineAnnotations(): void
             $this->assertMatchesRegularExpression('/doctrine\/annotations/', $e->getPrevious()->getMessage());
         }
     }
-
-    public function testLegacyEnumNestedValue(): void
-    {
-        $this->config = self::cleanConfig($this->parser('parse', new SplFileInfo(__DIR__.'/fixtures/annotations/Deprecated/DeprecatedEnum.php'), $this->containerBuilder, ['doctrine' => ['types_mapping' => []]]));
-        $this->expect('DeprecatedEnum', 'enum', [
-            'values' => [
-                'P1' => ['value' => 1, 'description' => 'P1 description'],
-                'P2' => ['value' => 2, 'deprecationReason' => 'P2 deprecated'],
-            ],
-        ]);
-    }
 }