Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 80d15cdcf9d0 · 2019-12-12T14:34:31.000+01:00
* 3.4:
  Add missing annotation
diff --git a/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Test/DoctrineTestHelper.php
@@ -79,7 +79,7 @@ public static function createTestConfigurationWithXmlLoader()
         $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(
diff --git a/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php b/src/Symfony/Bridge/Doctrine/Test/TestRepositoryFactory.php
@@ -29,6 +29,8 @@ final class TestRepositoryFactory implements RepositoryFactory
 
     /**
      * {@inheritdoc}
+     *
+     * @return ObjectRepository|LegacyObjectRepository
      */
     public function getRepository(EntityManagerInterface $entityManager, $entityName)
     {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ final class TestRepositoryFactory implements RepositoryFactory`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* {@inheritdoc}`
	`32`	`+ *`
	`33`	`+ * @return ObjectRepository\|LegacyObjectRepository`
`32`	`34`	`*/`
`33`	`35`	`public function getRepository(EntityManagerInterface $entityManager, $entityName)`
`34`	`36`	`{`