minor #61103 Fix various bool-type coercions (Girgias)

nicolas-grekas · nicolas-grekas · commit 5d66ccaf2e31 · 2025-07-15T14:03:16.000+02:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- Fix various bool-type coercions | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no  | Issues | | License | MIT This is cherry-picking some of the commits from #60890 which are basically bugs. Not sure what the commit naming policy is so do let me know if you want me to manually rebase and rename commits following some guidelines. Commits ------- b3d30e3 Fix various bool-type coercions
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -123,7 +123,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();
 
@@ -145,7 +145,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
@@ -198,6 +198,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
@@ -1125,7 +1125,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);
                 }
             }
@@ -1142,7 +1142,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
@@ -542,7 +542,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)) {
@@ -589,12 +589,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
@@ -20,7 +20,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
@@ -20,7 +20,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
@@ -21,7 +21,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
@@ -21,7 +21,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
@@ -20,7 +20,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
@@ -143,7 +143,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/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'] ?? '';
 

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,8 @@ private function assertDirectorySame($expected, $current)`
`198`	`198`	`}`
`199`	`199`	`$currentFiles[substr($file->getPathname(), \strlen($current))] = $file->getPathname();`
`200`	`200`	`}`
	`201`	`+ ksort($expectedFiles);`
	`202`	`+ ksort($currentFiles);`
`201`	`203`
`202`	`204`	`$this->assertSame(array_keys($expectedFiles), array_keys($currentFiles));`
`203`	`205`	`foreach ($expectedFiles as $fileName => $filePath) {`
Original file line number	Diff line number	Diff line change
`@@ -1125,7 +1125,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1125`	`1125`	`if (!$definition->isDeprecated() && \is_array($factory) && \is_string($factory[0])) {`
`1126`	`1126`	`$r = new \ReflectionClass($factory[0]);`
`1127`	`1127`
`1128`		`- if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
	`1128`	`+ if (0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {`
`1129`	`1129`	`trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name);`
`1130`	`1130`	`}`
`1131`	`1131`	`}`
`@@ -1142,7 +1142,7 @@ private function createService(Definition $definition, array &$inlineServices, b`
`1142`	`1142`	`$service = $r->getConstructor() ? $r->newInstanceArgs($arguments) : $r->newInstance();`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`		`- if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {`
	`1145`	`+ if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment() ?: '', "\n * @deprecated ")) {`
`1146`	`1146`	`trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);`
`1147`	`1147`	`}`
`1148`	`1148`	`}`
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
`@@ -20,7 +20,7 @@ class CountryTypeTest extends BaseTypeTestCase`
`20`	`20`
`21`	`21`	`protected function setUp(): void`
`22`	`22`	`{`
`23`		`- IntlTestHelper::requireIntl($this, false);`
	`23`	`+ IntlTestHelper::requireIntl($this);`
`24`	`24`
`25`	`25`	`parent::setUp();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class CurrencyTypeTest extends BaseTypeTestCase`
`20`	`20`
`21`	`21`	`protected function setUp(): void`
`22`	`22`	`{`
`23`		`- IntlTestHelper::requireIntl($this, false);`
	`23`	`+ IntlTestHelper::requireIntl($this);`
`24`	`24`
`25`	`25`	`parent::setUp();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class IntegerTypeTest extends BaseTypeTestCase`
`21`	`21`
`22`	`22`	`protected function setUp(): void`
`23`	`23`	`{`
`24`		`- IntlTestHelper::requireIntl($this, false);`
	`24`	`+ IntlTestHelper::requireIntl($this);`
`25`	`25`	`$this->previousLocale = \Locale::getDefault();`
`26`	`26`	`parent::setUp();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class LanguageTypeTest 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`	`}`