bug #36622 [DI] limit recursivity of ResolveNoPreloadPass (nicolas-grekas)

fabpot · fabpot · commit 75e3d757fce9 · 2020-04-29T16:34:55.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [DI] limit recursivity of ResolveNoPreloadPass | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Let's save some nesting levels, these definitions will be processed by the main loop anyway. Commits ------- 6dd52f9 [DI] limit recursivity of ResolveNoPreloadPass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php b/src/Symfony/Component/DependencyInjection/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`	`}`