[DI] limit recursivity of ResolveNoPreloadPass

nicolas-grekas · nicolas-grekas · commit 68d41f3a9488 · 2020-04-29T16:29:53.000+02:00
diff --git a/Compiler/ResolveNoPreloadPass.php b/Compiler/ResolveNoPreloadPass.php
@@ -75,7 +75,7 @@ protected function processValue($value, bool $isRoot = false)
         if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->has($id = (string) $value)) {
             $definition = $this->container->findDefinition($id);
 
-            if (!isset($this->resolvedIds[$id])) {
+            if (!isset($this->resolvedIds[$id]) && (!$definition->isPublic() || $definition->isPrivate())) {
                 $this->resolvedIds[$id] = true;
                 $this->processValue($definition, true);
             }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected function processValue($value, bool $isRoot = false)`
`75`	`75`	`if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->has($id = (string) $value)) {`
`76`	`76`	`$definition = $this->container->findDefinition($id);`
`77`	`77`
`78`		`- if (!isset($this->resolvedIds[$id])) {`
	`78`	`+ if (!isset($this->resolvedIds[$id]) && (!$definition->isPublic() \|\| $definition->isPrivate())) {`
`79`	`79`	`$this->resolvedIds[$id] = true;`
`80`	`80`	`$this->processValue($definition, true);`
`81`	`81`	`}`