mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 11:26:37 +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
commit bbe9c01b46
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 17 additions and 16 deletions
Show Stats 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",

28
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ac798f92ac7eb3abe7fcead8074bac94",
"content-hash": "d6467f823dc9f715fd36b79b304e777d",
"packages": [
{
"name": "adhocore/json-comment",
@ -1521,16 +1521,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.64",
"version": "0.12.66",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
"reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
"reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
"reference": "4110a2425c6bd53acbdfcda07885e87b66e9ba3e",
"shasum": ""
},
"require": {
@ -1561,7 +1561,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.64"
"source": "https://github.com/phpstan/phpstan/tree/0.12.66"
},
"funding": [
{
@ -1577,7 +1577,7 @@
"type": "tidelift"
}
],
"time": "2020-12-21T11:59:02+00:00"
"time": "2021-01-11T16:43:15+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -1636,21 +1636,21 @@
},
{
"name": "phpstan/phpstan-strict-rules",
"version": "0.12.7",
"version": "0.12.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "03807e3410747ec18cd5f05a6342384adcc423bf"
"reference": "ee0009302ff5312ca6b92a7330a6b66da0c70f12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/03807e3410747ec18cd5f05a6342384adcc423bf",
"reference": "03807e3410747ec18cd5f05a6342384adcc423bf",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/ee0009302ff5312ca6b92a7330a6b66da0c70f12",
"reference": "ee0009302ff5312ca6b92a7330a6b66da0c70f12",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
"phpstan/phpstan": "^0.12.60"
"phpstan/phpstan": "^0.12.66"
},
"require-dev": {
"phing/phing": "^2.16.3",
@ -1681,9 +1681,9 @@
"description": "Extra strict and opinionated rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-strict-rules/issues",
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.7"
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.8"
},
"time": "2020-12-13T13:27:14+00:00"
"time": "2021-01-11T13:36:23+00:00"
},
{
"name": "phpunit/php-code-coverage",