mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-07-13 18:11:03 +01:00
commit 16faafa1ef
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -38,7 +38,7 @@
"pocketmine/spl": "^0.4.0" "pocketmine/spl": "^0.4.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.91", "phpstan/phpstan": "0.12.92",
"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": "94852d3414c2feabe1233b5a58decee2", "content-hash": "79b082334bd3930d7eef49be9b70e59f",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1009,16 +1009,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.91", "version": "0.12.92",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a" "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/8226701cd228a0d63c2df995de7ab6070c69ac6a", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/64d4c5dc8ea96972bc18432d137a330239a5d2b2",
"reference": "8226701cd228a0d63c2df995de7ab6070c69ac6a", "reference": "64d4c5dc8ea96972bc18432d137a330239a5d2b2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1049,7 +1049,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.91" "source": "https://github.com/phpstan/phpstan/tree/0.12.92"
}, },
"funding": [ "funding": [
{ {
@ -1069,7 +1069,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-07-04T15:31:48+00:00" "time": "2021-07-10T13:53:49+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",