Merge branch 'release/3.2'

This commit is contained in:
Dylan K. Taylor 2018-08-02 14:43:59 +01:00
commit c345e6f22c

View File

@ -2161,10 +2161,6 @@ class Server{
* @param array|null $trace * @param array|null $trace
*/ */
public function exceptionHandler(\Throwable $e, $trace = null){ public function exceptionHandler(\Throwable $e, $trace = null){
if($e === null){
return;
}
global $lastError; global $lastError;
if($trace === null){ if($trace === null){
@ -2222,7 +2218,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; $report = false;
} }