Merge branch '7.2' into 7.3

nicolas-grekas · nicolas-grekas · commit fe4a9eabf7ed · 2025-03-31T14:26:25.000+02:00
* 7.2:
  [DoctrineBridge] Fix support for entities that leverage native lazy objects
diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
@@ -100,6 +100,8 @@ public function refreshUser(UserInterface $user): UserInterface
 
         if ($refreshedUser instanceof Proxy && !$refreshedUser->__isInitialized()) {
             $refreshedUser->__load();
+        } elseif (\PHP_VERSION_ID >= 80400 && ($r = new \ReflectionClass($refreshedUser))->isUninitializedLazyObject($refreshedUser)) {
+            $r->initializeLazyObject($refreshedUser);
         }
 
         return $refreshedUser;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php b/src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
@@ -47,6 +47,10 @@ public static function createTestEntityManager(?Configuration $config = null): E
         $config ??= self::createTestConfiguration();
         $eventManager = new EventManager();
 
+        if (\PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        }
+
         return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bridge\Doctrine\Tests\Security\User;
 
+use Doctrine\ORM\Configuration;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Tools\SchemaTool;
@@ -225,8 +226,13 @@ public function testRefreshedUserProxyIsLoaded()
         $provider = new EntityUserProvider($this->getManager($em), User::class);
         $refreshedUser = $provider->refreshUser($user);
 
-        $this->assertInstanceOf(Proxy::class, $refreshedUser);
-        $this->assertTrue($refreshedUser->__isInitialized());
+        if (\PHP_VERSION_ID >= 80400 && method_exists(Configuration::class, 'enableNativeLazyObjects')) {
+            $this->assertFalse((new \ReflectionClass(User::class))->isUninitializedLazyObject($refreshedUser));
+            $this->assertSame('user1', $refreshedUser->name);
+        } else {
+            $this->assertInstanceOf(Proxy::class, $refreshedUser);
+            $this->assertTrue($refreshedUser->__isInitialized());
+        }
     }
 
     private function getManager($em, $name = null)

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ public function refreshUser(UserInterface $user): UserInterface`
`100`	`100`
`101`	`101`	`if ($refreshedUser instanceof Proxy && !$refreshedUser->__isInitialized()) {`
`102`	`102`	`$refreshedUser->__load();`
	`103`	`+ } elseif (\PHP_VERSION_ID >= 80400 && ($r = new \ReflectionClass($refreshedUser))->isUninitializedLazyObject($refreshedUser)) {`
	`104`	`+ $r->initializeLazyObject($refreshedUser);`
`103`	`105`	`}`
`104`	`106`
`105`	`107`	`return $refreshedUser;`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ public static function createTestEntityManager(?Configuration $config = null): E`
`47`	`47`	`$config ??= self::createTestConfiguration();`
`48`	`48`	`$eventManager = new EventManager();`
`49`	`49`
	`50`	`+ if (\PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {`
	`51`	`+ $config->enableNativeLazyObjects(true);`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`return new EntityManager(DriverManager::getConnection($params, $config, $eventManager), $config, $eventManager);`
`51`	`55`	`}`
`52`	`56`