Merge branch '5.0'

nicolas-grekas · nicolas-grekas · commit a8b6ba360941 · 2019-12-12T14:37:04.000+01:00
* 5.0:
  Add missing annotation
  Fix merge
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -51,7 +51,7 @@ public function __construct($registry, string $classOrAlias, string $property =
      */
     public function loadUserByUsername(string $username)
     {
-        $repository = $this->registry->getManager($this->managerName)->getRepository($this->classOrAlias);
+        $repository = $this->getRepository();
         if (null !== $this->property) {
             $user = $repository->findOneBy([$this->property => $username]);
         } else {
@@ -79,15 +79,15 @@ public function refreshUser(UserInterface $user)
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
-        $repository = $this->registry->getManager($this->managerName)->getRepository($this->classOrAlias);
+        $repository = $this->getRepository();
         if ($repository instanceof UserProviderInterface) {
             $refreshedUser = $repository->refreshUser($user);
         } else {
             // The user must be reloaded via the primary key as all other data
             // might have changed without proper persistence in the database.
             // That's the case when the user has been changed by a form with
             // validation errors.
-            if (!$id = $this->registry->getManager($this->managerName)->getClassMetadata($this->classOrAlias)->getIdentifierValues($user)) {
+            if (!$id = $this->getClassMetadata()->getIdentifierValues($user)) {
                 throw new \InvalidArgumentException('You cannot refresh a user from the EntityUserProvider that does not contain an identifier. The user object has to be serialized with its own identifier mapped by Doctrine.');
             }
 
@@ -118,24 +118,39 @@ public function upgradePassword(UserInterface $user, string $newEncodedPassword)
             throw new UnsupportedUserException(sprintf('Instances of "%s" are not supported.', \get_class($user)));
         }
 
-        $repository = $this->registry->getManager($this->managerName)->getRepository($this->classOrAlias);
+        $repository = $this->getRepository();
         if ($repository instanceof PasswordUpgraderInterface) {
             $repository->upgradePassword($user, $newEncodedPassword);
         }
     }
 
+    private function getObjectManager()
+    {
+        return $this->registry->getManager($this->managerName);
+    }
+
+    private function getRepository()
+    {
+        return $this->getObjectManager()->getRepository($this->classOrAlias);
+    }
+
     private function getClass(): string
     {
         if (null === $this->class) {
             $class = $this->classOrAlias;
 
             if (false !== strpos($class, ':')) {
-                $class = $this->registry->getManager($this->managerName)->getClassMetadata($this->classOrAlias)->getName();
+                $class = $this->getClassMetadata()->getName();
             }
 
             $this->class = $class;
         }
 
         return $this->class;
     }
+
+    private function getClassMetadata()
+    {
+        return $this->getObjectManager()->getClassMetadata($this->classOrAlias);
+    }
 }
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,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);
 
