bug #30046 [DI] Fix dumping Doctrine-like service graphs (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5b1948e6b77e · 2019-01-30T18:48:51.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [DI] Fix dumping Doctrine-like service graphs | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #30017 #29637 #29693 | License | MIT | Doc PR | - I'm unable to provide a reproducer for this, the required service reference graph is too crazy, but that does the job :) Commits ------- ed96830 [DI] Fix dumping Doctrine-like service graphs
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -148,10 +148,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
-        if ($isReferencedByConstructor && $this->container->getDefinition($ids[0])->isLazy() && ($definition->getProperties() || $definition->getMethodCalls() || $definition->getConfigurator())) {
-            return false;
-        }
-
         return $this->container->getDefinition($ids[0])->isShared();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -661,6 +661,7 @@ private function addService($id, Definition $definition, &$file = null)
         $autowired = $definition->isAutowired() ? ' autowired' : '';
 
         if ($definition->isLazy()) {
+            unset($this->circularReferences[$id]);
             $lazyInitialization = '$lazyLoad = true';
         } else {
             $lazyInitialization = '';

Original file line number	Diff line number	Diff line change
`@@ -148,10 +148,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`148`	`148`	`return false;`
`149`	`149`	`}`
`150`	`150`
`151`		`- if ($isReferencedByConstructor && $this->container->getDefinition($ids[0])->isLazy() && ($definition->getProperties() \|\| $definition->getMethodCalls() \|\| $definition->getConfigurator())) {`
`152`		`- return false;`
`153`		`- }`
`154`		`-`
`155`	`151`	`return $this->container->getDefinition($ids[0])->isShared();`
`156`	`152`	`}`
`157`	`153`	`}`