Merge pull request #421 from VincentLanglet/fixProxyResolution

Rely on object manager proxy resolution
doctrine · Jan 7, 2023 · c27821d · c27821d
2 parents d52cc6d + 8baf580
commit c27821d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/lib/Doctrine/Common/DataFixtures/ReferenceRepository.php b/lib/Doctrine/Common/DataFixtures/ReferenceRepository.php
@@ -15,7 +15,6 @@
 use function get_class;
 use function method_exists;
 use function sprintf;
-use function substr;
 
 /**
  * ReferenceRepository class manages references for
@@ -82,7 +81,7 @@ protected function getIdentifier($reference, $uow)
     {
         // In case Reference is not yet managed in UnitOfWork
         if (! $this->hasIdentifier($reference)) {
-            $class = $this->manager->getClassMetadata($this->getRealClass(get_class($reference)));
+            $class = $this->manager->getClassMetadata(get_class($reference));
 
             return $class->getIdentifierValues($reference);
         }
@@ -385,11 +384,7 @@ public function getManager()
      */
     protected function getRealClass($className)
     {
-        if (substr($className, -5) === 'Proxy') {
-            return substr($className, 0, -5);
-        }
-
-        return $className;
+        return $this->manager->getClassMetadata($className)->getName();
     }
 
     /**

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/ReferenceRepositoryTest.php b/tests/Doctrine/Tests/Common/DataFixtures/ReferenceRepositoryTest.php
@@ -14,7 +14,6 @@
 use Doctrine\Persistence\Proxy;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\Role;
 use OutOfBoundsException;
-use stdClass;
 
 class ReferenceRepositoryTest extends BaseTest
 {
@@ -129,15 +128,17 @@ public function testUndefinedReference(): void
 
     public function testThrowsExceptionAddingDuplicatedReference(): void
     {
-        $referenceRepository = new ReferenceRepository($this->getMockSqliteEntityManager());
-        $referenceRepository->addReference('duplicated_reference', new stdClass());
+        $em                  = $this->getMockSqliteEntityManager();
+        $referenceRepository = new ReferenceRepository($em);
+
+        $referenceRepository->addReference('duplicated_reference', new Role());
 
         $this->expectException(BadMethodCallException::class);
         $this->expectExceptionMessage(
             'Reference to "duplicated_reference" already exists, use method setReference() in order to override it'
         );
 
-        $referenceRepository->addReference('duplicated_reference', new stdClass());
+        $referenceRepository->addReference('duplicated_reference', new Role());
     }
 
     public function testThrowsExceptionTryingToGetWrongReference(): void
@@ -201,8 +202,7 @@ public function testGetIdentifierWhenHasNotBeenManagedYetByUnitOfWork(): void
         $em = $this->createMock(EntityManagerInterface::class);
         $em->method('getUnitOfWork')
            ->willReturn($uow);
-        $em->expects($this->once())
-            ->method('getClassMetadata')
+        $em->method('getClassMetadata')
             ->with(Role::class)
             ->willReturn($classMetadata);