[Kernel+DIC] Fixed as_files behavior

lyrixx · lyrixx · commit 4ab8996119f4 · 2019-07-01T15:52:49.000+02:00
Many issue about this:

* Kernel does not handle when the dumper returns a string
* Kernel does not handle when the compiled Container file does not
return a new instance of itself
* Kernel try to old load and clean old container, but if the container
does not change its name, it tries to load 2 time the same file, and so
the same class

This patch fixed all theses case. Now we can use with ease a multifiles
container or a simple unique file.
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -572,18 +572,25 @@ protected function getContainerBaseClass()
      */
     protected function initializeContainer()
     {
+        $asFiles = true;
         $class = $this->getContainerClass();
         $cacheDir = $this->warmupDir ?: $this->getCacheDir();
         $cache = new ConfigCache($cacheDir.'/'.$class.'.php', $this->debug);
         $oldContainer = null;
         if ($fresh = $cache->isFresh()) {
+            if (!$asFiles) {
+                require_once $cache->getPath();
+                $this->container = new $class();
+                $this->container->set('kernel', $this);
+
+                return;
+            }
             // 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;
             try {
                 if (file_exists($cache->getPath()) && \is_object($this->container = include $cache->getPath())) {
                     $this->container->set('kernel', $this);
-                    $oldContainer = $this->container;
                     $fresh = true;
                 }
             } catch (\Throwable $e) {
@@ -634,6 +641,10 @@ protected function initializeContainer()
         try {
             $container = null;
             $container = $this->buildContainer();
+            $container->getParameterBag()->add([
+                'container.build_id' => 'static',
+                'container.as_files' => $asFiles,
+            ]);
             $container->compile();
         } finally {
             if ($this->debug && true !== $previousHandler) {
@@ -657,7 +668,12 @@ protected function initializeContainer()
         $oldContainer = \is_object($oldContainer) ? new \ReflectionClass($oldContainer) : false;
 
         $this->dumpContainer($cache, $container, $class, $this->getContainerBaseClass());
-        $this->container = require $cache->getPath();
+        if ($asFiles) {
+            $this->container = require $cache->getPath();
+        } else {
+            require $cache->getPath();
+            $this->container = new $class();
+        }
         $this->container->set('kernel', $this);
 
         if ($oldContainer && \get_class($this->container) !== $oldContainer->name) {
@@ -848,23 +864,27 @@ protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container
             'class' => $class,
             'base_class' => $baseClass,
             'file' => $cache->getPath(),
-            'as_files' => true,
+            'as_files' => $container->hasParameter('container.as_files') ? $container->getParameter('container.as_files') : true,
             'debug' => $this->debug,
             'inline_class_loader_parameter' => \PHP_VERSION_ID >= 70000 && !$this->loadClassCache && !class_exists(ClassCollectionLoader::class, false) ? 'container.dumper.inline_class_loader' : null,
             'build_time' => $container->hasParameter('kernel.container_build_time') ? $container->getParameter('kernel.container_build_time') : time(),
         ]);
 
-        $rootCode = array_pop($content);
-        $dir = \dirname($cache->getPath()).'/';
-        $fs = new Filesystem();
+        if (\is_array($content)) {
+            $rootCode = array_pop($content);
+            $dir = \dirname($cache->getPath()).'/';
+            $fs = new Filesystem();
 
-        foreach ($content as $file => $code) {
-            $fs->dumpFile($dir.$file, $code);
-            @chmod($dir.$file, 0666 & ~umask());
-        }
-        $legacyFile = \dirname($dir.$file).'.legacy';
-        if (file_exists($legacyFile)) {
-            @unlink($legacyFile);
+            foreach ($content as $file => $code) {
+                $fs->dumpFile($dir.$file, $code);
+                @chmod($dir.$file, 0666 & ~umask());
+            }
+            $legacyFile = \dirname($dir.$file).'.legacy';
+            if (file_exists($legacyFile)) {
+                @unlink($legacyFile);
+            }
+        } else {
+            $rootCode = $content;
         }
 
         $cache->write($rootCode, $container->getResources());
