bug #48931 [DependencyInjection] Fix dumping inlined withers (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c3f17ac5332b · 2023-01-09T20:36:56.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] Fix dumping inlined withers | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48814 | License | MIT | Doc PR | - Commits ------- 455ace0 [DependencyInjection] Fix dumping inlined withers
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -754,7 +754,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN
             $witherAssignation = '';
 
             if ($call[2] ?? false) {
-                if (null !== $sharedNonLazyId && $lastWitherIndex === $k) {
+                if (null !== $sharedNonLazyId && $lastWitherIndex === $k && 'instance' === $variableName) {
                     $witherAssignation = sprintf('$this->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);
                 }
                 $witherAssignation .= sprintf('$%s = ', $variableName);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -1439,7 +1439,8 @@ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheSer
     public function testWither()
     {
         $container = new ContainerBuilder();
-        $container->register(Foo::class);
+        $container->register(Foo::class)
+            ->setAutowired(true);
 
         $container
             ->register('wither', Wither::class)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -17,6 +17,14 @@
 
 class Foo
 {
+    /**
+     * @required
+     * @return static
+     */
+    public function cloneFoo()
+    {
+        return clone $this;
+    }
 }
 
 class Bar
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_wither.php
@@ -55,6 +55,7 @@ protected function getWitherService()
         $instance = new \Symfony\Component\DependencyInjection\Tests\Compiler\Wither();
 
         $a = new \Symfony\Component\DependencyInjection\Tests\Compiler\Foo();
+        $a = $a->cloneFoo();
 
         $instance = $instance->withFoo1($a);
         $this->services['wither'] = $instance = $instance->withFoo2($a);

Original file line number	Diff line number	Diff line change
`@@ -754,7 +754,7 @@ private function addServiceMethodCalls(Definition $definition, string $variableN`
`754`	`754`	`$witherAssignation = '';`
`755`	`755`
`756`	`756`	`if ($call[2] ?? false) {`
`757`		`- if (null !== $sharedNonLazyId && $lastWitherIndex === $k) {`
	`757`	`+ if (null !== $sharedNonLazyId && $lastWitherIndex === $k && 'instance' === $variableName) {`
`758`	`758`	`$witherAssignation = sprintf('$this->%s[\'%s\'] = ', $definition->isPublic() ? 'services' : 'privates', $sharedNonLazyId);`
`759`	`759`	`}`
`760`	`760`	`$witherAssignation .= sprintf('$%s = ', $variableName);`
Original file line number	Diff line number	Diff line change
`@@ -1439,7 +1439,8 @@ public function testAliasCanBeFoundInTheDumpedContainerWhenBothTheAliasAndTheSer`
`1439`	`1439`	`public function testWither()`
`1440`	`1440`	`{`
`1441`	`1441`	`$container = new ContainerBuilder();`
`1442`		`- $container->register(Foo::class);`
	`1442`	`+ $container->register(Foo::class)`
	`1443`	`+ ->setAutowired(true);`
`1443`	`1444`
`1444`	`1445`	`$container`
`1445`	`1446`	`->register('wither', Wither::class)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@`
`17`	`17`
`18`	`18`	`class Foo`
`19`	`19`	`{`
	`20`	`+ /**`
	`21`	`+ * @required`
	`22`	`+ * @return static`
	`23`	`+ */`
	`24`	`+ public function cloneFoo()`
	`25`	`+ {`
	`26`	`+ return clone $this;`
	`27`	`+ }`
`20`	`28`	`}`
`21`	`29`
`22`	`30`	`class Bar`