[Console] fixed PHP7 Errors when not using Dispatcher

symfony · Dec 3, 2016 · 9612935 · 9612935
1 parent 5f4d8e9
commit 9612935
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -159,6 +159,8 @@ public function run(InputInterface $input = null, OutputInterface $output = null
      * @param OutputInterface $output An Output instance
      *
      * @return int 0 if everything went fine, or an error code
+     *
+     * @throws \Exception propagate the exception from `doRunCommand`
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
@@ -843,7 +845,14 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
         }
 
         if (null === $this->dispatcher) {
-            return $command->run($input, $output);
+            try {
+                return $command->run($input, $output);
+            } catch (\Exception $e) {
+                throw $e;
+            }
+            catch (\Throwable $e) {
+                throw new FatalThrowableError($e);
+            }
         }
 
         $event = new ConsoleCommandEvent($command, $input, $output);

diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -951,6 +951,25 @@ public function testRunDispatchesAllEventsWithException()
         $this->assertContains('before.foo.caught.after.', $tester->getDisplay());
     }
 
+    public function testRunWithError()
+    {
+        $this->setExpectedException('Exception', 'dymerr');
+
+        $application = new Application();
+        $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
+
+        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
+            $output->write('dym.');
+
+            throw new \Error('dymerr');
+        });
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'dym'));
+        $this->assertContains('before.dym.caught.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
+    }
+
     /**
      * @expectedException        \LogicException
      * @expectedExceptionMessage caught