Merge pull request #1555 from scyzoryck/cleanup-union-discriminators

Remove unused properties
schmittjoh · Aug 23, 2024 · 3c18cb8 · 3c18cb8
2 parents 9299b56 + 225f052
commit 3c18cb8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 25 deletions.
diff --git a/src/Metadata/Driver/AnnotationOrAttributeDriver.php b/src/Metadata/Driver/AnnotationOrAttributeDriver.php
@@ -260,7 +260,6 @@ public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadat
                     } elseif ($annot instanceof MaxDepth) {
                         $propertyMetadata->maxDepth = $annot->depth;
                     } elseif ($annot instanceof UnionDiscriminator) {
-                        $propertyMetadata->setUnionDiscriminator($annot->field, $annot->map);
                         $propertyMetadata->setType([
                             'name' => 'union',
                             'params' => [null, $annot->field, $annot->map],

diff --git a/src/Metadata/Driver/XmlDriver.php b/src/Metadata/Driver/XmlDriver.php
@@ -329,7 +329,6 @@ protected function loadMetadataFromFile(\ReflectionClass $class, string $path):
                             $map[(string) $entry->attributes()->key] = (string) $entry;
                         }
 
-                        $pMetadata->setUnionDiscriminator((string) $colConfig->attributes()->field, $map);
                         $pMetadata->setType([
                             'name' => 'union',
                             'params' => [null, (string) $colConfig->attributes()->field, $map],

diff --git a/src/Metadata/Driver/YamlDriver.php b/src/Metadata/Driver/YamlDriver.php
@@ -302,7 +302,6 @@ protected function loadMetadataFromFile(ReflectionClass $class, string $file): ?
                     }
 
                     if (isset($pConfig['union_discriminator'])) {
-                        $pMetadata->setUnionDiscriminator($pConfig['union_discriminator']['field'], $pConfig['union_discriminator']['map']);
                         $pMetadata->setType([
                             'name' => 'union',
                             'params' => [null, $pConfig['union_discriminator']['field'], $pConfig['union_discriminator']['map']],

diff --git a/src/Metadata/PropertyMetadata.php b/src/Metadata/PropertyMetadata.php
@@ -33,16 +33,6 @@ class PropertyMetadata extends BasePropertyMetadata
      */
     public $serializedName;
 
-    /**
-     * @var string|null
-     */
-    public $unionDiscriminatorField;
-
-    /**
-     * @var array<string, string>|null
-     */
-    public $unionDiscriminatorMap;
-
     /**
      * @var array|null
      */
@@ -206,12 +196,6 @@ public function setAccessor(string $type, ?string $getter = null, ?string $sette
         $this->setter = $setter;
     }
 
-    public function setUnionDiscriminator(string $field, array $map): void
-    {
-        $this->unionDiscriminatorField = $field;
-        $this->unionDiscriminatorMap = $map;
-    }
-
     public function setType(array $type): void
     {
         $this->type = $type;
@@ -240,8 +224,6 @@ protected function serializeToArray(): array
             $this->untilVersion,
             $this->groups,
             $this->serializedName,
-            $this->unionDiscriminatorField,
-            $this->unionDiscriminatorMap,
             $this->type,
             $this->xmlCollection,
             $this->xmlCollectionInline,
@@ -276,8 +258,6 @@ protected function unserializeFromArray(array $data): void
             $this->untilVersion,
             $this->groups,
             $this->serializedName,
-            $this->unionDiscriminatorField,
-            $this->unionDiscriminatorMap,
             $this->type,
             $this->xmlCollection,
             $this->xmlCollectionInline,

diff --git a/tests/Metadata/Driver/BaseDriverTestCase.php b/tests/Metadata/Driver/BaseDriverTestCase.php
@@ -148,8 +148,8 @@ public function testUnionDiscriminator()
 
         $p = $m->propertyMetadata['data'];
         assert($p instanceof PropertyMetadata);
-        self::assertEquals('objectType', $p->unionDiscriminatorField);
-        self::assertEquals(['author' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor', 'comment' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedComment'], $p->unionDiscriminatorMap);
+        self::assertEquals('objectType', $p->type['params'][1]);
+        self::assertEquals(['author' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor', 'comment' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedComment'], $p->type['params'][2]);
     }
 
     public function testVirtualProperty()