Merge pull request #12008 from greg0ire/add-test-to-todo-list

Ensure proxies implementations behave the same on entity not found

Author: greg0ire

src/Proxy/ProxyFactory.php

@@ -185,11 +185,23 @@ public function __construct(
     public function getProxy(string $className, array $identifier): object
     {
         if ($this->em->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            $classMetadata   = $this->em->getClassMetadata($className);
-            $entityPersister = $this->uow->getEntityPersister($className);
-
-            $proxy = $classMetadata->reflClass->newLazyGhost(static function (object $object) use ($identifier, $entityPersister): void {
-                $entityPersister->loadById($identifier, $object);
+            $classMetadata       = $this->em->getClassMetadata($className);
+            $entityPersister     = $this->uow->getEntityPersister($className);
+            $identifierFlattener = $this->identifierFlattener;
+
+            $proxy = $classMetadata->reflClass->newLazyGhost(static function (object $object) use (
+                $identifier,
+                $entityPersister,
+                $identifierFlattener,
+                $classMetadata,
+            ): void {
+                $original = $entityPersister->loadById($identifier, $object);
+                if ($original === null) {
+                    throw EntityNotFoundException::fromClassNameAndIdentifier(
+                        $classMetadata->getName(),
+                        $identifierFlattener->flattenIdentifier($classMetadata, $identifier),
+                    );
+                }
             }, ReflectionClass::SKIP_INITIALIZATION_ON_SERIALIZE);
 
             foreach ($identifier as $idField => $value) {

tests/Tests/ORM/Proxy/ProxyFactoryTest.php

@@ -122,18 +122,13 @@ public function testSkipAbstractClassesOnGeneration(): void
     #[Group('DDC-2432')]
     public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized(): void
     {
-        if ($this->emMock->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            self::markTestSkipped('This test is not relevant when native lazy objects are enabled');
-        }
-
         $persister = $this->getMockBuilder(BasicEntityPersister::class)
             ->onlyMethods(['load'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister);
 
         $proxy = $this->proxyFactory->getProxy(ECommerceFeature::class, ['id' => 42]);
-        assert($proxy instanceof Proxy);
 
         $persister
             ->expects(self::atLeastOnce())
@@ -146,24 +141,31 @@ public function testFailedProxyLoadingDoesNotMarkTheProxyAsInitialized(): void
         } catch (EntityNotFoundException) {
         }
 
-        self::assertFalse($proxy->__isInitialized());
+        self::assertUninitializedLazyObject($proxy);
     }
 
-    #[Group('DDC-2432')]
-    public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized(): void
+    private static function assertUninitializedLazyObject(object $proxy): void
     {
-        if ($this->emMock->getConfiguration()->isNativeLazyObjectsEnabled()) {
-            self::markTestSkipped('This test is not relevant when native lazy objects are enabled');
+        if ($proxy instanceof Proxy) {
+            self::assertFalse($proxy->__isInitialized());
+
+            return;
         }
 
+        $reflectionClass = new ReflectionClass($proxy);
+        self::assertTrue($reflectionClass->isUninitializedLazyObject($proxy));
+    }
+
+    #[Group('DDC-2432')]
+    public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized(): void
+    {
         $persister = $this->getMockBuilder(BasicEntityPersister::class)
             ->onlyMethods(['load', 'getClassMetadata'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->uowMock->setEntityPersister(ECommerceFeature::class, $persister);
 
         $proxy = $this->proxyFactory->getProxy(ECommerceFeature::class, ['id' => 42]);
-        assert($proxy instanceof Proxy);
 
         $persister
             ->expects(self::atLeastOnce())
@@ -177,7 +179,7 @@ public function testFailedProxyCloningDoesNotMarkTheProxyAsInitialized(): void
         } catch (EntityNotFoundException) {
         }
 
-        self::assertFalse($proxy->__isInitialized());
+        self::assertUninitializedLazyObject($proxy);
     }
 
     public function testProxyClonesParentFields(): void