symfony
diff --git a/‎src/Symfony/Component/Console/Application.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Application.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Console/Application.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Application.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
+19-14Lines changed: 19 additions & 14 deletions b/‎src/Symfony/Component/Console/Tests/ApplicationTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/ApplicationTest.php
+19-14Lines changed: 19 additions & 14 deletions
@@ -866,7 +866,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
                 $event = new ConsoleTerminateEvent($command, $input, $output, $e->getCode());
                 $this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);
 
-                throw $e;
+                throw $x;
             }
         } else {
             $exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;
 
@@ -914,7 +914,7 @@ public function testRunWithDispatcher()
     }
 
     /**
-     * @expectedException        \LogicException
+     * @expectedException        \RuntimeException
      * @expectedExceptionMessage caught
      */
     public function testRunWithExceptionAndDispatcher()
@@ -925,7 +925,7 @@ public function testRunWithExceptionAndDispatcher()
         $application->setCatchExceptions(false);
 
         $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
-            throw new \RuntimeException('foo');
+            throw new \RuntimeException('caught');
         });
 
         $tester = new ApplicationTester($application);
@@ -949,37 +949,42 @@ public function testRunDispatchesAllEventsWithException()
         $this->assertContains('before.foo.caught.after.', $tester->getDisplay());
     }
 
-    public function testRunDispatchesAllEventsWithError()
+    /**
+     * @expectedException        \Error
+     * @expectedExceptionMessage caught
+     */
+    public function testRunWithErrorAndDispatcher()
     {
         $application = new Application();
         $application->setDispatcher($this->getDispatcher());
         $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
 
-        $application->register('dym')->setCode(function (InputInterface $input, OutputInterface $output) {
-            $output->write('dym.');
-
-            throw new \Error('dymerr');
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Error('caught');
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'dym'));
-        $this->assertContains('before.dym.caught.after.', $tester->getDisplay(), 'The PHP Error did not dispached events');
+        $tester->run(array('command' => 'foo'));
     }
 
+    /**
+     * @expectedException        \Error
+     * @expectedExceptionMessage caught
+     */
     public function testRunWithErrorFailingStatusCode()
     {
         $application = new Application();
         $application->setDispatcher($this->getDispatcher());
         $application->setAutoExit(false);
+        $application->setCatchExceptions(false);
 
-        $application->register('dus')->setCode(function (InputInterface $input, OutputInterface $output) {
-            $output->write('dus.');
-
-            throw new \Error('duserr');
+        $application->register('foo')->setCode(function (InputInterface $input, OutputInterface $output) {
+            throw new \Error('caught');
         });
 
         $tester = new ApplicationTester($application);
-        $tester->run(array('command' => 'dus'));
+        $tester->run(array('command' => 'foo'));
         $this->assertSame(1, $tester->getStatusCode(), 'Status code should be 1');
     }
Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI`
`866`	`866`	`$event = new ConsoleTerminateEvent($command, $input, $output, $e->getCode());`
`867`	`867`	`$this->dispatcher->dispatch(ConsoleEvents::TERMINATE, $event);`
`868`	`868`
`869`		`- throw $e;`
	`869`	`+ throw $x;`
`870`	`870`	`}`
`871`	`871`	`} else {`
`872`	`872`	`$exitCode = ConsoleCommandEvent::RETURN_CODE_DISABLED;`