Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit cfe62c5d1da2 · 2025-07-15T15:41:35.000+02:00
* 6.4:
  remove an invalid test
  [Translation] fix support of `TranslatableInterface` in `IdentityTranslator`
  Fix various bool-type coercions
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubTranslator.php
@@ -11,12 +11,19 @@
 
 namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;
 
+use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class StubTranslator implements TranslatorInterface
 {
     public function trans($id, array $parameters = [], $domain = null, $locale = null): string
     {
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($this, $locale);
+            }
+        }
+
         return '[trans]'.strtr($id, $parameters).'[/trans]';
     }
 
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -122,7 +122,7 @@ private function generateSignature(\ReflectionClass $class): iterable
         yield print_r($attributes, true);
         $attributes = [];
 
-        yield $class->getDocComment();
+        yield $class->getDocComment() ?: '';
         yield (int) $class->isFinal();
         yield (int) $class->isAbstract();
 
@@ -144,7 +144,7 @@ private function generateSignature(\ReflectionClass $class): iterable
                 yield print_r($attributes, true);
                 $attributes = [];
 
-                yield $p->getDocComment();
+                yield $p->getDocComment() ?: '';
                 yield $p->isDefault() ? '<default>' : '';
                 yield $p->isPublic() ? 'public' : 'protected';
                 yield $p->isStatic() ? 'static' : '';
diff --git a/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php b/src/Symfony/Component/Config/Tests/Builder/GeneratedConfigTest.php
@@ -193,6 +193,8 @@ private function assertDirectorySame($expected, $current)
             }
             $currentFiles[substr($file->getPathname(), \strlen($current))] = $file->getPathname();
         }
+        ksort($expectedFiles);
+        ksort($currentFiles);
 
         $this->assertSame(array_keys($expectedFiles), array_keys($currentFiles));
         foreach ($expectedFiles as $fileName => $filePath) {
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1175,7 +1175,7 @@ private function createService(Definition $definition, array &$inlineServices, b
             if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {
                 $r = new \ReflectionClass($factory[0]);
 
-                if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+                if (0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {
                     trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name);
                 }
             }
@@ -1192,7 +1192,7 @@ private function createService(Definition $definition, array &$inlineServices, b
                 $service = $r->getConstructor() ? $r->newInstanceArgs($arguments) : $r->newInstance();
             }
 
-            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
+            if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {
                 trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -527,7 +527,7 @@ private function collectLineage(string $class, array &$lineage): void
             return;
         }
         $file = $r->getFileName();
-        if (str_ends_with($file, ') : eval()\'d code')) {
+        if ($file && str_ends_with($file, ') : eval()\'d code')) {
             $file = substr($file, 0, strrpos($file, '(', -17));
         }
         if (!$file || $this->doExport($file) === $exportedFile = $this->export($file)) {
@@ -574,12 +574,13 @@ private function generateProxyClasses(): array
                     continue;
                 }
                 do {
-                    $file = $r->getFileName();
-                    if (str_ends_with($file, ') : eval()\'d code')) {
-                        $file = substr($file, 0, strrpos($file, '(', -17));
-                    }
-                    if (is_file($file)) {
-                        $this->container->addResource(new FileResource($file));
+                    if ($file = $r->getFileName()) {
+                        if (str_ends_with($file, ') : eval()\'d code')) {
+                            $file = substr($file, 0, strrpos($file, '(', -17));
+                        }
+                        if (is_file($file)) {
+                            $this->container->addResource(new FileResource($file));
+                        }
                     }
                     $r = $r->getParentClass() ?: null;
                 } while ($r?->isUserDefined());
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -339,7 +339,11 @@ private function parseDefinition(\DOMElement $service, string $file, Definition
         }
 
         foreach ($this->getChildren($service, 'call') as $call) {
-            $definition->addMethodCall($call->getAttribute('method'), $this->getArgumentsAsPhp($call, 'argument', $file), XmlUtils::phpize($call->getAttribute('returns-clone')));
+            $definition->addMethodCall(
+                $call->getAttribute('method'),
+                $this->getArgumentsAsPhp($call, 'argument', $file),
+                XmlUtils::phpize($call->getAttribute('returns-clone')) ?: false
+            );
         }
 
         $tags = $this->getChildren($service, 'tag');
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
@@ -72,7 +72,7 @@ public static function getTestFilterData()
 
         $inner[] = new MockSplFileInfo([
             'name' => 'unreadable-file.txt',
-            'contents' => false,
+            'contents' => '',
             'type' => 'file',
             'mode' => 'r+', ]
         );
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CountryTypeTest.php
@@ -21,7 +21,7 @@ class CountryTypeTest extends BaseTypeTestCase
 
     protected function setUp(): void
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/CurrencyTypeTest.php
@@ -21,7 +21,7 @@ class CurrencyTypeTest extends BaseTypeTestCase
 
     protected function setUp(): void
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/IntegerTypeTest.php
@@ -22,7 +22,7 @@ class IntegerTypeTest extends BaseTypeTestCase
 
     protected function setUp(): void
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
         $this->previousLocale = \Locale::getDefault();
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LanguageTypeTest.php
@@ -22,7 +22,7 @@ class LanguageTypeTest extends BaseTypeTestCase
 
     protected function setUp(): void
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/LocaleTypeTest.php
@@ -21,7 +21,7 @@ class LocaleTypeTest extends BaseTypeTestCase
 
     protected function setUp(): void
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
 
         parent::setUp();
     }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimezoneTypeTest.php
@@ -144,7 +144,7 @@ public function testIntlTimeZoneInputWithBcAndIntl()
 
     public function testTimezonesAreSelectableWithIntl()
     {
-        IntlTestHelper::requireIntl($this, false);
+        IntlTestHelper::requireIntl($this);
 
         $choices = $this->factory->create(static::TESTED_TYPE, null, ['intl' => true])
             ->createView()->vars['choices'];
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -104,13 +104,13 @@ public static function provideSessionOptions(): \Generator
 
         yield 'set_cookiesecure_auto_by_symfony_false_by_php' => [
             'phpSessionOptions' => ['secure' => false],
-            'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => 'auto', 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
+            'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => true, 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
             'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => false, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_LAX],
         ];
 
         yield 'set_cookiesecure_auto_by_symfony_true_by_php' => [
             'phpSessionOptions' => ['secure' => true],
-            'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => 'auto', 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
+            'sessionOptions' => ['cookie_path' => '/test/', 'cookie_httponly' => true, 'cookie_secure' => 'auto', 'cookie_samesite' => Cookie::SAMESITE_LAX],
             'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_LAX],
         ];
 
diff --git a/src/Symfony/Component/Mime/Tests/EmailTest.php b/src/Symfony/Component/Mime/Tests/EmailTest.php
@@ -477,7 +477,7 @@ private function generateSomeParts(): array
     public function testAttachments()
     {
         // inline part
-        $contents = file_get_contents($name = __DIR__.'/Fixtures/mimetypes/test', 'r');
+        $contents = file_get_contents($name = __DIR__.'/Fixtures/mimetypes/test');
         $att = new DataPart($file = fopen($name, 'r'), 'test');
         $inline = (new DataPart($contents, 'test'))->asInline();
         $e = new Email();
@@ -618,7 +618,7 @@ public function testHtmlBodyAcceptedTypes()
         $email->html(null);
         $this->assertNull($email->getHtmlBody());
 
-        $contents = file_get_contents(__DIR__.'/Fixtures/mimetypes/test', 'r');
+        $contents = file_get_contents(__DIR__.'/Fixtures/mimetypes/test');
         $email->html($contents);
         $this->assertSame($contents, $email->getHtmlBody());
     }
@@ -641,7 +641,7 @@ public function testTextBodyAcceptedTypes()
         $email->text(null);
         $this->assertNull($email->getTextBody());
 
-        $contents = file_get_contents(__DIR__.'/Fixtures/mimetypes/test', 'r');
+        $contents = file_get_contents(__DIR__.'/Fixtures/mimetypes/test');
         $email->text($contents);
         $this->assertSame($contents, $email->getTextBody());
     }
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php b/src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
@@ -128,7 +128,7 @@ public function disableMagicSet(): static
      */
     public function isMagicCallEnabled(): bool
     {
-        return (bool) ($this->magicMethods & PropertyAccessor::MAGIC_CALL);
+        return $this->magicMethods & PropertyAccessor::MAGIC_CALL;
     }
 
     /**
diff --git a/src/Symfony/Component/Translation/TranslatableMessage.php b/src/Symfony/Component/Translation/TranslatableMessage.php
@@ -48,9 +48,13 @@ public function getDomain(): ?string
 
     public function trans(TranslatorInterface $translator, ?string $locale = null): string
     {
-        return $translator->trans($this->getMessage(), array_map(
-            static fn ($parameter) => $parameter instanceof TranslatableInterface ? $parameter->trans($translator, $locale) : $parameter,
-            $this->getParameters()
-        ), $this->getDomain(), $locale);
+        $parameters = $this->getParameters();
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($translator, $locale);
+            }
+        }
+
+        return $translator->trans($this->getMessage(), $parameters, $this->getDomain(), $locale);
     }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CssColorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CssColorTest.php
@@ -41,26 +41,6 @@ public function testAttributes()
         self::assertSame('some attached data', $cConstraint->payload);
     }
 
-    public function testMissingPattern()
-    {
-        $constraint = new CssColor(null);
-
-        $this->assertSame([
-            CssColor::HEX_LONG,
-            CssColor::HEX_LONG_WITH_ALPHA,
-            CssColor::HEX_SHORT,
-            CssColor::HEX_SHORT_WITH_ALPHA,
-            CssColor::BASIC_NAMED_COLORS,
-            CssColor::EXTENDED_NAMED_COLORS,
-            CssColor::SYSTEM_COLORS,
-            CssColor::KEYWORDS,
-            CssColor::RGB,
-            CssColor::RGBA,
-            CssColor::HSL,
-            CssColor::HSLA,
-        ], $constraint->formats);
-    }
-
     public function testMissingPatternDoctrineStyle()
     {
         $constraint = new CssColor([]);
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php
@@ -121,7 +121,7 @@ public static function getInvalidIsbn()
 
     public function testNullIsValid()
     {
-        $constraint = new Isbn(true);
+        $constraint = new Isbn();
 
         $this->validator->validate(null, $constraint);
 
@@ -130,7 +130,7 @@ public function testNullIsValid()
 
     public function testEmptyStringIsValid()
     {
-        $constraint = new Isbn(true);
+        $constraint = new Isbn();
 
         $this->validator->validate('', $constraint);
 
@@ -140,7 +140,7 @@ public function testEmptyStringIsValid()
     public function testExpectsStringCompatibleType()
     {
         $this->expectException(UnexpectedValueException::class);
-        $constraint = new Isbn(true);
+        $constraint = new Isbn();
 
         $this->validator->validate(new \stdClass(), $constraint);
     }
diff --git a/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php b/src/Symfony/Component/Workflow/Dumper/GraphvizDumper.php
@@ -141,7 +141,7 @@ protected function findTransitions(Definition $definition, bool $withMetadata):
     /**
      * @internal
      */
-    protected function addPlaces(array $places, float $withMetadata): string
+    protected function addPlaces(array $places, bool $withMetadata): string
     {
         $code = '';
 
@@ -303,7 +303,7 @@ protected function addAttributes(array $attributes): string
      *
      * @internal
      */
-    protected function formatLabel(Definition $definition, string $withMetadata, array $options): string
+    protected function formatLabel(Definition $definition, bool $withMetadata, array $options): string
     {
         $currentLabel = $options['label'] ?? '';
 
diff --git a/src/Symfony/Contracts/Translation/Test/TranslatorTest.php b/src/Symfony/Contracts/Translation/Test/TranslatorTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Translation\TranslatableMessage;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Symfony\Contracts\Translation\TranslatorTrait;
 
@@ -124,10 +125,12 @@ public function testGetLocaleReturnsDefaultLocaleIfNotSet()
 
     public static function getTransTests()
     {
-        return [
-            ['Symfony is great!', 'Symfony is great!', []],
-            ['Symfony is awesome!', 'Symfony is %what%!', ['%what%' => 'awesome']],
-        ];
+        yield ['Symfony is great!', 'Symfony is great!', []];
+        yield ['Symfony is awesome!', 'Symfony is %what%!', ['%what%' => 'awesome']];
+
+        if (class_exists(TranslatableMessage::class)) {
+            yield ['He said "Symfony is awesome!".', 'He said "%what%".', ['%what%' => new TranslatableMessage('Symfony is %what%!', ['%what%' => 'awesome'])]];
+        }
     }
 
     public static function getTransChoiceTests()
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
@@ -41,6 +41,12 @@ public function trans(?string $id, array $parameters = [], ?string $domain = nul
             return '';
         }
 
+        foreach ($parameters as $k => $v) {
+            if ($v instanceof TranslatableInterface) {
+                $parameters[$k] = $v->trans($this, $locale);
+            }
+        }
+
         if (!isset($parameters['%count%']) || !is_numeric($parameters['%count%'])) {
             return strtr($id, $parameters);
         }

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,19 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures;`
`13`	`13`
	`14`	`+use Symfony\Contracts\Translation\TranslatableInterface;`
`14`	`15`	`use Symfony\Contracts\Translation\TranslatorInterface;`
`15`	`16`
`16`	`17`	`class StubTranslator implements TranslatorInterface`
`17`	`18`	`{`
`18`	`19`	`public function trans($id, array $parameters = [], $domain = null, $locale = null): string`
`19`	`20`	`{`
	`21`	`+ foreach ($parameters as $k => $v) {`
	`22`	`+ if ($v instanceof TranslatableInterface) {`
	`23`	`+ $parameters[$k] = $v->trans($this, $locale);`
	`24`	`+ }`
	`25`	`+ }`
	`26`	`+`
`20`	`27`	`return '[trans]'.strtr($id, $parameters).'[/trans]';`
`21`	`28`	`}`
`22`	`29`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,8 @@ private function assertDirectorySame($expected, $current)`
`193`	`193`	`}`
`194`	`194`	`$currentFiles[substr($file->getPathname(), \strlen($current))] = $file->getPathname();`
`195`	`195`	`}`
	`196`	`+ ksort($expectedFiles);`
	`197`	`+ ksort($currentFiles);`
`196`	`198`
`197`	`199`	`$this->assertSame(array_keys($expectedFiles), array_keys($currentFiles));`
`198`	`200`	`foreach ($expectedFiles as $fileName => $filePath) {`
Original file line number	Diff line number	Diff line change
`@@ -1175,7 +1175,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1175`	`1175`	`if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {`
`1176`	`1176`	`$r = new \ReflectionClass($factory[0]);`
`1177`	`1177`
`1178`		`- if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
	`1178`	`+ if (0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {`
`1179`	`1179`	`trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name);`
`1180`	`1180`	`}`
`1181`	`1181`	`}`
`@@ -1192,7 +1192,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1192`	`1192`	`$service = $r->getConstructor() ? $r->newInstanceArgs($arguments) : $r->newInstance();`
`1193`	`1193`	`}`
`1194`	`1194`
`1195`		`- if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
	`1195`	`+ if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {`
`1196`	`1196`	`trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);`
`1197`	`1197`	`}`
`1198`	`1198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,11 @@ private function parseDefinition(\DOMElement $service, string $file, Definition`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`foreach ($this->getChildren($service, 'call') as $call) {`
`342`		`- $definition->addMethodCall($call->getAttribute('method'), $this->getArgumentsAsPhp($call, 'argument', $file), XmlUtils::phpize($call->getAttribute('returns-clone')));`
	`342`	`+ $definition->addMethodCall(`
	`343`	`+ $call->getAttribute('method'),`
	`344`	`+ $this->getArgumentsAsPhp($call, 'argument', $file),`
	`345`	`+ XmlUtils::phpize($call->getAttribute('returns-clone')) ?: false`
	`346`	`+ );`
`343`	`347`	`}`
`344`	`348`
`345`	`349`	`$tags = $this->getChildren($service, 'tag');`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class CountryTypeTest extends BaseTypeTestCase`
`21`	`21`
`22`	`22`	`protected function setUp(): void`
`23`	`23`	`{`
`24`		`- IntlTestHelper::requireIntl($this, false);`
	`24`	`+ IntlTestHelper::requireIntl($this);`
`25`	`25`
`26`	`26`	`parent::setUp();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class CurrencyTypeTest extends BaseTypeTestCase`
`21`	`21`
`22`	`22`	`protected function setUp(): void`
`23`	`23`	`{`
`24`		`- IntlTestHelper::requireIntl($this, false);`
	`24`	`+ IntlTestHelper::requireIntl($this);`
`25`	`25`
`26`	`26`	`parent::setUp();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class IntegerTypeTest extends BaseTypeTestCase`
`22`	`22`
`23`	`23`	`protected function setUp(): void`
`24`	`24`	`{`
`25`		`- IntlTestHelper::requireIntl($this, false);`
	`25`	`+ IntlTestHelper::requireIntl($this);`
`26`	`26`	`$this->previousLocale = \Locale::getDefault();`
`27`	`27`	`parent::setUp();`
`28`	`28`	`}`