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 branch 'stable'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/network/mcpe/convert/LegacySkinAdapter.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/phpstan-bugs.neon
This commit is contained in:
Dylan K. Taylor
2020-06-19 10:48:27 +01:00
parent ced89add3c e32180ce93
commit 64e9647334
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/phpstan/configs/check-explicit-mixed-baseline.neon
View File

@ -145,11 +145,6 @@ parameters:
count: 1
path: ../../../src/network/mcpe/compression/CompressBatchTask.php
-
message: "#^Cannot access offset 'geometry' on mixed\\.$#"
count: 3
path: ../../../src/network/mcpe/convert/LegacySkinAdapter.php
-
message: "#^Method pocketmine\\\\network\\\\mcpe\\\\raklib\\\\PthreadsChannelReader\\:\\:read\\(\\) should return string\\|null but returns mixed\\.$#"
count: 1