From 84f8b3eb2dbe9c4e8b7659d7b1001e829579b21c Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 4 Nov 2021 19:23:45 +0000
Subject: [PATCH] Move CrashDump to pocketmine\crash namespace

---
 src/Server.php                             |  1 +
 src/{ => crash}/CrashDump.php              |  7 +++----
 tests/phpstan/configs/actual-problems.neon | 10 +++++-----
 tests/phpstan/configs/phpstan-bugs.neon    | 10 +++++-----
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename src/{ => crash}/CrashDump.php (98%)

diff --git a/src/Server.php b/src/Server.php
index 30fba8f25..731860d4a 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -34,6 +34,7 @@ use pocketmine\console\ConsoleCommandSender;
 use pocketmine\console\ConsoleReaderThread;
 use pocketmine\crafting\CraftingManager;
 use pocketmine\crafting\CraftingManagerFromDataHelper;
+use pocketmine\crash\CrashDump;
 use pocketmine\data\java\GameModeIdMap;
 use pocketmine\entity\EntityDataHelper;
 use pocketmine\entity\Location;
diff --git a/src/CrashDump.php b/src/crash/CrashDump.php
similarity index 98%
rename from src/CrashDump.php
rename to src/crash/CrashDump.php
index b18d09021..1d595402e 100644
--- a/src/CrashDump.php
+++ b/src/crash/CrashDump.php
@@ -21,19 +21,18 @@
 
 declare(strict_types=1);
 
-namespace pocketmine;
+namespace pocketmine\crash;
 
 use Composer\InstalledVersions;
-use pocketmine\crash\CrashDumpData;
-use pocketmine\crash\CrashDumpDataGeneral;
-use pocketmine\crash\CrashDumpDataPluginEntry;
 use pocketmine\errorhandler\ErrorTypeToStringMap;
 use pocketmine\network\mcpe\protocol\ProtocolInfo;
 use pocketmine\plugin\PluginBase;
 use pocketmine\plugin\PluginManager;
+use pocketmine\Server;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Filesystem;
 use pocketmine\utils\Utils;
+use pocketmine\VersionInfo;
 use Webmozart\PathUtil\Path;
 use function base64_encode;
 use function date;
diff --git a/tests/phpstan/configs/actual-problems.neon b/tests/phpstan/configs/actual-problems.neon
index 5c1237f80..badcc3e0e 100644
--- a/tests/phpstan/configs/actual-problems.neon
+++ b/tests/phpstan/configs/actual-problems.neon
@@ -20,11 +20,6 @@ parameters:
 			count: 1
 			path: ../../../build/server-phar.php
 
-		-
-			message: "#^Parameter \\#1 \\$path of static method pocketmine\\\\utils\\\\Filesystem\\:\\:cleanPath\\(\\) expects string, mixed given\\.$#"
-			count: 1
-			path: ../../../src/CrashDump.php
-
 		-
 			message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
 			count: 1
@@ -530,6 +525,11 @@ parameters:
 			count: 1
 			path: ../../../src/crafting/CraftingManagerFromDataHelper.php
 
+		-
+			message: "#^Parameter \\#1 \\$path of static method pocketmine\\\\utils\\\\Filesystem\\:\\:cleanPath\\(\\) expects string, mixed given\\.$#"
+			count: 1
+			path: ../../../src/crash/CrashDump.php
+
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
diff --git a/tests/phpstan/configs/phpstan-bugs.neon b/tests/phpstan/configs/phpstan-bugs.neon
index b6b928870..0a580dcf0 100644
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Property pocketmine\\\\crash\\\\CrashDumpData\\:\\:\\$extensions \\(array\\<string, string\\>\\) does not accept array\\<int\\|string, string\\>\\.$#"
-			count: 1
-			path: ../../../src/CrashDump.php
-
 		-
 			message: "#^Instanceof between pocketmine\\\\block\\\\utils\\\\BannerPatternLayer and pocketmine\\\\block\\\\utils\\\\BannerPatternLayer will always evaluate to true\\.$#"
 			count: 1
@@ -25,6 +20,11 @@ parameters:
 			count: 1
 			path: ../../../src/crafting/CraftingManager.php
 
+		-
+			message: "#^Property pocketmine\\\\crash\\\\CrashDumpData\\:\\:\\$extensions \\(array\\<string, string\\>\\) does not accept array\\<int\\|string, string\\>\\.$#"
+			count: 1
+			path: ../../../src/crash/CrashDump.php
+
 		-
 			message: "#^Call to function assert\\(\\) with false and 'unknown hit type' will always evaluate to false\\.$#"
 			count: 1