Merge branch '4.3' into 4.4

* 4.3:
  Add missing annotation
This commit is contained in:
Nicolas Grekas 2019-12-12 14:35:14 +01:00
commit 12f46ba538
2 changed files with 4 additions and 2 deletions

View File

@ -79,7 +79,7 @@ class DoctrineTestHelper
$symfonyFileLocator = class_exists(SymfonyFileLocator::class) ? SymfonyFileLocator::class : LegacySymfonyFileLocator::class;
$driverChain = class_exists(MappingDriverChain::class) ? MappingDriverChain::class : LegacyMappingDriverChain::class;
$driverChain = new MappingDriverChain();
$driverChain = new $driverChain();
$driverChain->addDriver(
new XmlDriver(
new $symfonyFileLocator(

View File

@ -29,8 +29,10 @@ final class TestRepositoryFactory implements RepositoryFactory
/**
* {@inheritdoc}
*
* @return ObjectRepository|LegacyObjectRepository
*/
public function getRepository(EntityManagerInterface $entityManager, $entityName): ObjectRepository
public function getRepository(EntityManagerInterface $entityManager, $entityName)
{
$repositoryHash = $this->getRepositoryHash($entityManager, $entityName);