bug #44063 [DependencyInjection] fix creating 2nd container instances (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit feb75f31f0d8 · 2021-11-15T21:32:32.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [DependencyInjection] fix creating 2nd container instances | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #44062 | License | MIT | Doc PR | - Commits ------- 2658fed [DependencyInjection] fix creating 2nd container instances
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1485,7 +1485,7 @@ private function addInlineRequires(bool $hasProxyClasses): string
         }
 
         if ($hasProxyClasses) {
-            $code .= "\n            include __DIR__.'/proxy-classes.php';";
+            $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
         return $code ? sprintf("\n        \$this->privates['service_container'] = function () {%s\n        };\n", $code) : '';
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
@@ -60,7 +60,7 @@ class ProjectServiceContainer extends Container
         $this->aliases = [];
 
         $this->privates['service_container'] = function () {
-            include __DIR__.'/proxy-classes.php';
+            include_once __DIR__.'/proxy-classes.php';
         };
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1485,7 +1485,7 @@ private function addInlineRequires(bool $hasProxyClasses): string`
`1485`	`1485`	`}`
`1486`	`1486`
`1487`	`1487`	`if ($hasProxyClasses) {`
`1488`		`- $code .= "\n include __DIR__.'/proxy-classes.php';";`
	`1488`	`+ $code .= "\n include_once __DIR__.'/proxy-classes.php';";`
`1489`	`1489`	`}`
`1490`	`1490`
`1491`	`1491`	`return $code ? sprintf("\n \$this->privates['service_container'] = function () {%s\n };\n", $code) : '';`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class ProjectServiceContainer extends Container`
`60`	`60`	`$this->aliases = [];`
`61`	`61`
`62`	`62`	`$this->privates['service_container'] = function () {`
`63`		`- include __DIR__.'/proxy-classes.php';`
	`63`	`+ include_once __DIR__.'/proxy-classes.php';`
`64`	`64`	`};`
`65`	`65`	`}`
`66`	`66`