Review

Author: GromNaN

lib/Doctrine/ODM/MongoDB/Configuration.php

@@ -689,7 +689,7 @@ public function isTransactionalFlushEnabled(): bool
      * Generate proxy classes using Symfony VarExporter's LazyGhostTrait if true.
      * Otherwise, use ProxyManager's LazyLoadingGhostFactory (deprecated)
      */
-    public function setLazyGhostObject(bool $flag): void
+    public function setUseLazyGhostObject(bool $flag): void
     {
         if ($this->nativeLazyObjects) {
             throw new LogicException('Cannot enable or disable LazyGhostObject when native lazy objects are enabled.');
@@ -715,21 +715,21 @@ public function isLazyGhostObjectEnabled(): bool
         return $this->lazyGhostObject;
     }
 
-    public function enableNativeLazyObjects(bool $nativeLazyObjects): void
+    public function setUseNativeLazyObject(bool $nativeLazyObject): void
     {
-        if (PHP_VERSION_ID >= 80400 && ! $nativeLazyObjects) {
+        if (PHP_VERSION_ID >= 80400 && ! $nativeLazyObject) {
             trigger_deprecation('doctrine/mongodb-odm', '2.14', 'Disabling native lazy objects is deprecated and will be impossible in Doctrine MongoDB ODM 3.0.');
         }
 
-        if (PHP_VERSION_ID < 80400 && $nativeLazyObjects) {
-            throw new LogicException('Lazy loading proxies require PHP 8.4 or higher.');
+        if (PHP_VERSION_ID < 80400 && $nativeLazyObject) {
+            throw new LogicException('Native lazy objects require PHP 8.4 or higher.');
         }
 
-        $this->nativeLazyObjects = $nativeLazyObjects;
-        $this->lazyGhostObject   = ! $nativeLazyObjects || $this->lazyGhostObject;
+        $this->nativeLazyObjects = $nativeLazyObject;
+        $this->lazyGhostObject   = ! $nativeLazyObject || $this->lazyGhostObject;
     }
 
-    public function isNativeLazyObjectsEnabled(): bool
+    public function isNativeLazyObjectEnabled(): bool
     {
         return $this->nativeLazyObjects;
     }

lib/Doctrine/ODM/MongoDB/DocumentManager.php

@@ -182,7 +182,7 @@ protected function __construct(?Client $client = null, ?Configuration $config =
         $this->unitOfWork    = new UnitOfWork($this, $this->eventManager, $this->hydratorFactory);
         $this->schemaManager = new SchemaManager($this, $this->metadataFactory);
         $this->proxyFactory  = match (true) {
-            $this->config->isNativeLazyObjectsEnabled() => new NativeLazyObjectFactory($this),
+            $this->config->isNativeLazyObjectEnabled() => new NativeLazyObjectFactory($this),
             $this->config->isLazyGhostObjectEnabled() => new LazyGhostProxyFactory($this, $this->config->getProxyDir(), $this->config->getProxyNamespace(), $this->config->getAutoGenerateProxyClasses()),
             default => new StaticProxyFactory($this),
         };

lib/Doctrine/ODM/MongoDB/Mapping/PropertyAccessors/RawValuePropertyAccessor.php

@@ -19,6 +19,8 @@
  * It works based on the raw values of a property, which for a case of property hooks
  * is the backed value. If we kept using setValue/getValue, this would go through the hooks,
  * which potentially change the data.
+ *
+ * @internal
  */
 class RawValuePropertyAccessor implements PropertyAccessor
 {

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

@@ -75,7 +75,7 @@ public function getProxy(ClassMetadata $metadata, $identifier): object
         return $proxy;
     }
 
-    /** Only for internal tests */
+    /** @internal Only for tests */
     public static function enableTracking(bool $enabled = true): void
     {
         if ($enabled) {
@@ -85,7 +85,7 @@ public static function enableTracking(bool $enabled = true): void
         }
     }
 
-    /** Only for internal tests */
+    /** @internal Only for tests */
     public static function isLazyObject(object $object): bool
     {
         if (! isset(self::$lazyObjects)) {

lib/Doctrine/ODM/MongoDB/UnitOfWork.php

@@ -2785,7 +2785,7 @@ public function getOrCreateDocument(string $className, array $data, array &$hint
             $document = $this->identityMap[$class->name][$serializedId];
             $oid      = spl_object_id($document);
             if ($this->isUninitializedObject($document)) {
-                if ($this->dm->getConfiguration()->isNativeLazyObjectsEnabled()) {
+                if ($this->dm->getConfiguration()->isNativeLazyObjectEnabled()) {
                     $class->reflClass->markLazyObjectAsInitialized($document);
                 } elseif ($document instanceof InternalProxy) {
                     $document->__setInitialized(true);
@@ -3096,7 +3096,7 @@ public function isUninitializedObject(object $obj): bool
             $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),
+            $this->dm->getConfiguration()->isNativeLazyObjectEnabled() => $this->dm->getClassMetadata($obj::class)->reflClass->isUninitializedLazyObject($obj),
             default => false
         };
     }

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

@@ -105,10 +105,10 @@ protected static function getConfiguration(): Configuration
         $config->setPersistentCollectionNamespace('PersistentCollections');
         $config->setDefaultDB(DOCTRINE_MONGODB_DATABASE);
         $config->setMetadataDriverImpl(static::createMetadataDriverImpl());
-        $config->setLazyGhostObject((bool) $_ENV['USE_LAZY_GHOST_OBJECTS']);
-        $config->enableNativeLazyObjects((bool) $_ENV['USE_NATIVE_LAZY_OBJECTS']);
+        $config->setUseLazyGhostObject((bool) $_ENV['USE_LAZY_GHOST_OBJECTS']);
+        $config->setUseNativeLazyObject((bool) $_ENV['USE_NATIVE_LAZY_OBJECTS']);
 
-        if ($config->isNativeLazyObjectsEnabled()) {
+        if ($config->isNativeLazyObjectEnabled()) {
             NativeLazyObjectFactory::enableTracking();
         }
 

tests/Doctrine/ODM/MongoDB/Tests/Functional/PropertyHooksTest.php

@@ -17,7 +17,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if ($this->dm->getConfiguration()->isNativeLazyObjectsEnabled()) {
+        if ($this->dm->getConfiguration()->isNativeLazyObjectEnabled()) {
             return;
         }
 

tests/Doctrine/ODM/MongoDB/Tests/Functional/ReferencePrimerTest.php

@@ -94,6 +94,7 @@ public function testPrimeReferencesWithDBRefObjects(): void
             ->field('groups')->prime(true);
 
         foreach ($qb->getQuery() as $user) {
+            self::assertTrue(self::isLazyObject($user->getAccount()));
             self::assertFalse($this->uow->isUninitializedObject($user->getAccount()));
 
             self::assertCount(2, $user->getGroups());

tests/Doctrine/ODM/MongoDB/Tests/Mapping/AbstractAnnotationDriverTestCase.php

@@ -97,6 +97,8 @@ public function testGetAllClassNamesIsIdempotent(): void
     {
         $annotationDriver = $this->loadDriverForCMSDocuments();
         $original         = $annotationDriver->getAllClassNames();
+
+        $annotationDriver = $this->loadDriverForCMSDocuments();
         $afterTestReset   = $annotationDriver->getAllClassNames();
 
         self::assertEquals($original, $afterTestReset);

tests/Doctrine/ODM/MongoDB/Tests/Proxy/Factory/ProxyFactoryTest.php

@@ -89,7 +89,7 @@ public function testCreateProxyForDocumentWithUnmappedProperties(): void
             $proxy->__setInitialized(true);
         } elseif ($proxy instanceof GhostObjectInterface) {
             $proxy->setProxyInitializer(null);
-        } elseif ($this->dm->getConfiguration()->isNativeLazyObjectsEnabled()) {
+        } elseif ($this->dm->getConfiguration()->isNativeLazyObjectEnabled()) {
             $this->dm->getClassMetadata($proxy::class)->getReflectionClass()->markLazyObjectAsInitialized($proxy);
         }