Merge branch '7.4' into 8.0

xabbuh · xabbuh · commit 6ab4a1435923 · 2025-06-26T15:36:30.000+02:00
* 7.4:
  fix merge
  use native lazy objects on PHP 8.4+ when available
diff --git 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));
         $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
         $config->setLazyGhostObjectEnabled(true);
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -42,7 +42,11 @@ private function createExtractor(): DoctrineExtractor
         $config = ORMSetup::createConfiguration(true);
         $config->setMetadataDriverImpl(new AttributeDriver([__DIR__.'/../Tests/Fixtures' => 'Symfony\Bridge\Doctrine\Tests\Fixtures'], true));
         $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());
-        $config->setLazyGhostObjectEnabled(true);
+        if (\PHP_VERSION_ID >= 80400 && method_exists($config, 'enableNativeLazyObjects')) {
+            $config->enableNativeLazyObjects(true);
+        } else {
+            $config->setLazyGhostObjectEnabled(true);
+        }
 
         $eventManager = new EventManager();
         $entityManager = new EntityManager(DriverManager::getConnection(['driver' => 'pdo_sqlite'], $config, $eventManager), $config, $eventManager);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LocaleValidatorTest.php
@@ -91,9 +91,7 @@ public static function getInvalidLocales()
 
     public function testTooLongLocale()
     {
-        $constraint = new Locale([
-            'message' => 'myMessage',
-        ]);
+        $constraint = new Locale(message: 'myMessage');
 
         $locale = str_repeat('a', (\defined('INTL_MAX_LOCALE_LEN') ? \INTL_MAX_LOCALE_LEN : 85) + 1);
         $this->validator->validate($locale, $constraint);

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,7 @@ public static function getInvalidLocales()`
`91`	`91`
`92`	`92`	`public function testTooLongLocale()`
`93`	`93`	`{`
`94`		`- $constraint = new Locale([`
`95`		`- 'message' => 'myMessage',`
`96`		`- ]);`
	`94`	`+ $constraint = new Locale(message: 'myMessage');`
`97`	`95`
`98`	`96`	`$locale = str_repeat('a', (\defined('INTL_MAX_LOCALE_LEN') ? \INTL_MAX_LOCALE_LEN : 85) + 1);`
`99`	`97`	`$this->validator->validate($locale, $constraint);`