mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-03 16:49:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Dylan K. Taylor 2021-02-12 17:34:25 +00:00
commit dff13a884f
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -49,7 +49,7 @@
"respect/validation": "^2.0" "respect/validation": "^2.0"
}, },
"require-dev": { "require-dev": {
"phpstan/phpstan": "0.12.74", "phpstan/phpstan": "0.12.75",
"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": "0cdfe5ec21f19c4a00fe1ae40ede785e", "content-hash": "1b623b79eb37edb4b40b970cc95e2c70",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -1579,16 +1579,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.74", "version": "0.12.75",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2" "reference": "2e4738cd67e0163861a065180eff7eb5c8417d6e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2e4738cd67e0163861a065180eff7eb5c8417d6e",
"reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2", "reference": "2e4738cd67e0163861a065180eff7eb5c8417d6e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1619,7 +1619,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.74" "source": "https://github.com/phpstan/phpstan/tree/0.12.75"
}, },
"funding": [ "funding": [
{ {
@ -1635,7 +1635,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-02-08T15:00:25+00:00" "time": "2021-02-11T13:58:47+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",

2
src/utils/Filesystem.php
View File

@ -130,7 +130,7 @@ final class Filesystem{
public static function createLockFile(string $lockFilePath) : ?int{ public static function createLockFile(string $lockFilePath) : ?int{
$resource = fopen($lockFilePath, "a+b"); $resource = fopen($lockFilePath, "a+b");
if($resource === false){ if($resource === false){
throw new \InvalidArgumentException("Invalid lock file path"); throw new \InvalidArgumentException("Invalid lock file path or read/write permissions denied");
} }
if(!flock($resource, LOCK_EX | LOCK_NB)){ if(!flock($resource, LOCK_EX | LOCK_NB)){
//wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the //wait for a shared lock to avoid race conditions if two servers started at the same time - this makes sure the

1
src/utils/MainLoggerThread.php
View File

@ -73,6 +73,7 @@ final class MainLoggerThread extends \Thread{
*/ */
private function writeLogStream($logResource) : void{ private function writeLogStream($logResource) : void{
while($this->buffer->count() > 0){ while($this->buffer->count() > 0){
/** @var string $chunk */
$chunk = $this->buffer->shift(); $chunk = $this->buffer->shift();
fwrite($logResource, $chunk); fwrite($logResource, $chunk);
} }

10
tests/phpstan/configs/impossible-generics.neon
View File

@ -1,5 +1,15 @@
parameters: parameters:
ignoreErrors: ignoreErrors:
-
message: "#^Parameter \\#1 \\$class of static method pocketmine\\\\event\\\\HandlerListManager\\:\\:isValidClass\\(\\) expects ReflectionClass\\<pocketmine\\\\event\\\\Event\\>, ReflectionClass\\<object\\> given\\.$#"
count: 1
path: ../../../src/event/HandlerListManager.php
-
message: "#^Parameter \\#1 \\$class of static method pocketmine\\\\event\\\\HandlerListManager\\:\\:resolveNearestHandleableParent\\(\\) expects ReflectionClass\\<pocketmine\\\\event\\\\Event\\>, ReflectionClass\\<object\\> given\\.$#"
count: 1
path: ../../../src/event/HandlerListManager.php
- -
message: "#^Property pocketmine\\\\event\\\\RegisteredListener\\:\\:\\$handler type has no signature specified for Closure\\.$#" message: "#^Property pocketmine\\\\event\\\\RegisteredListener\\:\\:\\$handler type has no signature specified for Closure\\.$#"
count: 1 count: 1