Merge branch 'stable' of github.com:pmmp/PocketMine-MP into stable

This commit is contained in:
Dylan K. Taylor 2022-01-21 19:15:59 +00:00
commit ab8b24bcd2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D

15
composer.lock generated
View File

@ -1466,9 +1466,6 @@
"require": { "require": {
"php": "^7.1 || ^8.0" "php": "^7.1 || ^8.0"
}, },
"replace": {
"myclabs/deep-copy": "self.version"
},
"require-dev": { "require-dev": {
"doctrine/collections": "^1.0", "doctrine/collections": "^1.0",
"doctrine/common": "^2.6", "doctrine/common": "^2.6",
@ -2391,16 +2388,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "9.5.11", "version": "9.5.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "2406855036db1102126125537adb1406f7242fdd" "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2406855036db1102126125537adb1406f7242fdd", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/93d4bf4c37aec6384bb9e5d390d9049a463a7256",
"reference": "2406855036db1102126125537adb1406f7242fdd", "reference": "93d4bf4c37aec6384bb9e5d390d9049a463a7256",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2478,7 +2475,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues", "issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.11" "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.12"
}, },
"funding": [ "funding": [
{ {
@ -2490,7 +2487,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-12-25T07:07:57+00:00" "time": "2022-01-21T05:54:47+00:00"
}, },
{ {
"name": "sebastian/cli-parser", "name": "sebastian/cli-parser",