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

Merge branch 'stable'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/pocketmine/metadata/MetadataStore.php
#	src/pocketmine/scheduler/AsyncTask.php
#	tests/phpstan/configs/actual-problems.neon
This commit is contained in:
Dylan K. Taylor
2021-01-12 21:48:24 +00:00
parent 120b224e41 97c124edf9
commit bbe9c01b46
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -50,7 +50,7 @@
"composer-runtime-api": "^2.0"
},
"require-dev": {
"phpstan/phpstan": "0.12.64",
"phpstan/phpstan": "0.12.66",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"
@ -72,7 +72,8 @@
"config": {
"platform": {
"php": "7.3.0"
}
},
"sort-packages": true
},
"scripts": {
"make-devtools": "@php -dphar.readonly=0 tests/plugins/DevTools/src/DevTools/ConsoleScript.php --make tests/plugins/DevTools --out plugins/DevTools.phar",