Commitb77a1e2

committed

[Debug] Fix fatal error handlers on PHP 7

1 parent60bf201 commitb77a1e2Copy full SHA for b77a1e2

File tree

+23

-5

lines changed

+23

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ public function handleException($exception, array $error = null)`
`469`	`469`	`}`
`470`	`470`	`$type =$exceptioninstanceof FatalErrorException ?$exception->getSeverity() :E_ERROR;`
`471`	`471`
`472`		`-if ($this->loggedErrors &$type) {`
	`472`	`+if (($this->loggedErrors &$type) \|\|$exceptioninstanceof FatalThrowableError) {`
`473`	`473`	`$e =array(`
`474`	`474`	`'type' =>$type,`
`475`	`475`	`'file' =>$exception->getFile(),`
`@@ -496,9 +496,9 @@ public function handleException($exception, array $error = null)`
`496`	`496`	`}else {`
`497`	`497`	`$message ='Uncaught Exception:'.$exception->getMessage();`
`498`	`498`	`}`
`499`		`-if ($this->loggedErrors &$e['type']) {`
`500`		`-$this->loggers[$e['type']][0]->log($this->loggers[$e['type']][1],$message,$e);`
`501`		`-}`
	`499`	`+}`
	`500`	`+if($this->loggedErrors &$type) {`
	`501`	`+$this->loggers[$type][0]->log($this->loggers[$type][1],$message,$e);`
`502`	`502`	`}`
`503`	`503`	`if ($exceptioninstanceof FatalErrorException && !$exceptioninstanceof OutOfMemoryException &&$error) {`
`504`	`504`	`foreach ($this->getFatalErrorHandlers()as$handler) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(\Throwable $e)`
`27`	`27`	`$message ='Type error:'.$e->getMessage();`
`28`	`28`	`$severity =E_RECOVERABLE_ERROR;`
`29`	`29`	`}else {`
`30`		`-$message ='Fatal error:'.$e->getMessage();`
	`30`	`+$message =$e->getMessage();`
`31`	`31`	`$severity =E_ERROR;`
`32`	`32`	`}`
`33`	`33`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,24 @@ public function testHandleFatalError()`
`413`	`413`	`}`
`414`	`414`	`}`
`415`	`415`
	`416`	`+/**`
	`417`	`+ * @requires PHP 7`
	`418`	`+ */`
	`419`	`+publicfunctiontestHandleErrorException()`
	`420`	`+ {`
	`421`	`+$exception =new \Error("Class 'Foo' not found");`
	`422`	`+`
	`423`	`+$handler =newErrorHandler();`
	`424`	`+$handler->setExceptionHandler(function ()use (&$args) {`
	`425`	`+$args =func_get_args();`
	`426`	`+ });`
	`427`	`+`
	`428`	`+$handler->handleException($exception);`
	`429`	`+`
	`430`	`+$this->assertInstanceOf('Symfony\Component\\Debug\\Exception\\ClassNotFoundException',$args[0]);`
	`431`	`+$this->assertSame("Attempted to load class\"Foo\" from the global namespace.\nDid you forget a\"use\" statement?",$args[0]->getMessage());`
	`432`	`+ }`
	`433`	`+`
`416`	`434`	`publicfunctiontestHandleFatalErrorOnHHVM()`
`417`	`435`	`{`
`418`	`436`	`try {`

Comments

(0)