mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '3f971a0c6'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l7-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:29:12 +01:00
commit 69aa6a51b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/phpstan/configs/l7-baseline.neon
View File

@ -501,7 +501,7 @@ parameters:
path: ../../../src/command/defaults/TimingsCommand.php
-
message: "#^Parameter \\#4 \\$data of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:124 constructor expects array\\<string, string\\>, array\\<string, string\\|false\\> given\\.$#"
message: "#^Parameter \\#4 \\$data of class class@anonymous/src/command/defaults/TimingsCommand\\.php\\:125 constructor expects array\\<string, string\\>, array\\<string, string\\|false\\> given\\.$#"
count: 1
path: ../../../src/command/defaults/TimingsCommand.php