Skip to content

Commit eef2f8d

Browse files
committed
Replace DiscriminatorMapMetadata::getDefaultType() and DiscriminatorMapMetadata::setDefaultType() to property
1 parent 036db50 commit eef2f8d

File tree

4 files changed

+13
-31
lines changed

4 files changed

+13
-31
lines changed

src/Mapping/Driver/ArrayConfigDriver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ class: $reflection,
159159
// @phpstan-ignore-next-line : Additional DbC invariant
160160
assert(\is_string($discriminatorConfig['otherwise']));
161161

162-
$discriminator->setDefaultType($this->createDiscriminatorType(
162+
$discriminator->default = $this->createDiscriminatorType(
163163
type: $discriminatorConfig['otherwise'],
164164
class: $reflection,
165165
types: $types,
166166
parser: $parser,
167-
));
167+
);
168168
}
169169

170170
// ---------------------------------------------------------------------

src/Mapping/Metadata/DiscriminatorMapMetadata.php

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ public function __construct(
2424
* @var array<non-empty-string, TypeMetadata>
2525
*/
2626
private array $map = [],
27-
private ?TypeMetadata $default = null,
27+
/**
28+
* Gets default mapping type for transformations that do not comply
29+
* with the specified mapping rules defined in {@see getMapping()}.
30+
*/
31+
public ?TypeMetadata $default = null,
2832
?int $createdAt = null,
2933
) {
3034
parent::__construct($createdAt);
@@ -75,27 +79,6 @@ public function getMapping(): array
7579
return $this->map;
7680
}
7781

78-
/**
79-
* Returns default mapping type for transformations that do not comply
80-
* with the specified mapping rules defined in {@see getMapping()}.
81-
*
82-
* @api
83-
*/
84-
public function getDefaultType(): ?TypeMetadata
85-
{
86-
return $this->default;
87-
}
88-
89-
/**
90-
* Updates default mapping type.
91-
*
92-
* @api
93-
*/
94-
public function setDefaultType(?TypeMetadata $type): void
95-
{
96-
$this->default = $type;
97-
}
98-
9982
/**
10083
* Dynamically creates AST discriminator representation.
10184
*

src/Type/ClassType/ClassTypeDenormalizer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ public function cast(mixed $value, Context $context): mixed
133133
private function castOverDiscriminator(DiscriminatorMapMetadata $map, array $value, Context $context): mixed
134134
{
135135
// Default mapping type
136-
$default = $map->getDefaultType()
137-
?->type;
136+
$default = $map->default?->type;
138137

139138
$field = $map->field;
140139

tests/Mapping/Metadata/DiscriminatorMapMetadataTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function testBasics(): void
1818
$m = new DiscriminatorMapMetadata('kind');
1919
self::assertSame('kind', $m->field);
2020
self::assertSame([], $m->getMapping());
21-
self::assertNull($m->getDefaultType());
21+
self::assertNull($m->default);
2222
self::assertFalse($m->hasType('x'));
2323
self::assertNull($m->findType('x'));
2424
}
@@ -44,10 +44,10 @@ public function testDefaultType(): void
4444
$tm = new TypeMetadata($type, $stmt);
4545

4646
$m = new DiscriminatorMapMetadata('kind');
47-
$m->setDefaultType($tm);
48-
self::assertSame($tm, $m->getDefaultType());
47+
$m->default = $tm;
48+
self::assertSame($tm, $m->default);
4949

50-
$m->setDefaultType(null);
51-
self::assertNull($m->getDefaultType());
50+
$m->default = null;
51+
self::assertNull($m->default);
5252
}
5353
}

0 commit comments

Comments
 (0)