mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 04:17:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '673e44445'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-05-31 15:03:48 +01:00
commit 8dc5b9e712
3 changed files with 1531 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -51,9 +51,9 @@
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "^0.12.25", "phpstan/phpstan": "^0.12.25",
"irstea/phpunit-shim": "^8.5",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2" "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^8.5"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

1561
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

1
phpstan.neon.dist
View File

@ -25,7 +25,6 @@ parameters:
- src/PocketMine.php - src/PocketMine.php
- build/make-release.php - build/make-release.php
- build/server-phar.php - build/server-phar.php
- vendor/irstea/phpunit-shim/phpunit
paths: paths:
- src - src
- tests/phpstan/rules - tests/phpstan/rules