Skip to content

Commit fd82cbf

Browse files
author
Marcin Czarnecki
committed
Remove unused properties
1 parent b71da8c commit fd82cbf

File tree

6 files changed

+2
-30
lines changed

6 files changed

+2
-30
lines changed

src/Metadata/Driver/AnnotationOrAttributeDriver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadat
260260
} elseif ($annot instanceof MaxDepth) {
261261
$propertyMetadata->maxDepth = $annot->depth;
262262
} elseif ($annot instanceof UnionDiscriminator) {
263-
$propertyMetadata->setUnionDiscriminator($annot->field, $annot->map);
264263
$propertyMetadata->setType([
265264
'name' => 'union',
266265
'params' => [null, $annot->field, $annot->map],

src/Metadata/Driver/DoctrineTypeDriver.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace JMS\Serializer\Metadata\Driver;
66

7-
use Doctrine\ORM\Mapping\ClassMetadataInfo;
87
use Doctrine\Persistence\Mapping\ClassMetadata as DoctrineClassMetadata;
98
use JMS\Serializer\Metadata\ClassMetadata;
109
use JMS\Serializer\Metadata\PropertyMetadata;
@@ -15,10 +14,6 @@
1514
*/
1615
class DoctrineTypeDriver extends AbstractDoctrineTypeDriver
1716
{
18-
/**
19-
* @param ClassMetadataInfo $doctrineMetadata
20-
* @param ClassMetadata $classMetadata
21-
*/
2217
protected function setDiscriminator(DoctrineClassMetadata $doctrineMetadata, ClassMetadata $classMetadata): void
2318
{
2419
if (

src/Metadata/Driver/XmlDriver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ protected function loadMetadataFromFile(\ReflectionClass $class, string $path):
329329
$map[(string) $entry->attributes()->key] = (string) $entry;
330330
}
331331

332-
$pMetadata->setUnionDiscriminator((string) $colConfig->attributes()->field, $map);
333332
$pMetadata->setType([
334333
'name' => 'union',
335334
'params' => [null, (string) $colConfig->attributes()->field, $map],

src/Metadata/Driver/YamlDriver.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,6 @@ protected function loadMetadataFromFile(ReflectionClass $class, string $file): ?
302302
}
303303

304304
if (isset($pConfig['union_discriminator'])) {
305-
$pMetadata->setUnionDiscriminator($pConfig['union_discriminator']['field'], $pConfig['union_discriminator']['map']);
306305
$pMetadata->setType([
307306
'name' => 'union',
308307
'params' => [null, $pConfig['union_discriminator']['field'], $pConfig['union_discriminator']['map']],

src/Metadata/PropertyMetadata.php

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ class PropertyMetadata extends BasePropertyMetadata
3333
*/
3434
public $serializedName;
3535

36-
/**
37-
* @var string|null
38-
*/
39-
public $unionDiscriminatorField;
40-
41-
/**
42-
* @var array<string, string>|null
43-
*/
44-
public $unionDiscriminatorMap;
45-
4636
/**
4737
* @var array|null
4838
*/
@@ -206,12 +196,6 @@ public function setAccessor(string $type, ?string $getter = null, ?string $sette
206196
$this->setter = $setter;
207197
}
208198

209-
public function setUnionDiscriminator(string $field, array $map): void
210-
{
211-
$this->unionDiscriminatorField = $field;
212-
$this->unionDiscriminatorMap = $map;
213-
}
214-
215199
public function setType(array $type): void
216200
{
217201
$this->type = $type;
@@ -240,8 +224,6 @@ protected function serializeToArray(): array
240224
$this->untilVersion,
241225
$this->groups,
242226
$this->serializedName,
243-
$this->unionDiscriminatorField,
244-
$this->unionDiscriminatorMap,
245227
$this->type,
246228
$this->xmlCollection,
247229
$this->xmlCollectionInline,
@@ -276,8 +258,6 @@ protected function unserializeFromArray(array $data): void
276258
$this->untilVersion,
277259
$this->groups,
278260
$this->serializedName,
279-
$this->unionDiscriminatorField,
280-
$this->unionDiscriminatorMap,
281261
$this->type,
282262
$this->xmlCollection,
283263
$this->xmlCollectionInline,

tests/Metadata/Driver/BaseDriverTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ public function testUnionDiscriminator()
148148

149149
$p = $m->propertyMetadata['data'];
150150
assert($p instanceof PropertyMetadata);
151-
self::assertEquals('objectType', $p->unionDiscriminatorField);
152-
self::assertEquals(['author' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor', 'comment' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedComment'], $p->unionDiscriminatorMap);
151+
self::assertEquals('objectType', $p->type['params'][1]);
152+
self::assertEquals(['author' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedAuthor', 'comment' => 'JMS\Serializer\Tests\Fixtures\DiscriminatedComment'], $p->type['params'][2]);
153153
}
154154

155155
public function testVirtualProperty()

0 commit comments

Comments
 (0)