[DI] Fix dumping Doctrine-like service graphs (bis)

nicolas-grekas · nicolas-grekas · commit ff3d5eea2c90 · 2019-02-06T19:04:48.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -661,7 +661,6 @@ private function addService($id, Definition $definition, &$file = null)
         $autowired = $definition->isAutowired() ? ' autowired' : '';
 
         if ($definition->isLazy()) {
-            unset($this->circularReferences[$id]);
             $lazyInitialization = '$lazyLoad = true';
         } else {
             $lazyInitialization = '';
@@ -807,11 +806,13 @@ private function addInlineService($id, Definition $definition, Definition $inlin
 
             if ('instance' === $name) {
                 $code .= $this->addServiceInstance($id, $definition, $isSimpleInstance);
+                $forConstructor = false;
             } else {
                 $code .= $this->addNewInstance($inlineDef, '$'.$name, ' = ', $id);
+                $forConstructor = $forConstructor && $this->proxyDumper instanceof NullDumper && $this->container->getDefinition($id)->isLazy();
             }
 
-            if ('' !== $inline = $this->addInlineVariables($id, $definition, $arguments, false)) {
+            if ('' !== $inline = $this->addInlineVariables($id, $definition, $arguments, $forConstructor)) {
                 $code .= "\n".$inline."\n";
             } elseif ($arguments && 'instance' === $name) {
                 $code .= "\n";
