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

This commit is contained in:
Dylan K. Taylor 2021-03-12 22:08:20 +00:00
commit 9e27c47116
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 8 additions and 8 deletions

View File

@ -37,7 +37,7 @@
"pocketmine/spl": "^0.4.0" "pocketmine/spl": "^0.4.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.80", "phpstan/phpstan": "0.12.81",
"phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2", "phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^9.2" "phpunit/phpunit": "^9.2"

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "0ff6c2c87e1c350034929c4507151e38", "content-hash": "ef9b64ade88849af6ccd0db733e106b5",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1002,16 +1002,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.80", "version": "0.12.81",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686" "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6a1b17f22ecf708d434d6bee05092647ec7e686", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
"reference": "c6a1b17f22ecf708d434d6bee05092647ec7e686", "reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1042,7 +1042,7 @@
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"support": { "support": {
"issues": "https://github.com/phpstan/phpstan/issues", "issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.80" "source": "https://github.com/phpstan/phpstan/tree/0.12.81"
}, },
"funding": [ "funding": [
{ {
@ -1058,7 +1058,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-28T20:22:43+00:00" "time": "2021-03-08T22:03:02+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",