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-09-03 20:00:15 +01:00
commit f207f9e3e9
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/php

@ -1 +1 @@
Subproject commit 3b30abdb0a5834348e2f4082bcccab72566424f7
Subproject commit 48c96fdf778debec0198a16045315f7242d9bc13

2
composer.json
View File

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

27
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": "496f03e5049ff36e9c9b38d0edb28f34",
"content-hash": "009abb4d28399a27dc9d059bfd849aee",
"packages": [
{
"name": "adhocore/json-comment",
@ -1918,16 +1918,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.96",
"version": "0.12.98",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "a98bdc51318f20fcae8c953d266f81a70254917f"
"reference": "3bb7cc246c057405dd5e290c3ecc62ab51d57e00"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/a98bdc51318f20fcae8c953d266f81a70254917f",
"reference": "a98bdc51318f20fcae8c953d266f81a70254917f",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/3bb7cc246c057405dd5e290c3ecc62ab51d57e00",
"reference": "3bb7cc246c057405dd5e290c3ecc62ab51d57e00",
"shasum": ""
},
"require": {
@ -1958,7 +1958,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.96"
"source": "https://github.com/phpstan/phpstan/tree/0.12.98"
},
"funding": [
{
@ -1978,7 +1978,7 @@
"type": "tidelift"
}
],
"time": "2021-08-21T11:55:13+00:00"
"time": "2021-09-02T12:33:01+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@ -2404,16 +2404,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.5.8",
"version": "9.5.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb"
"reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/191768ccd5c85513b4068bdbe99bb6390c7d54fb",
"reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
"reference": "ea8c2dfb1065eb35a79b3681eee6e6fb0a6f273b",
"shasum": ""
},
"require": {
@ -2491,7 +2491,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.8"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.9"
},
"funding": [
{
@ -2503,7 +2503,7 @@
"type": "github"
}
],
"time": "2021-07-31T15:17:34+00:00"
"time": "2021-08-31T06:47:40+00:00"
},
{
"name": "sebastian/cli-parser",
@ -3358,6 +3358,7 @@
"type": "github"
}
],
"abandoned": true,
"time": "2020-09-28T06:45:17+00:00"
},
{