From c6e0753c3ee1a29e9864177d59b672e399303718 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Wed, 2 Sep 2020 15:04:37 +0100
Subject: [PATCH] clean up phpstan baselines

---
 .../check-explicit-mixed-baseline.neon        |  5 ----
 tests/phpstan/configs/l7-baseline.neon        |  2 +-
 tests/phpstan/configs/l8-baseline.neon        | 30 -------------------
 3 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/tests/phpstan/configs/check-explicit-mixed-baseline.neon b/tests/phpstan/configs/check-explicit-mixed-baseline.neon
index 541ae8aa9d..a26eaead05 100644
--- a/tests/phpstan/configs/check-explicit-mixed-baseline.neon
+++ b/tests/phpstan/configs/check-explicit-mixed-baseline.neon
@@ -560,11 +560,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/plugin/PluginManager.php
 
-		-
-			message: "#^Part \\$openResult \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/resourcepacks/ZippedResourcePack.php
-
 		-
 			message: "#^Parameter \\#2 \\$code of class pocketmine\\\\resourcepacks\\\\ResourcePackException constructor expects int, mixed given\\.$#"
 			count: 1
diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon
index bb844e3a39..ac9a6b711c 100644
--- a/tests/phpstan/configs/l7-baseline.neon
+++ b/tests/phpstan/configs/l7-baseline.neon
@@ -756,7 +756,7 @@ parameters:
 			path: ../../../src/pocketmine/level/format/io/region/McRegion.php
 
 		-
-			message: "#^Only numeric types are allowed in %, int\\|false given on the left side\\.$#"
+			message: "#^Only numeric types are allowed in %%, int\\|false given on the left side\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/level/format/io/region/RegionLoader.php
 
diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon
index 570ee17e9c..72d2dd9a03 100644
--- a/tests/phpstan/configs/l8-baseline.neon
+++ b/tests/phpstan/configs/l8-baseline.neon
@@ -590,11 +590,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/command/defaults/SetWorldSpawnCommand.php
 
-		-
-			message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getPlayer\\(\\) expects string, string\\|null given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/command/defaults/TellCommand.php
-
 		-
 			message: "#^Cannot call method getTime\\(\\) on pocketmine\\\\level\\\\Level\\|null\\.$#"
 			count: 1
@@ -775,11 +770,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/entity/Human.php
 
-		-
-			message: "#^Cannot call method getValue\\(\\) on pocketmine\\\\nbt\\\\tag\\\\NamedTag\\|null\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/entity/Living.php
-
 		-
 			message: "#^Parameter \\#1 \\$attribute of method pocketmine\\\\entity\\\\AttributeMap\\:\\:addAttribute\\(\\) expects pocketmine\\\\entity\\\\Attribute, pocketmine\\\\entity\\\\Attribute\\|null given\\.$#"
 			count: 6
@@ -1225,11 +1215,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/level/format/Chunk.php
 
-		-
-			message: "#^Cannot call method getValue\\(\\) on pocketmine\\\\nbt\\\\tag\\\\NamedTag\\|null\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/level/format/Chunk.php
-
 		-
 			message: "#^Method pocketmine\\\\level\\\\format\\\\Chunk\\:\\:getSubChunk\\(\\) should return pocketmine\\\\level\\\\format\\\\SubChunkInterface but returns pocketmine\\\\level\\\\format\\\\SubChunkInterface\\|null\\.$#"
 			count: 1
@@ -1645,16 +1630,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/tile/Spawnable.php
 
-		-
-			message: "#^Cannot clone non\\-object variable \\$customBlockDataTag of type pocketmine\\\\nbt\\\\tag\\\\NamedTag\\|null\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/tile/Tile.php
-
-		-
-			message: "#^Parameter \\#1 \\$tag of method pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\:\\:setTag\\(\\) expects pocketmine\\\\nbt\\\\tag\\\\NamedTag, pocketmine\\\\nbt\\\\tag\\\\NamedTag\\|null given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/tile/Tile.php
-
 		-
 			message: "#^Cannot call method getBlockAt\\(\\) on pocketmine\\\\level\\\\Level\\|null\\.$#"
 			count: 1
@@ -1710,11 +1685,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/utils/Utils.php
 
-		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\StupidJsonDecodeTest\\:\\:\\$stupidJsonDecodeFunc \\(Closure\\) does not accept Closure\\|null\\.$#"
-			count: 1
-			path: ../../phpunit/network/mcpe/StupidJsonDecodeTest.php
-
 		-
 			message: "#^Cannot call method cancel\\(\\) on pocketmine\\\\scheduler\\\\TaskHandler\\|null\\.$#"
 			count: 1