Merge branch 'stable'

2025-09-04 17:06:16 +00:00 · 2021-08-20 23:08:17 +01:00
parent f5a4baf3cf ff4aa148ef
commit 668df85e3f
8 changed files with 95 additions and 92 deletions
--- a/tests/phpstan/configs/l7-baseline.neon
+++ b/tests/phpstan/configs/l7-baseline.neon
@ -126,7 +126,7 @@ parameters:
 			path: ../../../src/block/DragonEgg.php

 		-
-			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int given\\.$#"
+			message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getBlockAt\\(\\) expects int, float\\|int\\<0, max\\> given\\.$#"
 			count: 1
 			path: ../../../src/block/DragonEgg.php

@ -555,11 +555,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php

-		-
-			message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<T of object\\>\\|T of object, string given\\.$#"
-			count: 1
-			path: ../../../src/event/HandlerListManager.php
-
 		-
 			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
 			count: 1
--- a/tests/phpstan/configs/phpstan-bugs.neon
+++ b/tests/phpstan/configs/phpstan-bugs.neon
@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php

-		-
-			message: "#^Parameter \\#1 \\$read of function socket_select expects array\\<resource\\>\\|null, array\\<int, Socket\\> given\\.$#"
-			count: 1
-			path: ../../../src/network/query/DedicatedQueryNetworkInterface.php
-
 		-
 			message: "#^Parameter \\#1 \\$ of closure expects TValue, TValue given\\.$#"
 			count: 2
@ -40,71 +35,6 @@ parameters:
 			count: 1
 			path: ../../../src/utils/Promise.php

-		-
-			message: "#^Match arm comparison between string and '§3' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§4' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§5' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§6' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§7' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§8' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§9' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§a' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§b' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§c' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§d' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§e' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
-		-
-			message: "#^Match arm comparison between string and '§f' is always false\\.$#"
-			count: 1
-			path: ../../../src/utils/Terminal.php
-
 		-
 			message: "#^Parameter \\#1 \\$ of closure expects TMemberType, TMemberType given\\.$#"
 			count: 1
@ -121,7 +51,7 @@ parameters:
 			path: ../../../src/world/format/io/region/RegionLoader.php

 		-
-			message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotNull\\(\\) with int and string will always evaluate to true\\.$#"
-			count: 1
-			path: ../../phpunit/block/BlockTest.php
+			message: "#^Parameter \\#2 \\$count of function array_fill expects int\\<0, max\\>, int given\\.$#"
+			count: 2
+			path: ../../../src/world/generator/noise/Noise.php

--- a/tests/phpstan/configs/spl-fixed-array-sucks.neon
+++ b/tests/phpstan/configs/spl-fixed-array-sucks.neon
@ -0,0 +1,77 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Cannot call method getFullBlock\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/World.php
+
+		-
+			message: "#^Cannot call method isEmptyFast\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/World.php
+
+		-
+			message: "#^Cannot call method collectGarbage\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/Chunk.php
+
+		-
+			message: "#^Method pocketmine\\\\world\\\\format\\\\HeightArray\\:\\:getValues\\(\\) should return array\\<int, int\\> but returns array\\<int, int\\|null\\>\\.$#"
+			count: 1
+			path: ../../../src/world/format/HeightArray.php
+
+		-
+			message: "#^Cannot call method getBlockLayers\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/FastChunkSerializer.php
+
+		-
+			message: "#^Cannot call method getBlockLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/FastChunkSerializer.php
+
+		-
+			message: "#^Cannot call method getBlockSkyLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/FastChunkSerializer.php
+
+		-
+			message: "#^Cannot call method getEmptyBlockId\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/FastChunkSerializer.php
+
+		-
+			message: "#^Cannot call method getBlockLayers\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/leveldb/LevelDB.php
+
+		-
+			message: "#^Cannot call method isEmptyAuthoritative\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/format/io/leveldb/LevelDB.php
+
+		-
+			message: "#^Cannot call method getBlockLayers\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/light/BlockLightUpdate.php
+
+		-
+			message: "#^Cannot call method setBlockLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/light/BlockLightUpdate.php
+
+		-
+			message: "#^Parameter \\#1 \\$subChunk of method pocketmine\\\\world\\\\light\\\\BlockLightUpdate\\:\\:scanForLightEmittingBlocks\\(\\) expects pocketmine\\\\world\\\\format\\\\SubChunk, pocketmine\\\\world\\\\format\\\\SubChunk\\|null given\\.$#"
+			count: 1
+			path: ../../../src/world/light/BlockLightUpdate.php
+
+		-
+			message: "#^Cannot call method getBlockLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/light/LightPopulationTask.php
+
+		-
+			message: "#^Cannot call method getBlockSkyLightArray\\(\\) on pocketmine\\\\world\\\\format\\\\SubChunk\\|null\\.$#"
+			count: 1
+			path: ../../../src/world/light/LightPopulationTask.php
+