Disable proxy class generation when using Native Lazy Objects

Author: GromNaN

src/DependencyInjection/DoctrineMongoDBExtension.php

@@ -474,6 +474,12 @@ public function load(array $configs, ContainerBuilder $container): void
             $configuratorDefinition->addMethodCall('loadTypes', [$config['types']]);
         }
 
+        // Disable proxy class generation for PHP 8.4 native lazy objects
+        if ($config['enable_native_lazy_objects']) {
+            $config['auto_generate_proxy_classes'] = ODMConfiguration::AUTOGENERATE_NEVER;
+            $container->removeDefinition('doctrine_mongodb.odm.proxy_cache_warmer');
+        }
+
         // set some options as parameters and unset them
         $config = $this->overrideParameters($config, $container);
 
@@ -487,7 +493,7 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         $container->getDefinition('doctrine_mongodb')
-            ->setArgument(5, $config['enable_lazy_ghost_objects'] ? LazyLoadingInterface::class : Proxy::class);
+            ->setArgument(5, $config['enable_lazy_ghost_objects'] ? Proxy::class : LazyLoadingInterface::class);
 
         // load the connections
         $this->loadConnections($config['connections'], $container, $config);

src/DoctrineMongoDBBundle.php

@@ -77,6 +77,10 @@ public function boot(): void
     private function registerAutoloader(DocumentManager $documentManager): void
     {
         $configuration = $documentManager->getConfiguration();
+        if ($configuration->isNativeLazyObjectEnabled() || $configuration->isLazyGhostObjectEnabled()) {
+            return;
+        }
+
         if ($configuration->getAutoGenerateProxyClasses() !== Configuration::AUTOGENERATE_FILE_NOT_EXISTS) {
             return;
         }

tests/DependencyInjection/ConfigurationTest.php

@@ -10,13 +10,13 @@
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Filter\DisabledFilter;
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Repository\CustomGridFSRepository;
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\Repository\CustomRepository;
+use Doctrine\Bundle\MongoDBBundle\Tests\TestCase;
 use Doctrine\ODM\MongoDB\Configuration as ODMConfiguration;
 use Doctrine\ODM\MongoDB\Repository\DefaultGridFSRepository;
 use Doctrine\ODM\MongoDB\Repository\DocumentRepository;
 use Generator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Group;
-use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
@@ -28,8 +28,6 @@
 use function file_get_contents;
 use function method_exists;
 
-use const PHP_VERSION_ID;
-
 class ConfigurationTest extends TestCase
 {
     use ExpectDeprecationTrait;
@@ -45,7 +43,7 @@ public function testDefaults(): void
             'auto_generate_proxy_classes'    => ODMConfiguration::AUTOGENERATE_EVAL,
             'auto_generate_persistent_collection_classes' => ODMConfiguration::AUTOGENERATE_NEVER,
             'enable_lazy_ghost_objects'      => method_exists(ODMConfiguration::class, 'setUseLazyGhostObject'),
-            'enable_native_lazy_objects'     => PHP_VERSION_ID >= 80400 && method_exists(ODMConfiguration::class, 'setUseNativeLazyObject'),
+            'enable_native_lazy_objects'     => self::useNativeLazyObject(),
             'default_database'               => 'default',
             'document_managers'              => [],
             'connections'                    => [],

tests/TestCase.php

@@ -32,14 +32,24 @@ public static function createTestDocumentManager(array $paths = []): DocumentMan
         $config->setMetadataDriverImpl(new AttributeDriver($paths));
         $config->setMetadataCache(new ArrayAdapter());
 
-        if (PHP_VERSION_ID >= 80400 && method_exists($config, 'setUseLazyGhostObject')) {
+        if (self::useNativeLazyObject()) {
+            $config->setUseNativeLazyObject(true);
+        } elseif (self::useLazyGhostObject()) {
             $config->setUseLazyGhostObject(true);
-        } elseif (method_exists($config, 'setUseLazyGhostObject')) {
-            $config->setUseLazyGhostObject(false);
         }
 
         $uri = getenv('MONGODB_URI') ?: throw new RuntimeException('The MONGODB_URI environment variable is not set.');
 
         return DocumentManager::create(new Client($uri), $config);
     }
+
+    public static function useNativeLazyObject(): bool
+    {
+        return PHP_VERSION_ID >= 80400 && method_exists(Configuration::class, 'setUseNativeLazyObject');
+    }
+
+    public static function useLazyGhostObject(): bool
+    {
+        return method_exists(Configuration::class, 'setUseLazyGhostObject') && ! self::useNativeLazyObject();
+    }
 }