Use a WeakMap to track generated lazy objects

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Proxy/Factory/NativeLazyObjectFactory.php

@@ -9,13 +9,17 @@
 use Doctrine\ODM\MongoDB\UnitOfWork;
 use LogicException;
 use ReflectionClass;
+use WeakMap;
 
 use function count;
 
 use const PHP_VERSION_ID;
 
+/** @internal */
 class NativeLazyObjectFactory implements ProxyFactory
 {
+    private static ?WeakMap $lazyObjects = null;
+
     public function __construct(
         private readonly UnitOfWork $unitOfWork,
     ) {
@@ -48,6 +52,30 @@ public function getProxy(ClassMetadata $metadata, $identifier): object
 
         $metadata->propertyAccessors[$metadata->identifier]->setValue($proxy, $identifier);
 
+        if (isset(self::$lazyObjects)) {
+            self::$lazyObjects[$proxy] = true;
+        }
+
         return $proxy;
     }
+
+    /** Only for internal tests */
+    public static function enableTracking(bool $enabled = true): void
+    {
+        if ($enabled) {
+            self::$lazyObjects ??= new WeakMap();
+        } else {
+            self::$lazyObjects = null;
+        }
+    }
+
+    /** Only for internal tests */
+    public static function isLazyObject(object $object): bool
+    {
+        if (! isset(self::$lazyObjects)) {
+            throw new LogicException('Lazy object tracking is not enabled.');
+        }
+
+        return self::$lazyObjects->offsetExists($object);
+    }
 }

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -3089,9 +3089,9 @@ public function initializeObject(object $obj): void
     public function isUninitializedObject(object $obj): bool
     {
         return match (true) {
-            $obj instanceof InternalProxy => $obj->__isInitialized() === false,
-            $obj instanceof GhostObjectInterface => $obj->isProxyInitialized() === false,
-            $obj instanceof PersistentCollectionInterface => $obj->isInitialized() === false,
+            $obj instanceof InternalProxy => ! $obj->__isInitialized(),
+            $obj instanceof GhostObjectInterface => ! $obj->isProxyInitialized(),
+            $obj instanceof PersistentCollectionInterface => ! $obj->isInitialized(),
             $this->dm->getConfiguration()->isNativeLazyObjectsEnabled() => $this->dm->getClassMetadata($obj::class)->reflClass->isUninitializedLazyObject($obj),
             default => false
         };

tests/Doctrine/ODM/MongoDB/Tests/BaseTestCase.php

@@ -7,6 +7,7 @@
 use Doctrine\ODM\MongoDB\Configuration;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\Mapping\Driver\AttributeDriver;
+use Doctrine\ODM\MongoDB\Proxy\Factory\NativeLazyObjectFactory;
 use Doctrine\ODM\MongoDB\Proxy\InternalProxy;
 use Doctrine\ODM\MongoDB\Tests\Query\Filter\Filter;
 use Doctrine\ODM\MongoDB\UnitOfWork;
@@ -109,6 +110,10 @@ protected static function getConfiguration(): Configuration
         $config->setLazyGhostObject((bool) $_ENV['USE_LAZY_GHOST_OBJECTS']);
         $config->enableNativeLazyObjects((bool) $_ENV['USE_NATIVE_LAZY_OBJECTS']);
 
+        if ($config->isNativeLazyObjectsEnabled()) {
+            NativeLazyObjectFactory::enableTracking();
+        }
+
         $config->addFilter('testFilter', Filter::class);
         $config->addFilter('testFilter2', Filter::class);
 
@@ -137,8 +142,8 @@ public static function assertArraySubset(array $subset, array $array, bool $chec
 
     public static function isLazyObject(object $document): bool
     {
-        if (PHP_VERSION_ID >= 80400 && (new ReflectionClass($document))->getLazyInitializer($document)) {
-            return true;
+        if (PHP_VERSION_ID >= 80400 && $_ENV['USE_LAZY_GHOST_OBJECTS'] ?? false) {
+            return NativeLazyObjectFactory::isLazyObject($document);
         }
 
         return $document instanceof InternalProxy || $document instanceof LazyLoadingInterface;

tests/Doctrine/ODM/MongoDB/Tests/Functional/Ticket/GH852Test.php

@@ -14,6 +14,7 @@
 use MongoDB\BSON\Binary;
 use PHPUnit\Framework\Attributes\DataProvider;
 
+/** @see https://github.com/doctrine/mongodb-odm/pull/852 */
 class GH852Test extends BaseTestCase
 {
     #[DataProvider('provideIdGenerators')]