Merge remote-tracking branch 'origin/minor-next' into major-next

This commit is contained in:
Dylan K. Taylor
2023-03-22 22:49:22 +00:00
10 changed files with 168 additions and 59 deletions

29
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": "43708f57042d7d40c732c3a3b87a4202",
"content-hash": "ebce35eefc0b925838fabd1fea39b0a5",
"packages": [
{
"name": "adhocore/json-comment",
@@ -589,16 +589,16 @@
},
{
"name": "pocketmine/locale-data",
"version": "2.19.0",
"version": "2.19.5",
"source": {
"type": "git",
"url": "https://github.com/pmmp/Language.git",
"reference": "f47d1687f21f09d2858f040873184a11746b1cf7"
"reference": "71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pmmp/Language/zipball/f47d1687f21f09d2858f040873184a11746b1cf7",
"reference": "f47d1687f21f09d2858f040873184a11746b1cf7",
"url": "https://api.github.com/repos/pmmp/Language/zipball/71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d",
"reference": "71af5f9bd23b4e4bad8920dac7f4fe08e5205f7d",
"shasum": ""
},
"type": "library",
@@ -606,9 +606,9 @@
"description": "Language resources used by PocketMine-MP",
"support": {
"issues": "https://github.com/pmmp/Language/issues",
"source": "https://github.com/pmmp/Language/tree/2.19.0"
"source": "https://github.com/pmmp/Language/tree/2.19.5"
},
"time": "2023-02-13T13:55:22+00:00"
"time": "2023-03-19T16:45:15+00:00"
},
{
"name": "pocketmine/log",
@@ -1775,16 +1775,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.6",
"version": "1.10.7",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a"
"reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
"reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/b10ceb526d9607903c5b2673f1fc8775dbe48975",
"reference": "b10ceb526d9607903c5b2673f1fc8775dbe48975",
"shasum": ""
},
"require": {
@@ -1813,8 +1813,11 @@
"static analysis"
],
"support": {
"docs": "https://phpstan.org/user-guide/getting-started",
"forum": "https://github.com/phpstan/phpstan/discussions",
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.10.6"
"security": "https://github.com/phpstan/phpstan/security/policy",
"source": "https://github.com/phpstan/phpstan-src"
},
"funding": [
{
@@ -1830,7 +1833,7 @@
"type": "tidelift"
}
],
"time": "2023-03-09T16:55:12+00:00"
"time": "2023-03-16T15:24:20+00:00"
},
{
"name": "phpstan/phpstan-phpunit",