Skip to content

Commit d52dc34

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: use native lazy objects on PHP 8.4+ when available
2 parents 912975c + ef36093 commit d52dc34

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

Tests/DoctrineTestHelper.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,11 @@ public static function createTestConfiguration(): Configuration
5858
{
5959
$config = ORMSetup::createConfiguration(true);
6060
$config->setEntityNamespaces(['SymfonyTestsDoctrine' => 'Symfony\Bridge\Doctrine\Tests\Fixtures']);
61-
$config->setAutoGenerateProxyClasses(true);
62-
$config->setProxyDir(sys_get_temp_dir());
63-
$config->setProxyNamespace('SymfonyTests\Doctrine');
61+
if (\PHP_VERSION_ID < 80400 || !method_exists($config, 'enableNativeLazyObjects')) {
62+
$config->setAutoGenerateProxyClasses(true);
63+
$config->setProxyDir(sys_get_temp_dir());
64+
$config->setProxyNamespace('SymfonyTests\Doctrine');
65+
}
6466
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
6567
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
6668
$config->setLazyGhostObjectEnabled(true);

Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ private function createExtractor(): DoctrineExtractor
4343
$config = ORMSetup::createConfiguration(true);
4444
$config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
4545
$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
46-
$config->setLazyGhostObjectEnabled(true);
46+
if (\PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
47+
$config->enableNativeLazyObjects(true);
48+
} else {
49+
$config->setLazyGhostObjectEnabled(true);
50+
}
4751

4852
$eventManager = new EventManager();
4953
$entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);

0 commit comments

Comments
 (0)