Re-throw exception to invoke the native handler when a custom handler…

… is not set
immobiliare · Feb 28, 2017 · 77916b0 · 77916b0
1 parent 3936d40
commit 77916b0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/lib/Raven/ErrorHandler.php b/lib/Raven/ErrorHandler.php
@@ -77,8 +77,12 @@ public function handleException($e, $isError = false, $vars = null)
  {
  $e->event_id = $this->client->captureException($e, null, null, $vars);
 
- if (!$isError && $this->call_existing_exception_handler && $this->old_exception_handler) {
- call_user_func($this->old_exception_handler, $e);
+ if (!$isError && $this->call_existing_exception_handler) {
+ if ($this->old_exception_handler !== null) {
+ call_user_func($this->old_exception_handler, $e);
+ } else {
+ throw $e;
+ }
  }
  }
 

diff --git a/test/Raven/Tests/ErrorHandlerTest.php b/test/Raven/Tests/ErrorHandlerTest.php
@@ -100,6 +100,48 @@ public function testErrorHandlerPropagates()
  $this->assertEquals($this->errorHandlerCalled, 1);
  }
 
+ public function testExceptionHandlerPropagatesToNative()
+ {
+ $client = $this->getMockBuilder('Client')
+ ->setMethods(array('captureException'))
+ ->getMock();
+ $client->expects($this->exactly(2))
+ ->method('captureException')
+ ->with($this->isInstanceOf('Exception'));
+
+ $handler = new Raven_ErrorHandler($client);
+
+ set_exception_handler(null);
+ $handler->registerExceptionHandler(false);
+
+ $testException = new Exception('Test exception');
+
+ $didRethrow = false;
+ try {
+ $handler->handleException($testException);
+ } catch (Exception $e) {
+ $didRethrow = true;
+ }
+
+ $this->assertFalse($didRethrow);
+
+ set_exception_handler(null);
+ $handler->registerExceptionHandler(true);
+
+ $didRethrow = false;
+ $rethrownException = null;
+ try {
+ $handler->handleException($testException);
+ } catch (Exception $e) {
+ $didRethrow = true;
+ $rethrownException = $e;
+ }
+
+ $this->assertTrue($didRethrow);
+ $this->assertSame($testException, $rethrownException);
+
+ }
+
  public function testErrorHandlerRespectsErrorReportingDefault()
  {
  $client = $this->getMockBuilder('Client')