Merge remote-tracking branch 'origin/stable' into master

# Conflicts:
#	composer.json
#	composer.lock
#	src/CrashDump.php
#	src/pocketmine/Server.php
#	src/pocketmine/level/format/io/region/McRegion.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/travis/setup-php.yml
This commit is contained in:
Dylan K. Taylor
2020-10-26 16:18:53 +00:00
11 changed files with 325 additions and 333 deletions

View File

@ -115,21 +115,11 @@ parameters:
count: 1
path: ../../../src/command/defaults/VanillaCommand.php
-
message: "#^Method pocketmine\\\\event\\\\EventPriority\\:\\:fromString\\(\\) should return int but returns mixed\\.$#"
count: 1
path: ../../../src/event/EventPriority.php
-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
count: 1
path: ../../../src/inventory/CreativeInventory.php
-
message: "#^Parameter \\#1 \\$id of static method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:get\\(\\) expects int, mixed given\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Parameter \\#1 \\$result of method pocketmine\\\\network\\\\mcpe\\\\compression\\\\CompressBatchPromise\\:\\:resolve\\(\\) expects string, mixed given\\.$#"
count: 1
@ -235,31 +225,11 @@ parameters:
count: 1
path: ../../../src/plugin/PluginDescription.php
-
message: "#^Method pocketmine\\\\plugin\\\\PluginDescription\\:\\:getRequiredExtensions\\(\\) should return array\\<string, array\\<int, string\\>\\> but returns array\\<string, array\\<int, mixed\\>\\>\\.$#"
count: 1
path: ../../../src/plugin/PluginDescription.php
-
message: "#^Parameter \\#1 \\$str of function substr expects string, mixed given\\.$#"
count: 2
path: ../../../src/plugin/PluginDescription.php
-
message: "#^Part \\$constr \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
count: 2
path: ../../../src/plugin/PluginDescription.php
-
message: "#^Parameter \\#1 \\$plugins of class pocketmine\\\\plugin\\\\PluginGraylist constructor expects array\\<string\\>, mixed given\\.$#"
count: 1
path: ../../../src/plugin/PluginGraylist.php
-
message: "#^Part \\$openResult \\(mixed\\) of encapsed string cannot be cast to string\\.$#"
count: 1
path: ../../../src/resourcepacks/ZippedResourcePack.php
-
message: "#^Parameter \\#2 \\$code of class pocketmine\\\\resourcepacks\\\\ResourcePackException constructor expects int, mixed given\\.$#"
count: 1

View File

@ -480,21 +480,11 @@ parameters:
count: 1
path: ../../../src/command/CommandReader.php
-
message: "#^Parameter \\#2 \\$params of class pocketmine\\\\lang\\\\TranslationContainer constructor expects array\\<float\\|int\\|string\\>, array\\<int, string\\|null\\> given\\.$#"
count: 1
path: ../../../src/command/defaults/BanCommand.php
-
message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
count: 1
path: ../../../src/command/defaults/BanIpCommand.php
-
message: "#^Parameter \\#2 \\$params of class pocketmine\\\\lang\\\\TranslationContainer constructor expects array\\<float\\|int\\|string\\>, array\\<int, string\\|null\\> given\\.$#"
count: 1
path: ../../../src/command/defaults/BanIpCommand.php
-
message: "#^Only booleans are allowed in an if condition, int\\|false given\\.$#"
count: 1
@ -650,11 +640,6 @@ parameters:
count: 1
path: ../../../src/network/mcpe/auth/ProcessLoginTask.php
-
message: "#^Parameter \\#2 \\$resourcePatch of class pocketmine\\\\network\\\\mcpe\\\\protocol\\\\types\\\\SkinData constructor expects string, string\\|false given\\.$#"
count: 1
path: ../../../src/network/mcpe/convert/LegacySkinAdapter.php
-
message: "#^Parameter \\#1 \\$buffer of method pocketmine\\\\nbt\\\\BaseNbtSerializer\\:\\:read\\(\\) expects string, string\\|false given\\.$#"
count: 1
@ -1031,7 +1016,7 @@ parameters:
path: ../../../src/world/format/io/FormatConverter.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/world/format/io/region/RegionLoader.php
@ -1040,11 +1025,6 @@ parameters:
count: 1
path: ../../../src/world/format/io/region/RegionWorldProvider.php
-
message: "#^Only numeric types are allowed in \\+, int\\|false given on the left side\\.$#"
count: 1
path: ../../../src/world/format/io/region/RegionWorldProvider.php
-
message: "#^Parameter \\#1 \\$start of method pocketmine\\\\utils\\\\Random\\:\\:nextRange\\(\\) expects int, float\\|int given\\.$#"
count: 2

View File

@ -5,11 +5,6 @@ parameters:
count: 1
path: ../../../build/make-release.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\world\\\\generator\\\\GeneratorManager\\:\\:getGenerator\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/Server.php
-
message: "#^Parameter \\#1 \\$constraint of method pocketmine\\\\block\\\\BaseRail\\:\\:getPossibleConnectionDirectionsOneConstraint\\(\\) expects int, int\\|null given\\.$#"
count: 1
@ -60,46 +55,6 @@ parameters:
count: 1
path: ../../../src/command/SimpleCommandMap.php
-
message: "#^Parameter \\#1 \\$target of method pocketmine\\\\permission\\\\BanList\\:\\:addBan\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/BanCommand.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getPlayerExact\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/BanCommand.php
-
message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/BanIpCommand.php
-
message: "#^Parameter \\#1 \\$ip of method pocketmine\\\\command\\\\defaults\\\\BanIpCommand\\:\\:processIPBan\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/BanIpCommand.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getPlayer\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/BanIpCommand.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getOfflinePlayer\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/DeopCommand.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getPlayer\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/KickCommand.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\Server\\:\\:getOfflinePlayer\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/command/defaults/OpCommand.php
-
message: "#^Cannot call method addParticle\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
@ -140,101 +95,6 @@ parameters:
count: 1
path: ../../../src/inventory/transaction/CraftingTransaction.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:BLAST_PROTECTION\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:EFFICIENCY\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:FEATHER_FALLING\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:FIRE_ASPECT\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:FIRE_PROTECTION\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:FLAME\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:INFINITY\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:KNOCKBACK\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:MENDING\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:POWER\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:PROJECTILE_PROTECTION\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:PROTECTION\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:PUNCH\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:RESPIRATION\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:SHARPNESS\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:SILK_TOUCH\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:THORNS\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:UNBREAKING\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Method pocketmine\\\\item\\\\enchantment\\\\Enchantment\\:\\:VANISHING\\(\\) should return pocketmine\\\\item\\\\enchantment\\\\Enchantment but returns pocketmine\\\\item\\\\enchantment\\\\Enchantment\\|null\\.$#"
count: 1
path: ../../../src/item/enchantment/Enchantment.php
-
message: "#^Cannot call method getUsername\\(\\) on pocketmine\\\\player\\\\PlayerInfo\\|null\\.$#"
count: 1
@ -292,11 +152,6 @@ parameters:
-
message: "#^Cannot call method sendData\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
count: 2
path: ../../../src/network/mcpe/NetworkSession.php
-
message: "#^Cannot call method getViewers\\(\\) on pocketmine\\\\player\\\\Player\\|null\\.$#"
count: 1
path: ../../../src/network/mcpe/NetworkSession.php
@ -410,11 +265,6 @@ parameters:
count: 1
path: ../../../src/network/mcpe/raklib/RakLibServer.php
-
message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/permission/BanEntry.php
-
message: "#^Method pocketmine\\\\permission\\\\DefaultPermissions\\:\\:registerPermission\\(\\) should return pocketmine\\\\permission\\\\Permission but returns pocketmine\\\\permission\\\\Permission\\|null\\.$#"
count: 1
@ -602,7 +452,7 @@ parameters:
-
message: "#^Parameter \\#1 \\$closure of static method pocketmine\\\\utils\\\\Utils\\:\\:getNiceClosureName\\(\\) expects Closure, Closure\\|null given\\.$#"
count: 3
count: 2
path: ../../../src/plugin/PluginManager.php
-
@ -660,11 +510,6 @@ parameters:
count: 1
path: ../../../src/utils/Config.php
-
message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
count: 1
path: ../../../src/utils/Config.php
-
message: "#^Method pocketmine\\\\utils\\\\Utils\\:\\:printable\\(\\) should return string but returns string\\|null\\.$#"
count: 1