Merge branch 'release/3.0' into release/3.1

This commit is contained in:
Dylan K. Taylor 2018-08-02 14:43:44 +01:00
commit 61accee682

View File

@ -2144,10 +2144,6 @@ class Server{
* @param array|null $trace
*/
public function exceptionHandler(\Throwable $e, $trace = null){
if($e === null){
return;
}
global $lastError;
if($trace === null){
@ -2205,7 +2201,7 @@ class Server{
}
}
if($dump->getData()["error"]["type"] === "E_PARSE" or $dump->getData()["error"]["type"] === "E_COMPILE_ERROR"){
if($dump->getData()["error"]["type"] === \ParseError::class){
$report = false;
}