[DependencyInjection] Fix resolving parameters when dumping lazy proxies

nicolas-grekas · nicolas-grekas · commit 123d453261ed · 2022-12-28T15:43:49.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -2265,11 +2265,6 @@ private function isProxyCandidate(Definition $definition, ?bool &$asGhostObject,
             return null;
         }
 
-        $bag = $this->container->getParameterBag();
-        $definition = (clone $definition)
-            ->setClass($bag->resolveValue($definition->getClass()))
-            ->setTags(($definition->hasTag('proxy') ? ['proxy' => $bag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags());
-
         return $this->getProxyDumper()->isProxyCandidate($definition, $asGhostObject, $id) ? $definition : null;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -35,6 +35,8 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $
 
     /**
      * Generates the code for the lazy proxy.
+     *
+     * @param string|null $id
      */
     public function getProxyCode(Definition $definition/* , string $id = null */): string;
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -281,9 +281,8 @@ public function testDumpAsFilesWithLazyFactoriesInlined()
         $container = new ContainerBuilder();
         $container->setParameter('container.dumper.inline_factories', true);
         $container->setParameter('container.dumper.inline_class_loader', true);
-        $container->setParameter('lazy_foo_class', \Bar\FooClass::class);
 
-        $container->register('lazy_foo', '%lazy_foo_class%')
+        $container->register('lazy_foo', \Bar\FooClass::class)
             ->addArgument(new Definition(\Bar\FooLazyClass::class))
             ->setPublic(true)
             ->setLazy(true);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -73,7 +73,7 @@ class ProjectServiceContainer extends Container
     /**
      * Gets the public 'lazy_foo' shared service.
      *
-     * @return object A %lazy_foo_class% instance
+     * @return \Bar\FooClass
      */
     protected function getLazyFooService($lazyLoad = true)
     {
@@ -145,7 +145,6 @@ class ProjectServiceContainer extends Container
         return [
             'container.dumper.inline_factories' => true,
             'container.dumper.inline_class_loader' => true,
-            'lazy_foo_class' => 'Bar\\FooClass',
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2265,11 +2265,6 @@ private function isProxyCandidate(Definition $definition, ?bool &$asGhostObject,`
`2265`	`2265`	`return null;`
`2266`	`2266`	`}`
`2267`	`2267`
`2268`		`- $bag = $this->container->getParameterBag();`
`2269`		`- $definition = (clone $definition)`
`2270`		`- ->setClass($bag->resolveValue($definition->getClass()))`
`2271`		`- ->setTags(($definition->hasTag('proxy') ? ['proxy' => $bag->resolveValue($definition->getTag('proxy'))] : []) + $definition->getTags());`
`2272`		`-`
`2273`	`2268`	`return $this->getProxyDumper()->isProxyCandidate($definition, $asGhostObject, $id) ? $definition : null;`
`2274`	`2269`	`}`
`2275`	`2270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public function getProxyFactoryCode(Definition $definition, string $id, string $`
`35`	`35`
`36`	`36`	`/**`
`37`	`37`	`* Generates the code for the lazy proxy.`
	`38`	`+ *`
	`39`	`+ * @param string\|null $id`
`38`	`40`	`*/`
`39`	`41`	`public function getProxyCode(Definition $definition/* , string $id = null */): string;`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ class ProjectServiceContainer extends Container`
`73`	`73`	`/**`
`74`	`74`	`* Gets the public 'lazy_foo' shared service.`
`75`	`75`	`*`
`76`		`- * @return object A %lazy_foo_class% instance`
	`76`	`+ * @return \Bar\FooClass`
`77`	`77`	`*/`
`78`	`78`	`protected function getLazyFooService($lazyLoad = true)`
`79`	`79`	`{`
`@@ -145,7 +145,6 @@ class ProjectServiceContainer extends Container`
`145`	`145`	`return [`
`146`	`146`	`'container.dumper.inline_factories' => true,`
`147`	`147`	`'container.dumper.inline_class_loader' => true,`
`148`		`- 'lazy_foo_class' => 'Bar\\FooClass',`
`149`	`148`	`];`
`150`	`149`	`}`
`151`	`150`	`}`