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 remote-tracking branch 'origin/stable' into master

Browse Source 
# Conflicts:
#	build/php
#	composer.lock
#	phpstan.neon.dist
#	resources/vanilla
#	src/pocketmine/Server.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/entity/Entity.php
#	src/pocketmine/lang/locale
#	src/utils/Timezone.php
#	tests/phpstan/bootstrap.php
#	tests/phpstan/configs/custom-leveldb.neon
This commit is contained in:
Dylan K. Taylor
2020-10-13 17:51:49 +01:00
parent aa00bd5e31 af4f30d1c8
commit 44e446b621
11 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/phpstan/configs/custom-leveldb.neon
View File

@ -1,12 +0,0 @@
parameters:
ignoreErrors:
#TODO: use custom stubs
-
message: "#^Used constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
count: 1
path: ../../../src/world/format/io/leveldb/LevelDB.php
-
message: "#^Constant LEVELDB_ZLIB_RAW_COMPRESSION not found\\.$#"
count: 1
path: ../../../src/world/format/io/leveldb/LevelDB.php