Fix merge
This commit is contained in:
parent
ad4b5fd653
commit
7d88be8978
@ -202,7 +202,7 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
|
||||
{
|
||||
try {
|
||||
return $this->entityManager ? $this->entityManager->getClassMetadata($class) : $this->classMetadataFactory->getMetadataFor($class);
|
||||
} catch (MappingException | OrmMappingException $exception) {
|
||||
} catch (MappingException | OrmMappingException | LegacyMappingException $exception) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -408,7 +408,7 @@ class DoctrineChoiceLoaderTest extends TestCase
|
||||
})
|
||||
;
|
||||
|
||||
$this->om = $this->createMock(ObjectManager::class);
|
||||
$this->om = $this->createMock(interface_exists(ObjectManager::class) ? ObjectManager::class : LegacyObjectManager::class);
|
||||
$this->om->expects($this->once())
|
||||
->method('getClassMetadata')
|
||||
->with(SingleIntIdEntity::class)
|
||||
|
Reference in New Issue
Block a user