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

Merge commit '23b97d8e2dca50cca77061c1080911ab610fa708'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
This commit is contained in:
Dylan K. Taylor
2020-06-17 20:47:51 +01:00
parent f1fd8a13e9 23b97d8e2d
commit 8d537eaae8
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/phpstan/configs/l8-baseline.neon
View File

@ -880,16 +880,6 @@ parameters:
count: 1
path: ../../../src/utils/Config.php
-
message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|null given\\.$#"
count: 2
path: ../../../src/utils/TextFormat.php
-
message: "#^Method pocketmine\\\\utils\\\\TextFormat\\:\\:colorize\\(\\) should return string but returns string\\|null\\.$#"
count: 1
path: ../../../src/utils/TextFormat.php
-
message: "#^Method pocketmine\\\\utils\\\\Utils\\:\\:printable\\(\\) should return string but returns string\\|null\\.$#"
count: 1