[DI] Fix initialization of legacy containers by delaying include_once

Author: nicolas-grekas

Container.php

@@ -167,6 +167,13 @@ public function setParameter($name, $value)
      */
     public function set($id, $service)
     {
+        // Runs the internal initializer; used by the dumped container to include always-needed files
+        if (isset($this->privates['service_container']) && $this->privates['service_container'] instanceof \Closure) {
+            $initialize = $this->privates['service_container'];
+            unset($this->privates['service_container']);
+            $initialize();
+        }
+
         $id = $this->normalizeId($id);
 
         if ('service_container' === $id) {

Dumper/PhpDumper.php

@@ -1243,16 +1243,16 @@ private function addInlineRequires()
             }
         }
 
-        $code = "\n";
+        $code = '';
 
         foreach ($lineage as $file) {
             if (!isset($this->inlinedRequires[$file])) {
                 $this->inlinedRequires[$file] = true;
-                $code .= sprintf("        include_once %s;\n", $file);
+                $code .= sprintf("\n            include_once %s;", $file);
             }
         }
 
-        return "\n" === $code ? '' : $code;
+        return $code ? sprintf("\n        \$this->privates['service_container'] = function () {%s\n        };\n", $code) : '';
     }
 
     /**

Tests/Fixtures/php/services_inline_requires.php

@@ -46,10 +46,12 @@ public function __construct()
 
         $this->aliases = array();
 
-        include_once $this->targetDirs[1].'/includes/HotPath/I1.php';
-        include_once $this->targetDirs[1].'/includes/HotPath/P1.php';
-        include_once $this->targetDirs[1].'/includes/HotPath/T1.php';
-        include_once $this->targetDirs[1].'/includes/HotPath/C1.php';
+        $this->privates['service_container'] = function () {
+            include_once $this->targetDirs[1].'/includes/HotPath/I1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/P1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/T1.php';
+            include_once $this->targetDirs[1].'/includes/HotPath/C1.php';
+        };
     }
 
     public function getRemovedIds()