Skip to content

Commit a57e849

Browse files
Fix merge
1 parent e412497 commit a57e849

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

PropertyInfo/DoctrineExtractor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ private function getMetadata(string $class): ?ClassMetadata
202202
{
203203
try {
204204
return $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class);
205-
} catch (MappingException | OrmMappingException $exception) {
205+
} catch (MappingException | OrmMappingException | LegacyMappingException $exception) {
206206
return null;
207207
}
208208
}

Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ public function testLoaderWithoutIdReaderCanBeOptimized()
408408
})
409409
;
410410

411-
$this->om = $this->createMock(ObjectManager::class);
411+
$this->om = $this->createMock(interface_exists(ObjectManager::class) ? ObjectManager::class : LegacyObjectManager::class);
412412
$this->om->expects($this->once())
413413
->method('getClassMetadata')
414414
->with(SingleIntIdEntity::class)

0 commit comments

Comments
 (0)