mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 01:46:04 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 4c0c2ebd24 0b550b346b
commit d6ed542fcd
11 changed files with 325 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/phpstan/configs/check-explicit-mixed-baseline.neon
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