Merge branch 'next-minor'

This commit is contained in:
Dylan K. Taylor 2020-04-26 00:38:20 +01:00
commit 2d55b2db1b
3 changed files with 11 additions and 8 deletions

View File

@ -47,7 +47,7 @@
"ocramius/package-versions": "^1.5"
},
"require-dev": {
"phpstan/phpstan": "^0.12.14",
"phpstan/phpstan": "^0.12.19",
"irstea/phpunit-shim": "^8.5",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2"

15
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": "6e9e4623c329b6647deb2cc0db21328b",
"content-hash": "4c258478d7e0be37a3c1267c9382f37f",
"packages": [
{
"name": "adhocore/json-comment",
@ -776,21 +776,24 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.18",
"version": "0.12.19",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "1ce27fe29c8660a27926127d350d53d80c4d4286"
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286",
"reference": "1ce27fe29c8660a27926127d350d53d80c4d4286",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"shasum": ""
},
"require": {
"php": "^7.1"
},
"conflict": {
"phpstan/phpstan-shim": "*"
},
"bin": [
"phpstan",
"phpstan.phar"
@ -825,7 +828,7 @@
"type": "tidelift"
}
],
"time": "2020-03-22T16:51:47+00:00"
"time": "2020-04-19T20:35:10+00:00"
},
{
"name": "phpstan/phpstan-phpunit",

View File

@ -36,7 +36,7 @@ parameters:
path: ../../../src/plugin/PluginBase.php
-
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<TEvent of pocketmine\\\\event\\\\Event\\> and 'pocketmine\\\\\\\\event' will always evaluate to true\\.$#"
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<TEvent of pocketmine\\\\event\\\\Event\\> and 'pocketmine\\\\\\\\event\\\\\\\\Event' will always evaluate to true\\.$#"
count: 1
path: ../../../src/plugin/PluginManager.php