Merge branch 'next-minor'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-05-18 20:33:22 +01:00
commit 55f8314fa7
3 changed files with 2872 additions and 1 deletions

View File

@ -4,6 +4,8 @@ includes:
- tests/phpstan/configs/custom-leveldb.neon
- tests/phpstan/configs/ds-bugs.neon
- tests/phpstan/configs/gc-hacks.neon
- tests/phpstan/configs/l7-baseline.neon
- tests/phpstan/configs/l8-baseline.neon
- tests/phpstan/configs/php-bugs.neon
- tests/phpstan/configs/phpstan-bugs.neon
- tests/phpstan/configs/phpunit-wiring-tests.neon
@ -17,7 +19,7 @@ rules:
- pocketmine\phpstan\rules\DisallowEnumComparisonRule
parameters:
level: 6
level: 8
autoload_files:
- tests/phpstan/bootstrap.php
- src/PocketMine.php

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff