Repository for ClientManager and TokenManager is now instanciated on …

…the fly, not in the constructor anymore This avoids a database connection to be established for every request Fixes issue FriendsOfSymfony#422
abienvenu · Nov 18, 2016 · 4feaf76 · 4feaf76
1 parent 1b851d7
commit 4feaf76
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/Entity/ClientManager.php b/Entity/ClientManager.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\EntityRepository;
 use FOS\OAuthServerBundle\Model\ClientInterface;
 use FOS\OAuthServerBundle\Model\ClientManager as BaseClientManager;
 
@@ -24,11 +23,6 @@ class ClientManager extends BaseClientManager
      */
     protected $em;
 
-    /**
-     * @var EntityRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
@@ -37,7 +31,6 @@ class ClientManager extends BaseClientManager
     public function __construct(ObjectManager $em, $class)
     {
         $this->em = $em;
-        $this->repository = $em->getRepository($class);
         $this->class = $class;
     }
 
@@ -54,7 +47,7 @@ public function getClass()
      */
     public function findClientBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**

diff --git a/Entity/TokenManager.php b/Entity/TokenManager.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\EntityRepository;
 use FOS\OAuthServerBundle\Model\TokenInterface;
 use FOS\OAuthServerBundle\Model\TokenManager as BaseTokenManager;
 
@@ -24,11 +23,6 @@ class TokenManager extends BaseTokenManager
      */
     protected $em;
 
-    /**
-     * @var EntityRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
@@ -37,7 +31,6 @@ class TokenManager extends BaseTokenManager
     public function __construct(ObjectManager $em, $class)
     {
         $this->em = $em;
-        $this->repository = $em->getRepository($class);
         $this->class = $class;
     }
 
@@ -54,7 +47,7 @@ public function getClass()
      */
     public function findTokenBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->em->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**
@@ -80,7 +73,7 @@ public function deleteToken(TokenInterface $token)
      */
     public function deleteExpired()
     {
-        $qb = $this->repository->createQueryBuilder('t');
+        $qb = $this->em->getRepository($this->class)->createQueryBuilder('t');
         $qb
             ->delete()
             ->where('t.expiresAt < ?1')