bug #22261 [Console] Give errors back to error handler if not handled by console.error listeners (chalasr)

fabpot · fabpot · commit 6e54cdf8558e · 2017-04-04T08:00:37.000-07:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [Console] Give errors back to error handler if not handled by console.error listeners | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22259 | License | MIT | Doc PR | n/a Re-throws errors if `ConsoleErrorEvent::markErrorAsHandled()` hasn't been called so that they can reach the global error handler, fixing the BC break. Commits ------- 5a5bf54 [Console] Give errors back to error handlers if not handled by console.error listeners
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -138,6 +138,9 @@ public function run(InputInterface $input = null, OutputInterface $output = null
                 $e = null;
                 $exitCode = 0;
             } else {
+                if (!$e instanceof \Exception) {
+                    throw $e;
+                }
                 $exitCode = $e->getCode();
             }
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -1116,6 +1116,30 @@ public function testRunWithError()
         $tester->run(array('command' => 'dym'));
     }
 
+    /**
+     * @requires PHP 7
+     */
+    public function testErrorIsRethrownIfNotHandledByConsoleErrorEvent()
+    {
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setDispatcher(new EventDispatcher());
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            new \UnknownClass();
+        });
+
+        $tester = new ApplicationTester($application);
+
+        try {
+            $tester->run(array('command' => 'dym'));
+            $this->fail('->run() should rethrow PHP errors if not handled via ConsoleErrorEvent.');
+        } catch (\Throwable $e) {
+            $this->assertInstanceOf('Error', $e);
+            $this->assertSame($e->getMessage(), 'Class \'UnknownClass\' not found');
+        }
+    }
+
     /**
      * @expectedException        \LogicException
      * @expectedExceptionMessage error

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ public function run(InputInterface $input = null, OutputInterface $output = null`
`138`	`138`	`$e = null;`
`139`	`139`	`$exitCode = 0;`
`140`	`140`	`} else {`
	`141`	`+ if (!$e instanceof \Exception) {`
	`142`	`+ throw $e;`
	`143`	`+ }`
`141`	`144`	`$exitCode = $e->getCode();`
`142`	`145`	`}`
`143`	`146`