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

nicolas-grekas · nicolas-grekas · commit 7abed483c2ab · 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 &lt;!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md --&gt;
| 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
-------

b3d30e3b60e Fix various bool-type coercions
diff --git a/ContainerBuilder.php b/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/Dumper/PhpDumper.php b/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/Loader/XmlFileLoader.php b/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');

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');`