mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-19 09:54:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-04-26 00:28:09 +01:00
commit f87e96026c
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -38,7 +38,7 @@
"ocramius/package-versions": "^1.5" "ocramius/package-versions": "^1.5"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "^0.12.14", "phpstan/phpstan": "^0.12.19",
"irstea/phpunit-shim": "^8.5", "irstea/phpunit-shim": "^8.5",
"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"

29
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": "86ad0aed5ce88fa096c73bced8c79348", "content-hash": "d717744d5a481a98d003220e3e6d932b",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -529,21 +529,24 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.18", "version": "0.12.19",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "1ce27fe29c8660a27926127d350d53d80c4d4286" "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1ce27fe29c8660a27926127d350d53d80c4d4286", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"reference": "1ce27fe29c8660a27926127d350d53d80c4d4286", "reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.1"
}, },
"conflict": {
"phpstan/phpstan-shim": "*"
},
"bin": [ "bin": [
"phpstan", "phpstan",
"phpstan.phar" "phpstan.phar"
@ -564,7 +567,21 @@
"MIT" "MIT"
], ],
"description": "PHPStan - PHP Static Analysis Tool", "description": "PHPStan - PHP Static Analysis Tool",
"time": "2020-03-22T16:51:47+00:00" "funding": [
{
"url": "https://github.com/ondrejmirtes",
"type": "github"
},
{
"url": "https://www.patreon.com/phpstan",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2020-04-19T20:35:10+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

2
src/pocketmine/level/generator/populator/Populator.php
View File

@ -32,7 +32,7 @@ use pocketmine\utils\Random;
abstract class Populator{ abstract class Populator{
/** /**
* @return mixed * @return void
*/ */
abstract public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random); abstract public function populate(ChunkManager $level, int $chunkX, int $chunkZ, Random $random);
} }

6
tests/phpstan/configs/runtime-type-checks.neon
View File

@ -1,7 +1,7 @@
parameters: parameters:
ignoreErrors: ignoreErrors:
- -
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\level\\\\generator\\\\Generator\\> and 'pocketmine\\\\\\\\level…' will always evaluate to true\\.$#" message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\level\\\\generator\\\\Generator\\> and 'pocketmine\\\\\\\\level\\\\\\\\generator\\\\\\\\Generator' will always evaluate to true\\.$#"
count: 1 count: 1
path: ../../../src/pocketmine/Server.php path: ../../../src/pocketmine/Server.php
@ -66,7 +66,7 @@ parameters:
path: ../../../src/pocketmine/level/Level.php path: ../../../src/pocketmine/level/Level.php
- -
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\level\\\\generator\\\\Generator\\> and 'pocketmine\\\\\\\\level…' will always evaluate to true\\.$#" message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\level\\\\generator\\\\Generator\\> and 'pocketmine\\\\\\\\level\\\\\\\\generator\\\\\\\\Generator' will always evaluate to true\\.$#"
count: 1 count: 1
path: ../../../src/pocketmine/level/generator/GeneratorManager.php path: ../../../src/pocketmine/level/generator/GeneratorManager.php
@ -76,7 +76,7 @@ parameters:
path: ../../../src/pocketmine/plugin/PluginManager.php path: ../../../src/pocketmine/plugin/PluginManager.php
- -
message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\event\\\\Event\\> and 'pocketmine\\\\\\\\event…' will always evaluate to true\\.$#" message: "#^Call to function is_subclass_of\\(\\) with class\\-string\\<pocketmine\\\\event\\\\Event\\> and 'pocketmine\\\\\\\\event\\\\\\\\Event' will always evaluate to true\\.$#"
count: 1 count: 1
path: ../../../src/pocketmine/plugin/PluginManager.php path: ../../../src/pocketmine/plugin/PluginManager.php