From d19db5d2e44d0925798c288247c3bddb71d23975 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <odigiman@gmail.com>
Date: Sat, 21 Nov 2020 01:16:04 +0000
Subject: [PATCH] fix phpstan warnings

---
 .../network/mcpe/NetworkBinaryStream.php      |  5 +++-
 tests/phpstan/configs/l7-baseline.neon        | 25 ++++---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/pocketmine/network/mcpe/NetworkBinaryStream.php b/src/pocketmine/network/mcpe/NetworkBinaryStream.php
index fdf42b321..0fc159fc9 100644
--- a/src/pocketmine/network/mcpe/NetworkBinaryStream.php
+++ b/src/pocketmine/network/mcpe/NetworkBinaryStream.php
@@ -50,6 +50,7 @@ use pocketmine\network\mcpe\protocol\types\StructureEditorData;
 use pocketmine\network\mcpe\protocol\types\StructureSettings;
 use pocketmine\utils\BinaryStream;
 use pocketmine\utils\UUID;
+use function assert;
 use function count;
 use function strlen;
 
@@ -765,7 +766,9 @@ class NetworkBinaryStream extends BinaryStream{
 	public function getNbtRoot() : NamedTag{
 		$offset = $this->getOffset();
 		try{
-			return (new NetworkLittleEndianNBTStream())->read($this->getBuffer(), false, $offset, 512);
+			$result = (new NetworkLittleEndianNBTStream())->read($this->getBuffer(), false, $offset, 512);
+			assert($result instanceof NamedTag, "doMultiple is false so we should definitely have a NamedTag here");
+			return $result;
 		}finally{
 			$this->setOffset($offset);
 		}
diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon
index d5e05fdb5..0abcf76ad 100644
--- a/tests/phpstan/configs/l7-baseline.neon
+++ b/tests/phpstan/configs/l7-baseline.neon
@@ -825,11 +825,6 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/VerifyLoginTask.php
 
-		-
-			message: "#^Parameter \\#1 \\$buffer of method pocketmine\\\\nbt\\\\NBTStream\\:\\:read\\(\\) expects string, string\\|false given\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/convert/RuntimeBlockMapping.php
-
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
@@ -865,6 +860,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/BiomeDefinitionListPacket.php
 
+		-
+			message: "#^Parameter \\#1 \\$str of method pocketmine\\\\utils\\\\BinaryStream\\:\\:put\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: ../../../src/pocketmine/network/mcpe/protocol/ItemComponentPacket.php
+
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\LevelEventGenericPacket\\:\\:\\$eventData \\(string\\) does not accept string\\|false\\.$#"
 			count: 1
@@ -875,26 +875,11 @@ parameters:
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/PositionTrackingDBServerBroadcastPacket.php
 
-		-
-			message: "#^Static property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\StartGamePacket\\:\\:\\$blockTableCache \\(string\\|null\\) does not accept string\\|false\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/protocol/StartGamePacket.php
-
 		-
 			message: "#^Parameter \\#1 \\$str of method pocketmine\\\\utils\\\\BinaryStream\\:\\:put\\(\\) expects string, string\\|false given\\.$#"
-			count: 2
-			path: ../../../src/pocketmine/network/mcpe/protocol/StartGamePacket.php
-
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
 			path: ../../../src/pocketmine/network/mcpe/protocol/StartGamePacket.php
 
-		-
-			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\UpdateBlockPropertiesPacket\\:\\:\\$nbt \\(string\\) does not accept string\\|false\\.$#"
-			count: 1
-			path: ../../../src/pocketmine/network/mcpe/protocol/UpdateBlockPropertiesPacket.php
-
 		-
 			message: "#^Parameter \\#2 \\$resourcePatch of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, string\\|false given\\.$#"
 			count: 1