Added function to 'lazyload' the repository

Entity/ClientManager.php

@@ -37,7 +37,6 @@ class ClientManager extends BaseClientManager
     public function __construct(ObjectManager $em, $class)
     {
         $this->em = $em;
-        $this->repository = $em->getRepository($class);
         $this->class = $class;
     }
 
@@ -54,7 +53,7 @@ public function getClass()
      */
     public function findClientBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->getRepository()->findOneBy($criteria);
     }
 
     /**
@@ -74,4 +73,16 @@ public function deleteClient(ClientInterface $client)
         $this->em->remove($client);
         $this->em->flush();
     }
+
+    /**
+     * @return EntityRepository
+     */
+    private function getRepository()
+    {
+        if(is_null($this->repository))
+        {
+            $this->repository = $this->em->getRepository($this->class);
+        }
+        return $this->repository;
+    }
 }

Entity/TokenManager.php

@@ -37,7 +37,6 @@ class TokenManager extends BaseTokenManager
     public function __construct(ObjectManager $em, $class)
     {
         $this->em = $em;
-        $this->repository = $em->getRepository($class);
         $this->class = $class;
     }
 
@@ -54,7 +53,7 @@ public function getClass()
      */
     public function findTokenBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->getRepository()->findOneBy($criteria);
     }
 
     /**
@@ -80,12 +79,24 @@ public function deleteToken(TokenInterface $token)
      */
     public function deleteExpired()
     {
-        $qb = $this->repository->createQueryBuilder('t');
+        $qb = $this->getRepository()->createQueryBuilder('t');
         $qb
             ->delete()
             ->where('t.expiresAt < ?1')
             ->setParameters(array(1 => time()));
 
         return $qb->getQuery()->execute();
     }
+
+    /**
+     * @return EntityRepository
+     */
+    private function getRepository()
+    {
+        if(is_null($this->repository))
+        {
+            $this->repository = $this->em->getRepository($this->class);
+        }
+        return $this->repository;
+    }
 }

Tests/Entity/ClientManagerTest.php

@@ -46,12 +46,6 @@ public function setUp()
         ;
         $this->className = 'RandomClassName'. \random_bytes(5);
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('getRepository')
-            ->with($this->className)
-            ->willReturn($this->repository)
-        ;
 
         $this->instance = new ClientManager($this->entityManager, $this->className);
 
@@ -61,7 +55,6 @@ public function setUp()
     public function testConstructWillSetParameters()
     {
         $this->assertAttributeSame($this->entityManager, 'em', $this->instance);
-        $this->assertAttributeSame($this->repository, 'repository', $this->instance);
         $this->assertAttributeSame($this->className, 'class', $this->instance);
     }
 
@@ -84,6 +77,14 @@ public function testFindClientBy()
             ->willReturn($randomResult)
         ;
 
+
+        $this->entityManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $this->assertSame($randomResult, $this->instance->findClientBy($criteria));
     }
 

Tests/Entity/TokenManagerTest.php

@@ -60,20 +60,12 @@ public function setUp()
             ->getMock()
         ;
 
-        $this->entityManager
-            ->expects($this->once())
-            ->method('getRepository')
-            ->with($this->className)
-            ->willReturn($this->repository)
-        ;
-
         $this->instance = new TokenManager($this->entityManager, $this->className);
     }
 
     public function testConstructWillSetParameters()
     {
         $this->assertAttributeSame($this->entityManager, 'em', $this->instance);
-        $this->assertAttributeSame($this->repository, 'repository', $this->instance);
         $this->assertAttributeSame($this->className, 'class', $this->instance);
     }
 
@@ -116,6 +108,14 @@ public function testFindTokenBy()
             ->willReturn($randomResult)
         ;
 
+
+        $this->entityManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $this->assertSame($randomResult, $this->instance->findTokenBy($criteria));
     }
 
@@ -223,6 +223,14 @@ public function testDeleteExpired()
             ->willReturn($randomResult)
         ;
 
+
+        $this->entityManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $this->assertSame($randomResult, $this->instance->deleteExpired());
     }
 }