Skip to content

[DoctrineBridge] Fix support for entities that leverage native lazy objects #60094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Mar 31, 2025
Merged

[DoctrineBridge] Fix support for entities that leverage native lazy objects #60094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@

if ($refreshedUser instanceof Proxy && !$refreshedUser->__isInitialized()) {
$refreshedUser->__load();
} elseif (\PHP_VERSION_ID >= 80400 && ($r = new \ReflectionClass($refreshedUser))->isUninitializedLazyObject($refreshedUser)) {

Check failure on line 103 in src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

View workflow job for this annotation

GitHub Actions / Psalm

UndefinedMethod 

src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php:103:92: UndefinedMethod: Method ReflectionClass::isUninitializedLazyObject does not exist (see https://psalm.dev/022)

Check failure on line 103 in src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

View workflow job for this annotation

GitHub Actions / Psalm

UndefinedMethod 

src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php:103:92: UndefinedMethod: Method ReflectionClass::isUninitializedLazyObject does not exist (see https://psalm.dev/022)
$r->initializeLazyObject($refreshedUser);

Check failure on line 104 in src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

View workflow job for this annotation

GitHub Actions / Psalm

UndefinedMethod 

src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php:104:17: UndefinedMethod: Method ReflectionClass::initializeLazyObject does not exist (see https://psalm.dev/022)

Check failure on line 104 in src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php

View workflow job for this annotation

GitHub Actions / Psalm

UndefinedMethod 

src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php:104:17: UndefinedMethod: Method ReflectionClass::initializeLazyObject does not exist (see https://psalm.dev/022)
}

return $refreshedUser;
Expand Down
4 changes: 4 additions & 0 deletions src/Symfony/Bridge/Doctrine/Tests/DoctrineTestHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
10 changes: 8 additions & 2 deletions src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -219,8 +220,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)
Expand Down
Loading