Ontheflyrepo for Document as well

Replicated the modifications from Entity

Author: abienvenu

Document/ClientManager.php

@@ -14,7 +14,6 @@
 namespace FOS\OAuthServerBundle\Document;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\DocumentRepository;
 use FOS\OAuthServerBundle\Model\ClientInterface;
 use FOS\OAuthServerBundle\Model\ClientManager as BaseClientManager;
 
@@ -25,24 +24,14 @@ class ClientManager extends BaseClientManager
      */
     protected $dm;
 
-    /**
-     * @var DocumentRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
     protected $class;
 
     public function __construct(DocumentManager $dm, $class)
     {
-        // NOTE: bug in Doctrine, hinting DocumentRepository|ObjectRepository when only DocumentRepository is expected
-        /** @var DocumentRepository $repository */
-        $repository = $dm->getRepository($class);
-
         $this->dm = $dm;
-        $this->repository = $repository;
         $this->class = $class;
     }
 
@@ -59,7 +48,7 @@ public function getClass()
      */
     public function findClientBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->dm->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**

Document/TokenManager.php

@@ -14,7 +14,6 @@
 namespace FOS\OAuthServerBundle\Document;
 
 use Doctrine\ODM\MongoDB\DocumentManager;
-use Doctrine\ODM\MongoDB\DocumentRepository;
 use FOS\OAuthServerBundle\Model\TokenInterface;
 use FOS\OAuthServerBundle\Model\TokenManager as BaseTokenManager;
 
@@ -25,24 +24,14 @@ class TokenManager extends BaseTokenManager
      */
     protected $dm;
 
-    /**
-     * @var DocumentRepository
-     */
-    protected $repository;
-
     /**
      * @var string
      */
     protected $class;
 
     public function __construct(DocumentManager $dm, $class)
     {
-        // NOTE: bug in Doctrine, hinting DocumentRepository|ObjectRepository when only DocumentRepository is expected
-        /** @var DocumentRepository $repository */
-        $repository = $dm->getRepository($class);
-
         $this->dm = $dm;
-        $this->repository = $repository;
         $this->class = $class;
     }
 
@@ -59,7 +48,7 @@ public function getClass()
      */
     public function findTokenBy(array $criteria)
     {
-        return $this->repository->findOneBy($criteria);
+        return $this->dm->getRepository($this->class)->findOneBy($criteria);
     }
 
     /**
@@ -86,7 +75,7 @@ public function deleteToken(TokenInterface $token)
     public function deleteExpired()
     {
         $result = $this
-            ->repository
+            ->dm->getRepository($this->class)
             ->createQueryBuilder()
             ->remove()
             ->field('expiresAt')->lt(time())

Tests/Document/ClientManagerTest.php

@@ -61,13 +61,6 @@ public function setUp()
         ;
         $this->className = 'RandomClassName'.\random_bytes(5);
 
-        $this->documentManager
-            ->expects($this->once())
-            ->method('getRepository')
-            ->with($this->className)
-            ->willReturn($this->repository)
-        ;
-
         $this->instance = new ClientManager($this->documentManager, $this->className);
 
         parent::setUp();
@@ -76,7 +69,6 @@ public function setUp()
     public function testConstructWillSetParameters()
     {
         $this->assertAttributeSame($this->documentManager, 'dm', $this->instance);
-        $this->assertAttributeSame($this->repository, 'repository', $this->instance);
         $this->assertAttributeSame($this->className, 'class', $this->instance);
     }
 
@@ -92,6 +84,13 @@ public function testFindClientBy()
             \random_bytes(5),
         ];
 
+        $this->documentManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $this->repository
             ->expects($this->once())
             ->method('findOneBy')

Tests/Document/TokenManagerTest.php

@@ -65,13 +65,6 @@ public function setUp()
             ->getMock()
         ;
 
-        $this->documentManager
-            ->expects($this->once())
-            ->method('getRepository')
-            ->with($this->className)
-            ->willReturn($this->repository)
-        ;
-
         $this->instance = new TokenManager($this->documentManager, $this->className);
     }
 
@@ -80,6 +73,13 @@ public function testFindTokenByToken()
         $randomToken = \random_bytes(5);
         $randomResult = \random_bytes(5);
 
+        $this->documentManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $this->repository
             ->expects($this->once())
             ->method('findOneBy')
@@ -145,6 +145,13 @@ public function testDeleteToken()
 
     public function testDeleteExpired()
     {
+        $this->documentManager
+            ->expects($this->once())
+            ->method('getRepository')
+            ->with($this->className)
+            ->willReturn($this->repository)
+        ;
+
         $queryBuilder = $this->getMockBuilder(Builder::class)
             ->disableOriginalConstructor()
             ->getMock()