Merge branch '6.4' into 7.2

nicolas-grekas · nicolas-grekas · commit 98c4586844c2 · 2025-06-19T16:18:11.000+02:00
* 6.4:
  [Validator] Remove comment to GitHub issue
  [Serializer] Add support for discriminator map in property normalizer
  [DependencyInjection] Fix inlining when public services are involved
  fix contracts directory name
  Fix TraceableSerializer when collected caller from array map
  [HttpClient] Limit curl's connection cache size
  [FrameworkBundle] Fix argument not provided to `add_bus_name_stamp_middleware`
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -69,6 +69,9 @@ public function process(ContainerBuilder $container): void
                     if (!$this->graph->hasNode($id)) {
                         continue;
                     }
+                    if ($definition->isPublic()) {
+                        $this->connectedIds[$id] = true;
+                    }
                     foreach ($this->graph->getNode($id)->getOutEdges() as $edge) {
                         if (isset($notInlinedIds[$edge->getSourceNode()->getId()])) {
                             $this->currentId = $id;
@@ -188,17 +191,13 @@ private function isInlineableDefinition(string $id, Definition $definition): boo
             return true;
         }
 
-        if ($definition->isPublic()) {
+        if ($definition->isPublic()
+            || $this->currentId === $id
+            || !$this->graph->hasNode($id)
+        ) {
             return false;
         }
 
-        if (!$this->graph->hasNode($id)) {
-            return true;
-        }
-
-        if ($this->currentId === $id) {
-            return false;
-        }
         $this->connectedIds[$id] = true;
 
         $srcIds = [];
