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

This commit is contained in:
Dylan K. Taylor 2021-03-22 21:22:56 +00:00
commit c09fcb2df2
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 10 additions and 9 deletions

View File

@ -23,6 +23,7 @@
## For developers ## For developers
* [Building and running from source](BUILDING.md) * [Building and running from source](BUILDING.md)
* [Developer documentation](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers
* [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development * [Latest API documentation](https://jenkins.pmmp.io/job/PocketMine-MP-doc/doxygen/) - Doxygen documentation generated from development
* [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins * [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
* [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features * [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features

View File

@ -38,7 +38,7 @@
"pocketmine/spl": "^0.4.0" "pocketmine/spl": "^0.4.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.81", "phpstan/phpstan": "0.12.82",
"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": "c731270da66df8e18ea9487d91bc2e3f", "content-hash": "df0cb7c9eab4da5e693533deb010f9d1",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1002,16 +1002,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.81", "version": "0.12.82",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8" "reference": "3920f0fb0aff39263d3a4cb0bca120a67a1a6a11"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/0dd5b0ebeff568f7000022ea5f04aa86ad3124b8", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3920f0fb0aff39263d3a4cb0bca120a67a1a6a11",
"reference": "0dd5b0ebeff568f7000022ea5f04aa86ad3124b8", "reference": "3920f0fb0aff39263d3a4cb0bca120a67a1a6a11",
"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.81" "source": "https://github.com/phpstan/phpstan/tree/0.12.82"
}, },
"funding": [ "funding": [
{ {
@ -1058,7 +1058,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-03-08T22:03:02+00:00" "time": "2021-03-19T06:08:17+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

View File

@ -7,4 +7,4 @@ This site can be accessed via https://apidoc.pmmp.io.
### Additional developer resources ### Additional developer resources
- [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins - [DevTools](https://github.com/pmmp/DevTools/) - Development tools plugin for creating plugins
- [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features - [ExamplePlugin](https://github.com/pmmp/ExamplePlugin/) - Example plugin demonstrating some basic API features
- [DeveloperDocs](https://github.com/pmmp/DeveloperDocs/) - Reference, guides and specifications for the PocketMine-MP API - [DeveloperDocs](https://devdoc.pmmp.io) - General documentation for PocketMine-MP plugin developers