Skip to content

Commit f4e96fe

Browse files
committed
bug #25255 [Console][DI] Fail gracefully (nicolas-grekas)
This PR was merged into the 3.4 branch. Discussion ---------- [Console][DI] Fail gracefully | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony/flex#212, #25280 | License | MIT | Doc PR | - I already experienced this issue a few times without spending time digging it: sometimes, you call `cache:clear`, and the command quits without any output, and with 255 status code. The reason is the `@include` in `Kernel`, which makes everything silent, especially fatal errors (thanks PHP...) So if the to-be-removed container is broken for some fatal reason, the failure is really bad. To fix that, here are two measures: - use `include_once` instead of `require_once` in the dumped container: that's OK there to actually not immediately load the file, any hard failure will happen later anyway, and any soft failure will allow the `cache:clear` command to complete (like when you remove a package) - register `Application::renderException()` as the main PHP exception handler, via `Debug::ErrorHandler` when it's available End result when it fails: ![image](https://user-images.githubusercontent.com/243674/33494543-e1d07202-d6c3-11e7-9677-bc2ae72fbba9.png) instead of a blank output. Commits ------- 4a5a3f52ab [Console][DI] Fail gracefully
2 parents 6fcdb3f + 1b2a3f8 commit f4e96fe

File tree

5 files changed

+29
-21
lines changed

5 files changed

+29
-21
lines changed

Dumper/PhpDumper.php

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,12 +217,16 @@ public function dump(array $options = array())
217217
{$namespaceLine}
218218
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
219219
220-
if (!class_exists(\\Container{$hash}\\{$options['class']}::class, false)) {
221-
require __DIR__.'/Container{$hash}/{$options['class']}.php';
220+
if (\\class_exists(\\Container{$hash}\\{$options['class']}::class, false)) {
221+
// no-op
222+
} elseif (!include __DIR__.'/Container{$hash}/{$options['class']}.php') {
223+
touch(__DIR__.'/Container{$hash}.legacy');
224+
225+
return;
222226
}
223227
224-
if (!class_exists({$options['class']}::class, false)) {
225-
class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
228+
if (!\\class_exists({$options['class']}::class, false)) {
229+
\\class_alias(\\Container{$hash}\\{$options['class']}::class, {$options['class']}::class, false);
226230
}
227231
228232
return new \\Container{$hash}\\{$options['class']}();
@@ -428,13 +432,13 @@ private function addServiceInclude($cId, Definition $definition, \SplObjectStora
428432
}
429433

430434
foreach (array_diff_key(array_flip($lineage), $this->inlinedRequires) as $file => $class) {
431-
$code .= sprintf(" require_once %s;\n", $file);
435+
$code .= sprintf(" include_once %s;\n", $file);
432436
}
433437
}
434438

435439
foreach ($inlinedDefinitions as $def) {
436440
if ($file = $def->getFile()) {
437-
$code .= sprintf(" require_once %s;\n", $this->dumpValue($file));
441+
$code .= sprintf(" include_once %s;\n", $this->dumpValue($file));
438442
}
439443
}
440444

@@ -1233,7 +1237,7 @@ private function addInlineRequires()
12331237
foreach ($lineage as $file) {
12341238
if (!isset($this->inlinedRequires[$file])) {
12351239
$this->inlinedRequires[$file] = true;
1236-
$code .= sprintf(" require_once %s;\n", $file);
1240+
$code .= sprintf(" include_once %s;\n", $file);
12371241
}
12381242
}
12391243

Tests/Fixtures/php/services9.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ protected function getLazyContextIgnoreInvalidRefService()
297297
*/
298298
protected function getMethodCall1Service()
299299
{
300-
require_once '%path%foo.php';
300+
include_once '%path%foo.php';
301301

302302
$this->services['method_call1'] = $instance = new \Bar\FooClass();
303303

Tests/Fixtures/php/services9_as_files.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
200200
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
201201
// Returns the public 'method_call1' shared service.
202202

203-
require_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
203+
include_once ($this->targetDirs[0].'/Fixtures/includes/foo.php');
204204

205205
$this->services['method_call1'] = $instance = new \Bar\FooClass();
206206

@@ -473,12 +473,16 @@ class ProjectServiceContainer extends Container
473473

474474
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
475475

476-
if (!class_exists(\Container%s\ProjectServiceContainer::class, false)) {
477-
require __DIR__.'/Container%s/ProjectServiceContainer.php';
476+
if (\class_exists(\Container%s\ProjectServiceContainer::class, false)) {
477+
// no-op
478+
} elseif (!include __DIR__.'/Container%s/ProjectServiceContainer.php') {
479+
touch(__DIR__.'/Container%s.legacy');
480+
481+
return;
478482
}
479483

480-
if (!class_exists(ProjectServiceContainer::class, false)) {
481-
class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
484+
if (!\class_exists(ProjectServiceContainer::class, false)) {
485+
\class_alias(\Container%s\ProjectServiceContainer::class, ProjectServiceContainer::class, false);
482486
}
483487

484488
return new \Container%s\ProjectServiceContainer();

Tests/Fixtures/php/services9_compiled.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function getLazyContextIgnoreInvalidRefService()
309309
*/
310310
protected function getMethodCall1Service()
311311
{
312-
require_once '%path%foo.php';
312+
include_once '%path%foo.php';
313313

314314
$this->services['method_call1'] = $instance = new \Bar\FooClass();
315315

Tests/Fixtures/php/services_inline_requires.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ public function __construct()
4646

4747
$this->aliases = array();
4848

49-
require_once $this->targetDirs[1].'/includes/HotPath/I1.php';
50-
require_once $this->targetDirs[1].'/includes/HotPath/P1.php';
51-
require_once $this->targetDirs[1].'/includes/HotPath/T1.php';
52-
require_once $this->targetDirs[1].'/includes/HotPath/C1.php';
49+
include_once $this->targetDirs[1].'/includes/HotPath/I1.php';
50+
include_once $this->targetDirs[1].'/includes/HotPath/P1.php';
51+
include_once $this->targetDirs[1].'/includes/HotPath/T1.php';
52+
include_once $this->targetDirs[1].'/includes/HotPath/C1.php';
5353
}
5454

5555
public function getRemovedIds()
@@ -105,8 +105,8 @@ protected function getC1Service()
105105
*/
106106
protected function getC2Service()
107107
{
108-
require_once $this->targetDirs[1].'/includes/HotPath/C2.php';
109-
require_once $this->targetDirs[1].'/includes/HotPath/C3.php';
108+
include_once $this->targetDirs[1].'/includes/HotPath/C2.php';
109+
include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
110110

111111
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 ?: '_'});
112112
}
@@ -118,7 +118,7 @@ protected function getC2Service()
118118
*/
119119
protected function getC3Service()
120120
{
121-
require_once $this->targetDirs[1].'/includes/HotPath/C3.php';
121+
include_once $this->targetDirs[1].'/includes/HotPath/C3.php';
122122

123123
return $this->services['Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3();
124124
}

0 commit comments

Comments
 (0)