bug #33184 [DI] fix dumping lazy proxies (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 26cc652a7986 · 2019-08-15T12:47:29.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DI] fix dumping lazy proxies | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #33181 | License | MIT | Doc PR | - Commits ------- 2ec1dd9 [DI] fix dumping lazy proxies
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -492,7 +492,7 @@ private function generateProxyClasses(): array
                 $proxyCode = substr(Kernel::stripComments($proxyCode), 5);
             }
 
-            $proxyClasses[sprintf('%s.php', explode(' ', $proxyCode, 3)[1])] = $proxyCode;
+            $proxyClasses[sprintf('%s.php', explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1])] = $proxyCode;
         }
 
         return $proxyClasses;

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ private function generateProxyClasses(): array`
`492`	`492`	`$proxyCode = substr(Kernel::stripComments($proxyCode), 5);`
`493`	`493`	`}`
`494`	`494`
`495`		`- $proxyClasses[sprintf('%s.php', explode(' ', $proxyCode, 3)[1])] = $proxyCode;`
	`495`	`+ $proxyClasses[sprintf('%s.php', explode(' ', $this->inlineRequires ? substr($proxyCode, \strlen($code)) : $proxyCode, 3)[1])] = $proxyCode;`
`496`	`496`	`}`
`497`	`497`
`498`	`498`	`return $proxyClasses;`