bug #36548 [DI] fix lazy factory code generation (nicolas-grekas)

fabpot · fabpot · commit 69452b22c285 · 2020-04-24T11:16:27.000+02:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [DI] fix lazy factory code generation | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36547 | License | MIT | Doc PR | - Commits ------- 7d55151 [DI] fix lazy factory code generation
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -851,7 +851,8 @@ protected function {$methodName}($lazyInitialization)
 
             if ($this->getProxyDumper()->isProxyCandidate($definition)) {
                 $factoryCode = $asFile ? "\$this->load('%s', false)" : '$this->%s(false)';
-                $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));
+                $factoryCode = $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));
+                $code .= $asFile ? preg_replace('/function \(([^)]*+)\) {/', 'function (\1) use ($container) {', $factoryCode) : $factoryCode;
             }
 
             $code .= $this->addServiceInclude($id, $definition);

Original file line number	Diff line number	Diff line change
`@@ -851,7 +851,8 @@ protected function {$methodName}($lazyInitialization)`
`851`	`851`
`852`	`852`	`if ($this->getProxyDumper()->isProxyCandidate($definition)) {`
`853`	`853`	`$factoryCode = $asFile ? "\$this->load('%s', false)" : '$this->%s(false)';`
`854`		`- $code .= $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));`
	`854`	`+ $factoryCode = $this->getProxyDumper()->getProxyFactoryCode($definition, $id, sprintf($factoryCode, $methodName));`
	`855`	`+ $code .= $asFile ? preg_replace('/function \(([^)]*+)\) {/', 'function (\1) use ($container) {', $factoryCode) : $factoryCode;`
`855`	`856`	`}`
`856`	`857`
`857`	`858`	`$code .= $this->addServiceInclude($id, $definition);`