[DI] fix synthetic services in ResolveNoPreloadPass

nicolas-grekas · nicolas-grekas · commit b2d1ec5d34cf · 2020-04-29T19:41:01.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
@@ -48,7 +48,7 @@ public function process(ContainerBuilder $container)
             }
 
             foreach ($container->getAliases() as $alias) {
-                if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->has($id)) {
+                if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->hasDefinition($id)) {
                     $this->resolvedIds[$id] = true;
                     $this->processValue($container->getDefinition($id), true);
                 }
@@ -72,8 +72,8 @@ public function process(ContainerBuilder $container)
      */
     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 ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->hasDefinition($id = (string) $value)) {
+            $definition = $this->container->getDefinition($id);
 
             if (!isset($this->resolvedIds[$id]) && (!$definition->isPublic() || $definition->isPrivate())) {
                 $this->resolvedIds[$id] = true;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function process(ContainerBuilder $container)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`foreach ($container->getAliases() as $alias) {`
`51`		`- if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->has($id)) {`
	`51`	`+ if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->hasDefinition($id)) {`
`52`	`52`	`$this->resolvedIds[$id] = true;`
`53`	`53`	`$this->processValue($container->getDefinition($id), true);`
`54`	`54`	`}`
`@@ -72,8 +72,8 @@ public function process(ContainerBuilder $container)`
`72`	`72`	`*/`
`73`	`73`	`protected function processValue($value, bool $isRoot = false)`
`74`	`74`	`{`
`75`		`- if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->has($id = (string) $value)) {`
`76`		`- $definition = $this->container->findDefinition($id);`
	`75`	`+ if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->hasDefinition($id = (string) $value)) {`
	`76`	`+ $definition = $this->container->getDefinition($id);`
`77`	`77`
`78`	`78`	`if (!isset($this->resolvedIds[$id]) && (!$definition->isPublic() \|\| $definition->isPrivate())) {`
`79`	`79`	`$this->resolvedIds[$id] = true;`