Merge commit 'da9731e'

# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
#	src/PocketMine.php
This commit is contained in:
Dylan K. Taylor
2020-04-25 12:20:23 +01:00
3 changed files with 15 additions and 24 deletions

View File

@ -140,19 +140,3 @@ parameters:
count: 2
path: src/world/format/io/FormatConverter.php
-
message: "#^Constant pocketmine\\\\COMPOSER_AUTOLOADER_PATH not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\GIT_COMMIT not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\PLUGIN_PATH not found\\.$#"
path: src
-
message: "#^Constant pocketmine\\\\VERSION not found\\.$#"
path: src