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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-07-09 19:36:32 +01:00
commit aeb007d0a1
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/php

@ -1 +1 @@
Subproject commit 45ab9b0781e78e23e1fd919e8137dbf33c7e7abb
Subproject commit 52dba1e6ad1a3f38ea3652c97e64f2de59451209

4
changelogs/3.21.md
View File

@ -9,3 +9,7 @@ Plugin developers should **only** update their required API to this version if y
# 3.21.0
- PHP 7.4 is now required as a minimum.
- A workaround for player movement added in 1.14.30 has been removed.
# 3.21.1
- Fixed so-called 'pot lag' - a bug that could occur when using items while rapidly switching hotbar slots.
- Plugins in crashdumps are now ordered alphabetically for easier reading.

2
composer.json
View File

@ -52,7 +52,7 @@
"webmozart/path-util": "^2.3"
},
"require-dev": {
"phpstan/phpstan": "0.12.90",
"phpstan/phpstan": "0.12.91",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2"

55
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": "3e3b505ec39bbf9e449e0466f154d5aa",
"content-hash": "28939b75a6c33177454a6d027bf4d7cb",
"packages": [
{
"name": "adhocore/json-comment",
@ -1550,16 +1550,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.10.5",
"version": "v4.11.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
"shasum": ""
},
"require": {
@ -1600,9 +1600,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
},
"time": "2021-05-03T19:11:20+00:00"
"time": "2021-07-03T13:36:55+00:00"
},
{
"name": "phar-io/manifest",
@ -1942,16 +1942,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.90",
"version": "0.12.91",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4"
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"reference": "f0e4b56630fc3d4eb5be86606d07212ac212ede4",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8226701cd228a0d63c2df995de7ab6070c69ac6a",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a",
"shasum": ""
},
"require": {
@ -1982,7 +1982,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.90"
"source": "https://github.com/phpstan/phpstan/tree/0.12.91"
},
"funding": [
{
@ -2002,7 +2002,7 @@
"type": "tidelift"
}
],
"time": "2021-06-18T07:15:38+00:00"
"time": "2021-07-04T15:31:48+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -2060,16 +2060,16 @@
},
{
"name": "phpstan/phpstan-strict-rules",
"version": "0.12.9",
"version": "0.12.10",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "0705fefc7c9168529fd130e341428f5f10f4f01d"
"reference": "ce82a050f9da4a32e438272907e38cdd04806223"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/0705fefc7c9168529fd130e341428f5f10f4f01d",
"reference": "0705fefc7c9168529fd130e341428f5f10f4f01d",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/ce82a050f9da4a32e438272907e38cdd04806223",
"reference": "ce82a050f9da4a32e438272907e38cdd04806223",
"shasum": ""
},
"require": {
@ -2077,10 +2077,9 @@
"phpstan/phpstan": "^0.12.66"
},
"require-dev": {
"phing/phing": "^2.16.3",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/phpstan-phpunit": "^0.12.16",
"phpunit/phpunit": "^7.5.20"
"phpunit/phpunit": "^9.5"
},
"type": "phpstan-extension",
"extra": {
@ -2105,9 +2104,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.9"
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/0.12.10"
},
"time": "2021-01-13T08:50:28+00:00"
"time": "2021-07-04T14:57:39+00:00"
},
{
"name": "phpunit/php-code-coverage",
@ -2429,16 +2428,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.5",
"version": "9.5.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "89ff45ea9d70e35522fb6654a2ebc221158de276"
"reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276",
"reference": "89ff45ea9d70e35522fb6654a2ebc221158de276",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
"reference": "fb9b8333f14e3dce976a60ef6a7e05c7c7ed8bfb",
"shasum": ""
},
"require": {
@ -2468,7 +2467,7 @@
"sebastian/global-state": "^5.0.1",
"sebastian/object-enumerator": "^4.0.3",
"sebastian/resource-operations": "^3.0.3",
"sebastian/type": "^2.3.2",
"sebastian/type": "^2.3.4",
"sebastian/version": "^3.0.2"
},
"require-dev": {
@ -2516,7 +2515,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.6"
},
"funding": [
{
@ -2528,7 +2527,7 @@
"type": "github"
}
],
"time": "2021-06-05T04:49:07+00:00"
"time": "2021-06-23T05:14:38+00:00"
},
{
"name": "sebastian/cli-parser",