bug #34041 [HttpKernel] fix wrong removal of the just generated container dir (nicolas-grekas)

fabpot · fabpot · commit b38bde9cb1cd · 2019-10-20T14:36:59.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [HttpKernel] fix wrong removal of the just generated container dir | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - The patch applies to 3.4 but the fix really affects to 4.4 with the introduction of the new `.preload.php` file. /cc @fabpot since you encountered this error quite often recently during `composer up/req` :) Commits ------- 4ad09eb [HttpKernel] fix wrong removal of the just generated container dir
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -868,7 +868,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             $fs->dumpFile($dir.$file, $code);
             @chmod($dir.$file, 0666 & ~umask());
         }
-        $legacyFile = \dirname($dir.$file).'.legacy';
+        $legacyFile = \dirname($dir.key($content)).'.legacy';
         if (file_exists($legacyFile)) {
             @unlink($legacyFile);
         }

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`868`	`868`	`$fs->dumpFile($dir.$file, $code);`
`869`	`869`	`@chmod($dir.$file, 0666 & ~umask());`
`870`	`870`	`}`
`871`		`- $legacyFile = \dirname($dir.$file).'.legacy';`
	`871`	`+ $legacyFile = \dirname($dir.key($content)).'.legacy';`
`872`	`872`	`if (file_exists($legacyFile)) {`
`873`	`873`	`@unlink($legacyFile);`
`874`	`874`	`}`