[Console] fixed PHP7 Errors when not using Dispatcher

keradus · keradus · commit 162e71ec84f6 · 2016-12-03T12:48:41.000+01:00
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,13 @@ 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,24 @@ 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'));
+    }
+
     /**
      * @expectedException        \LogicException
      * @expectedExceptionMessage caught

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,8 @@ public function run(InputInterface $input = null, OutputInterface $output = null`
`159`	`159`	`* @param OutputInterface $output An Output instance`
`160`	`160`	`*`
`161`	`161`	`* @return int 0 if everything went fine, or an error code`
	`162`	`+ *`
	`163`	+ * @throws \Exception propagate the exception from `doRunCommand`
`162`	`164`	`*/`
`163`	`165`	`public function doRun(InputInterface $input, OutputInterface $output)`
`164`	`166`	`{`
`@@ -843,7 +845,13 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`843`	`845`	`}`
`844`	`846`
`845`	`847`	`if (null === $this->dispatcher) {`
`846`		`- return $command->run($input, $output);`
	`848`	`+ try {`
	`849`	`+ return $command->run($input, $output);`
	`850`	`+ } catch (\Exception $e) {`
	`851`	`+ throw $e;`
	`852`	`+ } catch (\Throwable $e) {`
	`853`	`+ throw new FatalThrowableError($e);`
	`854`	`+ }`
`847`	`855`	`}`
`848`	`856`
`849`	`857`	`$event = new ConsoleCommandEvent($command, $input, $output);`