From 1256ce922eb1daf5889bdd1a4688e18058173500 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@open.de>
Date: Thu, 26 Jun 2025 13:37:48 +0200
Subject: [PATCH] use native lazy objects on PHP 8.4+ when available

---
 src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php  | 8 +++++---
 .../Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
index 576011f4226b3..9d1a01e7ecd04 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
@@ -58,9 +58,11 @@ public static function createTestConfiguration(): Configuration
     {
         $config = ORMSetup::createConfiguration(true);
         $config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
-        $config->setAutoGenerateProxyClasses(true);
-        $config->setProxyDir(sys_get_temp_dir());
-        $config->setProxyNamespace('SymfonyTests\Doctrine');
+        if (\PHP_VERSION_ID < 80400 || !method_exists($config, 'enableNativeLazyObjects')) {
+            $config->setAutoGenerateProxyClasses(true);
+            $config->setProxyDir(sys_get_temp_dir());
+            $config->setProxyNamespace('SymfonyTests\Doctrine');
+        }
         $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
         if (class_exists(DefaultSchemaManagerFactory::class)) {
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
index 81bd3e6235b29..a6ae9886b38fd 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -45,7 +45,11 @@ private function createExtractor(): DoctrineExtractor
             $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         }
         if (!class_exists(\Doctrine\Persistence\Mapping\Driver\AnnotationDriver::class)) { // doctrine/persistence >= 3.0
-            $config->setLazyGhostObjectEnabled(true);
+            if (\PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+                $config->enableNativeLazyObjects(true);
+            } else {
+                $config->setLazyGhostObjectEnabled(true);
+            }
         }
 
         $eventManager = new EventManager();