From fd82cbf120d9c6f24bd2ca54006f573d6f089097 Mon Sep 17 00:00:00 2001 From: Marcin Czarnecki Date: Mon, 19 Aug 2024 20:51:33 +0200 Subject: [PATCH] Remove unused properties --- .../Driver/AnnotationOrAttributeDriver.php | 1 - src/Metadata/Driver/DoctrineTypeDriver.php | 5 ----- src/Metadata/Driver/XmlDriver.php | 1 - src/Metadata/Driver/YamlDriver.php | 1 - src/Metadata/PropertyMetadata.php | 20 ------------------- tests/Metadata/Driver/BaseDriverTestCase.php | 4 ++-- 6 files changed, 2 insertions(+), 30 deletions(-) diff --git a/src/Metadata/Driver/AnnotationOrAttributeDriver.php b/src/Metadata/Driver/AnnotationOrAttributeDriver.php index 0a49d6868..d33fcd1b7 100644 --- 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/DoctrineTypeDriver.php b/src/Metadata/Driver/DoctrineTypeDriver.php index e51f8d5c4..93239b0be 100644 --- a/src/Metadata/Driver/DoctrineTypeDriver.php +++ b/src/Metadata/Driver/DoctrineTypeDriver.php @@ -4,7 +4,6 @@ namespace JMS\Serializer\Metadata\Driver; -use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\Persistence\Mapping\ClassMetadata as DoctrineClassMetadata; use JMS\Serializer\Metadata\ClassMetadata; use JMS\Serializer\Metadata\PropertyMetadata; @@ -15,10 +14,6 @@ */ class DoctrineTypeDriver extends AbstractDoctrineTypeDriver { - /** - * @param ClassMetadataInfo $doctrineMetadata - * @param ClassMetadata $classMetadata - */ protected function setDiscriminator(DoctrineClassMetadata $doctrineMetadata, ClassMetadata $classMetadata): void { if ( diff --git a/src/Metadata/Driver/XmlDriver.php b/src/Metadata/Driver/XmlDriver.php index 28848ba9d..d98f6c3ac 100644 --- 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 index 7641cc931..c90ea56a0 100644 --- 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 index ccd096a58..ff41c949f 100644 --- 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|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 index 5204d3388..12787eba2 100644 --- 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()