Merge branch 'next-major' into modern-world-support

This commit is contained in:
Dylan K. Taylor
2022-05-11 13:14:42 +01:00
19 changed files with 332 additions and 120 deletions

38
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": "f28b4d0dae7984a204a5538b7f614ee4",
"content-hash": "f3349dee8c1925a1890757897b25a2dc",
"packages": [
{
"name": "adhocore/json-comment",
@ -563,16 +563,16 @@
},
{
"name": "pocketmine/locale-data",
"version": "2.6.2",
"version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/pmmp/Language.git",
"reference": "eae9303493884edcc5321b50002a5dc956a36a23"
"reference": "f00216c4709d2c5a2af478498315206b336b8e2e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/Language/zipball/eae9303493884edcc5321b50002a5dc956a36a23",
"reference": "eae9303493884edcc5321b50002a5dc956a36a23",
"url": "https://api.github.com/repos/pmmp/Language/zipball/f00216c4709d2c5a2af478498315206b336b8e2e",
"reference": "f00216c4709d2c5a2af478498315206b336b8e2e",
"shasum": ""
},
"type": "library",
@ -580,9 +580,9 @@
"description": "Language resources used by PocketMine-MP",
"support": {
"issues": "https://github.com/pmmp/Language/issues",
"source": "https://github.com/pmmp/Language/tree/2.6.2"
"source": "https://github.com/pmmp/Language/tree/2.7.0"
},
"time": "2022-04-10T20:44:40+00:00"
"time": "2022-05-10T13:29:27+00:00"
},
{
"name": "pocketmine/log",
@ -1846,16 +1846,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.6.3",
"version": "1.6.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "6128620b98292e0b69ea6d799871d77163681c8e"
"reference": "d76498c5531232cb8386ceb6004f7e013138d3ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/6128620b98292e0b69ea6d799871d77163681c8e",
"reference": "6128620b98292e0b69ea6d799871d77163681c8e",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d76498c5531232cb8386ceb6004f7e013138d3ba",
"reference": "d76498c5531232cb8386ceb6004f7e013138d3ba",
"shasum": ""
},
"require": {
@ -1881,7 +1881,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.6.3"
"source": "https://github.com/phpstan/phpstan/tree/1.6.8"
},
"funding": [
{
@ -1901,7 +1901,7 @@
"type": "tidelift"
}
],
"time": "2022-04-28T11:27:53+00:00"
"time": "2022-05-10T06:54:21+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -1957,16 +1957,16 @@
},
{
"name": "phpstan/phpstan-strict-rules",
"version": "1.2.1",
"version": "1.2.3",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-strict-rules.git",
"reference": "f3ca6464eae640a556c69a02b3b77a2507475d2f"
"reference": "0c82c96f2a55d8b91bbc7ee6512c94f68a206b43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/f3ca6464eae640a556c69a02b3b77a2507475d2f",
"reference": "f3ca6464eae640a556c69a02b3b77a2507475d2f",
"url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/0c82c96f2a55d8b91bbc7ee6512c94f68a206b43",
"reference": "0c82c96f2a55d8b91bbc7ee6512c94f68a206b43",
"shasum": ""
},
"require": {
@ -1999,9 +1999,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/1.2.1"
"source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.2.3"
},
"time": "2022-04-28T07:20:18+00:00"
"time": "2022-05-04T15:20:40+00:00"
},
{
"name": "phpunit/php-code-coverage",