mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '1fb5043eb1b495e6926caecf3fb493837724c770'

Browse Source 
# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
This commit is contained in:
Dylan K. Taylor
2020-06-17 20:46:18 +01:00
parent d310c8b782 1fb5043eb1
commit f1fd8a13e9
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,11 +5,6 @@ parameters:
count: 1
path: ../../../build/make-release.php
-
message: "#^Parameter \\#2 \\$delim_char of function preg_quote expects string, string\\|null given\\.$#"
count: 1
path: ../../../build/server-phar.php
-
message: "#^Parameter \\#1 \\$name of method pocketmine\\\\world\\\\generator\\\\GeneratorManager\\:\\:getGenerator\\(\\) expects string, string\\|null given\\.$#"
count: 1