Simplified code

lyrixx · lyrixx · commit e726221fc2c1 · 2019-07-08T17:32:30.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -484,10 +484,10 @@ protected function initializeContainer()
         $cacheDir = $this->warmupDir ?: $this->getCacheDir();
         $cache = new ConfigCache($cacheDir.'/'.$class.'.php', $this->debug);
         $oldContainer = null;
-        if ($fresh = $cache->isFresh()) {
+        if ($cache->isFresh()) {
             // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors
             $errorLevel = error_reporting(\E_ALL ^ \E_WARNING);
-            $fresh = $oldContainer = false;
+            $oldContainer = false;
             try {
                 if (!$asFiles) {
                     require_once $cache->getPath();
@@ -498,19 +498,15 @@ protected function initializeContainer()
                 }
                 if (file_exists($cache->getPath()) && \is_object($this->container = include $cache->getPath())) {
                     $this->container->set('kernel', $this);
-                    $oldContainer = $this->container;
-                    $fresh = true;
+
+                    return;
                 }
             } catch (\Throwable $e) {
             } finally {
                 error_reporting($errorLevel);
             }
         }
 
-        if ($fresh) {
-            return;
-        }
-
         if ($this->debug) {
             $collectedLogs = [];
             $previousHandler = \defined('PHPUNIT_COMPOSER_INSTALL');
