bug #48971 [DependencyInjection] Fix dump order of inlined deps (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit dd23b8b6dec2 · 2023-01-13T09:01:54.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] Fix dump order of inlined deps | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #48895 | License | MIT | Doc PR | - Fix confirmed on the provided reproducers. The updated fixture makes more sense also. Commits ------- 1d01452 [DependencyInjection] Fix dump order of inlined deps
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -497,7 +497,7 @@ private function collectCircularReferences(string $sourceId, array $edges, array
                             $loop = [];
                         }
                     }
-                    $this->addCircularReferences($first, $loop, true);
+                    $this->addCircularReferences($first, $loop, $loopByConstructor);
                     break;
                 }
             }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_almost_circular_private.php
@@ -421,17 +421,16 @@ protected function getMonologInline_LoggerService()
      */
     protected function getPAService()
     {
-        $a = new \stdClass();
-
-        $b = ($this->privates['pC'] ?? $this->getPCService());
+        $a = ($this->privates['pC'] ?? $this->getPCService());
 
         if (isset($this->services['pA'])) {
             return $this->services['pA'];
         }
+        $b = new \stdClass();
 
-        $this->services['pA'] = $instance = new \stdClass($a, $b);
+        $this->services['pA'] = $instance = new \stdClass($b, $a);
 
-        $a->d = ($this->privates['pD'] ?? $this->getPDService());
+        $b->d = ($this->privates['pD'] ?? $this->getPDService());
 
         return $instance;
     }

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ private function collectCircularReferences(string $sourceId, array $edges, array`
`497`	`497`	`$loop = [];`
`498`	`498`	`}`
`499`	`499`	`}`
`500`		`- $this->addCircularReferences($first, $loop, true);`
	`500`	`+ $this->addCircularReferences($first, $loop, $loopByConstructor);`
`501`	`501`	`break;`
`502`	`502`	`}`
`503`	`503`	`}`
Original file line number	Diff line number	Diff line change
`@@ -421,17 +421,16 @@ protected function getMonologInline_LoggerService()`
`421`	`421`	`*/`
`422`	`422`	`protected function getPAService()`
`423`	`423`	`{`
`424`		`- $a = new \stdClass();`
`425`		`-`
`426`		`- $b = ($this->privates['pC'] ?? $this->getPCService());`
	`424`	`+ $a = ($this->privates['pC'] ?? $this->getPCService());`
`427`	`425`
`428`	`426`	`if (isset($this->services['pA'])) {`
`429`	`427`	`return $this->services['pA'];`
`430`	`428`	`}`
	`429`	`+ $b = new \stdClass();`
`431`	`430`
`432`		`- $this->services['pA'] = $instance = new \stdClass($a, $b);`
	`431`	`+ $this->services['pA'] = $instance = new \stdClass($b, $a);`
`433`	`432`
`434`		`- $a->d = ($this->privates['pD'] ?? $this->getPDService());`
	`433`	`+ $b->d = ($this->privates['pD'] ?? $this->getPDService());`
`435`	`434`
`436`	`435`	`return $instance;`
`437`	`436`	`}`