Skip to content

Commit c865ade

Browse files
Merge branch '6.1' into 6.2
* 6.1: Update bootstrap_5_layout.html.twig [HttpClient] Fix seeking in not-yet-initialized requests [Serializer] Allow getting discriminated type by class name
2 parents 82d40ec + 1bbb048 commit c865ade

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Mapping/ClassDiscriminatorMapping.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function getClassForType(string $type): ?string
5050
public function getMappedObjectType(object|string $object): ?string
5151
{
5252
foreach ($this->typesMapping as $type => $typeClass) {
53-
if (is_a($object, $typeClass)) {
53+
if (is_a($object, $typeClass, true)) {
5454
return $type;
5555
}
5656
}

Tests/Mapping/ClassDiscriminatorMappingTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public function testMappedObjectType()
3939
'third' => AbstractDummyThirdChild::class,
4040
]);
4141

42+
$this->assertEquals('first', $mapping->getMappedObjectType(AbstractDummyFirstChild::class));
4243
$this->assertEquals('first', $mapping->getMappedObjectType(new AbstractDummyFirstChild()));
4344
$this->assertNull($mapping->getMappedObjectType(new AbstractDummySecondChild()));
4445
$this->assertSame('third', $mapping->getMappedObjectType(new AbstractDummyThirdChild()));

0 commit comments

Comments
 (0)