bug #37953 [DI] fix dumping lazy non-shared services (nicolas-grekas)

fabpot · fabpot · commit 885390fbaf95 · 2020-08-26T11:10:33.000+02:00
This PR was merged into the 5.1 branch. Discussion ---------- [DI] fix dumping lazy non-shared services | Q | A | ------------- | --- | Branch? | 5.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #37665 | License | MIT | Doc PR | - Commits ------- a4f4ca7 [DI] fix dumping lazy non-shared services
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -886,6 +886,7 @@ protected function {$methodName}($lazyInitialization)
         if ($asFile) {
             $code = str_replace('$this', '$container', $code);
             $code = str_replace('function () {', 'function () use ($container) {', $code);
+            $code = str_replace('function ($lazyLoad = true) {', 'function ($lazyLoad = true) use ($container) {', $code);
         }
 
         $code .= "    }\n";
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy_as_files.txt
@@ -30,7 +30,7 @@ class getNonSharedFooService extends ProjectServiceContainer
     {
         include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';
 
-        $container->factories['non_shared_foo'] = function ($lazyLoad = true) {
+        $container->factories['non_shared_foo'] = function ($lazyLoad = true) use ($container) {
             return new \Bar\FooLazyClass();
         };
 

Original file line number	Diff line number	Diff line change
`@@ -886,6 +886,7 @@ protected function {$methodName}($lazyInitialization)`
`886`	`886`	`if ($asFile) {`
`887`	`887`	`$code = str_replace('$this', '$container', $code);`
`888`	`888`	`$code = str_replace('function () {', 'function () use ($container) {', $code);`
	`889`	`+ $code = str_replace('function ($lazyLoad = true) {', 'function ($lazyLoad = true) use ($container) {', $code);`
`889`	`890`	`}`
`890`	`891`
`891`	`892`	`$code .= " }\n";`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class getNonSharedFooService extends ProjectServiceContainer`
`30`	`30`	`{`
`31`	`31`	`include_once $container->targetDir.''.'/Fixtures/includes/foo_lazy.php';`
`32`	`32`
`33`		`- $container->factories['non_shared_foo'] = function ($lazyLoad = true) {`
	`33`	`+ $container->factories['non_shared_foo'] = function ($lazyLoad = true) use ($container) {`
`34`	`34`	`return new \Bar\FooLazyClass();`
`35`	`35`	`};`
`36`	`36`