[HttpKernel] Remove old container files

nicolas-grekas · nicolas-grekas · commit 870170282ab5 · 2017-08-12T18:49:27.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -584,6 +584,11 @@ protected function initializeContainer()
                     file_put_contents($this->getCacheDir().'/'.$class.'Compiler.log', null !== $container ? implode("\n", $container->getCompiler()->getLog()) : '');
                 }
             }
+
+            if ($oldContainer = file_exists($cache->getPath()) ? @include $cache->getPath() : false) {
+                $oldContainer = new \ReflectionClass($oldContainer);
+            }
+
             $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
 
             $fresh = false;
@@ -592,7 +597,15 @@ protected function initializeContainer()
         $this->container = require $cache->getPath();
         $this->container->set('kernel', $this);
 
-        if (!$fresh && $this->container->has('cache_warmer')) {
+        if ($fresh) {
+            return;
+        }
+
+        if ($oldContainer && get_class($this->container) !== $oldContainer->name) {
+            (new Filesystem())->remove(dirname($oldContainer->getFileName()));
+        }
+
+        if ($this->container->has('cache_warmer')) {
             $this->container->get('cache_warmer')->warmUp($this->container->getParameter('kernel.cache_dir'));
         }
     }
