mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-04-21 08:17:34 +00:00
Merge branch 'stable' of https://github.com/pmmp/pocketmine-mp into stable
This commit is contained in:
Dylan K. Taylor
commit
ec21c2baa0
@ -116,7 +116,7 @@ class ExampleClass{
|
||||
<!-- TODO: RFC and voting on the forums instead -->
|
||||
### RFC and Voting
|
||||
* These are big Pull Requests or contributions that change important behavior.
|
||||
* RFCs will be tagged with the *PR: RFC* label
|
||||
* RFCs will be tagged with the *Type: Request For Comments* label
|
||||
* A vote will be held once the RFC is ready. All users can vote commenting on the Pull Request
|
||||
* Comments MUST use "Yes" or "No" on the FIRST sentence to signify the vote, except when they don't want it to be counted.
|
||||
* If your comment is a voting comment, specify the reason of your vote or it won't be counted.
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
"ocramius/package-versions": "^1.5"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpstan/phpstan": "0.12.36",
|
||||
"phpstan/phpstan": "0.12.37",
|
||||
"phpstan/phpstan-phpunit": "^0.12.6",
|
||||
"phpstan/phpstan-strict-rules": "^0.12.2",
|
||||
"phpunit/phpunit": "^9.2"
|
||||
|
||||
68
composer.lock
generated
68
composer.lock
generated
@ -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": "b1129fbf37136eacf27cafa0b15f814a",
|
||||
"content-hash": "14c3872a6f5a52b6087ed40d636fcddc",
|
||||
"packages": [
|
||||
{
|
||||
"name": "adhocore/json-comment",
|
||||
@ -527,6 +527,20 @@
|
||||
"constructor",
|
||||
"instantiate"
|
||||
],
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://www.doctrine-project.org/sponsorship.html",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://www.patreon.com/phpdoctrine",
|
||||
"type": "patreon"
|
||||
},
|
||||
{
|
||||
"url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2020-05-29T17:27:14+00:00"
|
||||
},
|
||||
{
|
||||
@ -585,16 +599,16 @@
|
||||
},
|
||||
{
|
||||
"name": "nikic/php-parser",
|
||||
"version": "v4.7.0",
|
||||
"version": "v4.8.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/nikic/PHP-Parser.git",
|
||||
"reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300"
|
||||
"reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
|
||||
"reference": "21dce06dfbf0365c6a7cc8fdbdc995926c6a9300",
|
||||
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8c58eb4cd4f3883f82611abeac2efbc3dbed787e",
|
||||
"reference": "8c58eb4cd4f3883f82611abeac2efbc3dbed787e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -602,8 +616,8 @@
|
||||
"php": ">=7.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"ircmaxell/php-yacc": "0.0.5",
|
||||
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
|
||||
"ircmaxell/php-yacc": "^0.0.6",
|
||||
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
|
||||
},
|
||||
"bin": [
|
||||
"bin/php-parse"
|
||||
@ -611,7 +625,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "4.7-dev"
|
||||
"dev-master": "4.8-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -633,7 +647,7 @@
|
||||
"parser",
|
||||
"php"
|
||||
],
|
||||
"time": "2020-07-25T13:18:53+00:00"
|
||||
"time": "2020-08-09T10:23:20+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phar-io/manifest",
|
||||
@ -949,16 +963,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan",
|
||||
"version": "0.12.36",
|
||||
"version": "0.12.37",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/phpstan/phpstan.git",
|
||||
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3"
|
||||
"reference": "5e16d83e6eb2dd784fbdaeaece5e2bca72e4f68a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
|
||||
"reference": "eaeff985e395ff4e7aebf3251a43fca6c9be1af3",
|
||||
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/5e16d83e6eb2dd784fbdaeaece5e2bca72e4f68a",
|
||||
"reference": "5e16d83e6eb2dd784fbdaeaece5e2bca72e4f68a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1001,7 +1015,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2020-08-05T09:29:40+00:00"
|
||||
"time": "2020-08-09T14:32:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpstan/phpstan-phpunit",
|
||||
@ -1112,23 +1126,23 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-code-coverage",
|
||||
"version": "9.0.0",
|
||||
"version": "9.1.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
|
||||
"reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90"
|
||||
"reference": "4abbce3b0ad05f2e7143ea5f775d5513cb5261e4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ee24e82baca11d7d6fb3513e127d6000f541cf90",
|
||||
"reference": "ee24e82baca11d7d6fb3513e127d6000f541cf90",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4abbce3b0ad05f2e7143ea5f775d5513cb5261e4",
|
||||
"reference": "4abbce3b0ad05f2e7143ea5f775d5513cb5261e4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-dom": "*",
|
||||
"ext-libxml": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"nikic/php-parser": "^4.7",
|
||||
"nikic/php-parser": "^4.8",
|
||||
"php": "^7.3 || ^8.0",
|
||||
"phpunit/php-file-iterator": "^3.0.3",
|
||||
"phpunit/php-text-template": "^2.0.2",
|
||||
@ -1149,7 +1163,7 @@
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "9.0-dev"
|
||||
"dev-master": "9.1-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
@ -1181,7 +1195,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-08-07T04:12:30+00:00"
|
||||
"time": "2020-08-10T17:45:51+00:00"
|
||||
},
|
||||
{
|
||||
"name": "phpunit/php-file-iterator",
|
||||
@ -1410,16 +1424,16 @@
|
||||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "9.3.2",
|
||||
"version": "9.3.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf"
|
||||
"reference": "7115b00b23bcd4f62a73855c9615694d2f206e71"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/eacb57f3857cb6706550bd39ea500f9b1097b0bf",
|
||||
"reference": "eacb57f3857cb6706550bd39ea500f9b1097b0bf",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/7115b00b23bcd4f62a73855c9615694d2f206e71",
|
||||
"reference": "7115b00b23bcd4f62a73855c9615694d2f206e71",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1435,7 +1449,7 @@
|
||||
"phar-io/version": "^3.0.2",
|
||||
"php": "^7.3 || ^8.0",
|
||||
"phpspec/prophecy": "^1.11.1",
|
||||
"phpunit/php-code-coverage": "^9.0",
|
||||
"phpunit/php-code-coverage": "^9.1.1",
|
||||
"phpunit/php-file-iterator": "^3.0.4",
|
||||
"phpunit/php-invoker": "^3.1",
|
||||
"phpunit/php-text-template": "^2.0.2",
|
||||
@ -1504,7 +1518,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-08-07T09:12:30+00:00"
|
||||
"time": "2020-08-10T06:50:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "sebastian/code-unit",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user