[Console][DI] Fail gracefully

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -217,12 +217,16 @@ public function dump(array $options = array())
 {$namespaceLine}
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 
-if (!class_exists(\\Container{$hash}\\{$options['class']}::class, false)) {
-    require __DIR__.'/Container{$hash}/{$options['class']}.php';
+if (\\class_exists(\\Container{$hash}\\{$options['class']}::class, false)) {
+    // no-op
+} elseif (!include __DIR__.'/Container{$hash}/{$options['class']}.php') {
+    touch(__DIR__.'/Container{$hash}.legacy');
+
+    return;
 }
 
-if (!class_exists({$options['class']}::class, false)) {
-    class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
+if (!\\class_exists({$options['class']}::class, false)) {
+    \\class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
 }
 
 return new \\Container{$hash}\\{$options['class']}();
@@ -428,13 +432,13 @@ private function addServiceInclude($cId, Definition $definition, \SplObjectStora
             }
 
             foreach (array_diff_key(array_flip($lineage), $this->inlinedRequires) as $file => $class) {
-                $code .= sprintf("        require_once %s;\n", $file);
+                $code .= sprintf("        include_once %s;\n", $file);
             }
         }
 
         foreach ($inlinedDefinitions as $def) {
             if ($file = $def->getFile()) {
-                $code .= sprintf("        require_once %s;\n", $this->dumpValue($file));
+                $code .= sprintf("        include_once %s;\n", $this->dumpValue($file));
             }
         }
 
@@ -1233,7 +1237,7 @@ private function addInlineRequires()
         foreach ($lineage as $file) {
             if (!isset($this->inlinedRequires[$file])) {
                 $this->inlinedRequires[$file] = true;
-                $code .= sprintf("        require_once %s;\n", $file);
+                $code .= sprintf("        include_once %s;\n", $file);
             }
         }
 

Tests/Fixtures/php/services9.php

@@ -297,7 +297,7 @@ protected function getLazyContextIgnoreInvalidRefService()
      */
     protected function getMethodCall1Service()
     {
-        require_once '%path%foo.php';
+        include_once '%path%foo.php';
 
         $this->services['method_call1'] = $instance = new \Bar\FooClass();
 

Tests/Fixtures/php/services9_as_files.txt

@@ -198,7 +198,7 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 // Returns the public 'method_call1' shared service.
 
-require_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
+include_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
 
 $this->services['method_call1'] = $instance = new \Bar\FooClass();
 
@@ -471,12 +471,16 @@ class ProjectServiceContainer extends Container
 
 // This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
 
-if (!class_exists(\Container%s\ProjectServiceContainer::class, false)) {
-    require __DIR__.'/Container%s/ProjectServiceContainer.php';
+if (\class_exists(\Container%s\ProjectServiceContainer::class, false)) {
+    // no-op
+} elseif (!include __DIR__.'/Container%s/ProjectServiceContainer.php') {
+    touch(__DIR__.'/Container%s.legacy');
+
+    return;
 }
 
-if (!class_exists(ProjectServiceContainer::class, false)) {
-    class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
+if (!\class_exists(ProjectServiceContainer::class, false)) {
+    \class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
 }
 
 return new \Container%s\ProjectServiceContainer();

Tests/Fixtures/php/services9_compiled.php

@@ -307,7 +307,7 @@ protected function getLazyContextIgnoreInvalidRefService()
      */
     protected function getMethodCall1Service()
     {
-        require_once '%path%foo.php';
+        include_once '%path%foo.php';
 
         $this->services['method_call1'] = $instance = new \Bar\FooClass();
 

Tests/Fixtures/php/services_inline_requires.php

@@ -46,10 +46,10 @@ public function __construct()
 
         $this->aliases = array();
 
-        require_once $this->targetDirs[1].'/includes/HotPath/I1.php';
-        require_once $this->targetDirs[1].'/includes/HotPath/P1.php';
-        require_once $this->targetDirs[1].'/includes/HotPath/T1.php';
-        require_once $this->targetDirs[1].'/includes/HotPath/C1.php';
+        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()
@@ -104,8 +104,8 @@ protected function getC1Service()
      */
     protected function getC2Service()
     {
-        require_once $this->targetDirs[1].'/includes/HotPath/C2.php';
-        require_once $this->targetDirs[1].'/includes/HotPath/C3.php';
+        include_once $this->targetDirs[1].'/includes/HotPath/C2.php';
+        include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
 
         return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(${($_ = isset($this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3']) ? $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3'] : $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3()) && false ?: '_'});
     }
@@ -117,7 +117,7 @@ protected function getC2Service()
      */
     protected function getC3Service()
     {
-        require_once $this->targetDirs[1].'/includes/HotPath/C3.php';
+        include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
 
         return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3();
     }