Skip to content

Commit 5d67867

Browse files
committed
Replace ClassMetadata::getName() accessor to property
1 parent a9892a8 commit 5d67867

File tree

6 files changed

+20
-26
lines changed

6 files changed

+20
-26
lines changed

src/Mapping/Driver/DocBlockDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected function load(
132132
$type = $types->getTypeByStatement($statement, $reflection);
133133
} catch (TypeNotFoundException $e) {
134134
throw PropertyTypeNotFoundException::becauseTypeOfPropertyNotDefined(
135-
class: $class->getName(),
135+
class: $class->name,
136136
property: $metadata->getName(),
137137
type: $e->getType(),
138138
previous: $e,

src/Mapping/Metadata/ClassMetadata.php

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class ClassMetadata extends Metadata
3030
*
3131
* If {@see null}, then the system setting should be used.
3232
*/
33-
private ?bool $normalizeAsArray = null;
33+
private ?bool $isNormalizeAsArray = null;
3434

3535
/**
3636
* Contains a {@see DiscriminatorMapMetadata} instance in case of class-like
@@ -39,11 +39,15 @@ final class ClassMetadata extends Metadata
3939
private ?DiscriminatorMapMetadata $discriminator;
4040

4141
/**
42-
* @param class-string<T> $name
4342
* @param iterable<array-key, PropertyMetadata> $properties
4443
*/
4544
public function __construct(
46-
private readonly string $name,
45+
/**
46+
* Gets full qualified class name.
47+
*
48+
* @var class-string<T>
49+
*/
50+
public readonly string $name,
4751
iterable $properties = [],
4852
?DiscriminatorMapMetadata $discriminator = null,
4953
?int $createdAt = null,
@@ -67,7 +71,7 @@ public function __construct(
6771
public function getTypeStatement(Context $context): TypeStatement
6872
{
6973
if (!$context->isDetailedTypes()) {
70-
return new NamedTypeNode($this->getName());
74+
return new NamedTypeNode($this->name);
7175
}
7276

7377
$fields = [];
@@ -83,20 +87,10 @@ public function getTypeStatement(Context $context): TypeStatement
8387
}
8488

8589
if ($fields === []) {
86-
return new NamedTypeNode($this->getName());
90+
return new NamedTypeNode($this->name);
8791
}
8892

89-
return new NamedTypeNode($this->getName(), fields: new FieldsListNode($fields));
90-
}
91-
92-
/**
93-
* Returns full qualified class name.
94-
*
95-
* @return class-string<T>
96-
*/
97-
public function getName(): string
98-
{
99-
return $this->name;
93+
return new NamedTypeNode($this->name, fields: new FieldsListNode($fields));
10094
}
10195

10296
/**
@@ -115,7 +109,7 @@ public function getName(): string
115109
*/
116110
public function isNormalizeAsArray(): ?bool
117111
{
118-
return $this->normalizeAsArray;
112+
return $this->isNormalizeAsArray;
119113
}
120114

121115
/**
@@ -125,7 +119,7 @@ public function isNormalizeAsArray(): ?bool
125119
*/
126120
public function shouldNormalizeAsArray(?bool $enabled = null): void
127121
{
128-
$this->normalizeAsArray = $enabled;
122+
$this->isNormalizeAsArray = $enabled;
129123
}
130124

131125
/**

src/Type/ClassType/ClassInstantiator/ReflectionClassInstantiator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class ReflectionClassInstantiator implements ClassInstantiatorInterface
1212
{
1313
public function instantiate(ClassMetadata $class, Context $context): object
1414
{
15-
$reflection = new \ReflectionClass($class->getName());
15+
$reflection = new \ReflectionClass($class->name);
1616

1717
if (!$reflection->isInstantiable()) {
1818
throw NonInstantiatableObjectException::createFromContext(

src/Type/ClassType/ClassTypeDenormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function cast(mixed $value, Context $context): mixed
113113
return $this->castOverDiscriminator($discriminator, $value, $context);
114114
}
115115

116-
$entrance = $context->enter($value, new ObjectEntry($this->metadata->getName()));
116+
$entrance = $context->enter($value, new ObjectEntry($this->metadata->name));
117117

118118
$instance = $this->instantiator->instantiate($this->metadata, $context);
119119

src/Type/ClassType/ClassTypeNormalizer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(
2929

3030
public function match(mixed $value, Context $context): bool
3131
{
32-
$class = $this->metadata->getName();
32+
$class = $this->metadata->name;
3333

3434
return $value instanceof $class;
3535
}
@@ -41,7 +41,7 @@ public function match(mixed $value, Context $context): bool
4141
*/
4242
public function cast(mixed $value, Context $context): object|array
4343
{
44-
$className = $this->metadata->getName();
44+
$className = $this->metadata->name;
4545

4646
if (!$value instanceof $className) {
4747
throw InvalidValueOfTypeException::createFromContext(
@@ -58,7 +58,7 @@ public function cast(mixed $value, Context $context): object|array
5858
->cast($value, $context);
5959
}
6060

61-
$entrance = $context->enter($value, new ObjectEntry($this->metadata->getName()));
61+
$entrance = $context->enter($value, new ObjectEntry($this->metadata->name));
6262

6363
$result = $this->normalizeObject($value, $entrance);
6464

tests/Mapping/Metadata/ClassMetadataTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function testConstructorInitializesPropertiesDiscriminatorAndTimestamp():
2020

2121
$m = new ClassMetadata(\stdClass::class, [$propA, $propB], $disc, 777);
2222

23-
self::assertSame(\stdClass::class, $m->getName());
23+
self::assertSame(\stdClass::class, $m->name);
2424
self::assertTrue($m->hasProperty('a'));
2525
self::assertTrue($m->hasProperty('b'));
2626
self::assertSame($propA, $m->findProperty('a'));
@@ -33,7 +33,7 @@ public function testConstructorInitializesPropertiesDiscriminatorAndTimestamp():
3333
public function testNameGetter(): void
3434
{
3535
$m = new ClassMetadata(\stdClass::class);
36-
self::assertSame(\stdClass::class, $m->getName());
36+
self::assertSame(\stdClass::class, $m->name);
3737
}
3838

3939
public function testNormalizeAsArrayFlag(): void

0 commit comments

Comments
 (0)