Merge commit 'd343187e58e02c37903a0a93fb22ad9e9cbcdea6'

# Conflicts:
#	resources/vanilla
#	tests/phpstan/configs/l8-baseline.neon
This commit is contained in:
Dylan K. Taylor 2020-06-26 19:06:46 +01:00
commit d52ae120d4

View File

@ -775,16 +775,6 @@ parameters:
count: 1
path: ../../../src/scheduler/DumpWorkerMemoryTask.php
-
message: "#^Parameter \\#1 \\$options of method Thread\\:\\:start\\(\\) expects int, int\\|null given\\.$#"
count: 1
path: ../../../src/thread/Thread.php
-
message: "#^Parameter \\#1 \\$options of method Thread\\:\\:start\\(\\) expects int, int\\|null given\\.$#"
count: 1
path: ../../../src/thread/Worker.php
-
message: "#^Cannot access property \\$date on pocketmine\\\\updater\\\\UpdateInfo\\|null\\.$#"
count: 1