Merge branch '3.4' into 4.3

* 3.4:
  [HttpKernel] fix wrong removal of the just generated container dir
This commit is contained in:
Fabien Potencier 2019-10-20 14:37:59 +02:00
commit 5ce78ccbe1

View File

@ -754,7 +754,7 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
$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);
}