From 5546c88f88aef07594cfc68ac0e8abb5da51e422 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 2 Aug 2018 14:40:36 +0100 Subject: [PATCH 1/2] Server: Fixed parse errors getting reported to CA this changed to throwing errors as of PHP 7 --- src/pocketmine/Server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index cce6fca0f..3ec124992 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -2205,7 +2205,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; } From 9ece971a2b1aa9edff6123f34c7de17111d3daff Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Thu, 2 Aug 2018 14:41:28 +0100 Subject: [PATCH 2/2] Server: remove useless check from exceptionHandler() this cannot be null... @shoghicp y u litter the code with these useless checks ??? --- src/pocketmine/Server.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 3ec124992..3a294e1b5 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -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){