prevent DB connections inside constructor code

Author: lsmith77

Changelog.md

@@ -8,6 +8,8 @@ Changelog
 * Add a timeout for the reset retry request.
 * Add Esperanto translations.
 * Fixed incorrect confirmation url.
+* [BC break] Use UserManager::getRepository() instead of UserManager::$repository
+* [BC break] Use UserManager::getClass() instead of UserManager::$class
 
 ### 2.0.0-beta2 (2017-01-31)
 

Doctrine/UserManager.php

@@ -28,12 +28,7 @@ class UserManager extends BaseUserManager
     /**
      * @var string
      */
-    protected $class;
-
-    /**
-     * @var ObjectRepository
-     */
-    protected $repository;
+    private $class;
 
     /**
      * Constructor.
@@ -48,10 +43,15 @@ public function __construct(PasswordUpdaterInterface $passwordUpdater, Canonical
         parent::__construct($passwordUpdater, $canonicalFieldsUpdater);
 
         $this->objectManager = $om;
-        $this->repository = $om->getRepository($class);
+        $this->class = $class;
+    }
 
-        $metadata = $om->getClassMetadata($class);
-        $this->class = $metadata->getName();
+    /**
+     * @return ObjectRepository
+     */
+    protected function getRepository()
+    {
+        return $this->objectManager->getRepository($this->getClass());
     }
 
     /**
@@ -68,6 +68,11 @@ public function deleteUser(UserInterface $user)
      */
     public function getClass()
     {
+        if (false !== strpos($this->class, ':')) {
+            $metadata = $this->objectManager->getClassMetadata($this->class);
+            $this->class = $metadata->getName();
+        }
+
         return $this->class;
     }
 
@@ -76,15 +81,15 @@ public function getClass()
      */
     public function findUserBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->getRepository()->findOneBy($criteria);
     }
 
     /**
      * {@inheritdoc}
      */
     public function findUsers()
     {
-        return $this->repository->findAll();
+        return $this->getRepository()->findAll();
     }
 
     /**

Resources/config/doctrine.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="fos_user.user_manager.default" class="FOS\UserBundle\Doctrine\UserManager" public="false" lazy="true">
+        <service id="fos_user.user_manager.default" class="FOS\UserBundle\Doctrine\UserManager" public="false">
             <argument type="service" id="fos_user.util.password_updater" />
             <argument type="service" id="fos_user.util.canonical_fields_updater" />
             <argument type="service" id="fos_user.object_manager" />