Merge branch '3.4' into 4.3

fabpot · fabpot · commit 5ce78ccbe17d · 2019-10-20T14:37:59.000+02:00
* 3.4:
  [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
@@ -754,7 +754,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
`@@ -754,7 +754,7 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container`
`754`	`754`	`$fs->dumpFile($dir.$file, $code);`
`755`	`755`	`@chmod($dir.$file, 0666 & ~umask());`
`756`	`756`	`}`
`757`		`- $legacyFile = \dirname($dir.$file).'.legacy';`
	`757`	`+ $legacyFile = \dirname($dir.key($content)).'.legacy';`
`758`	`758`	`if (file_exists($legacyFile)) {`
`759`	`759`	`@unlink($legacyFile);`
`760`	`760`	`}`