From 0dd68e587fcffdf16f08aa9db6bf246a676c1cfc Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 13 Mar 2020 16:30:35 +0000 Subject: [PATCH 1/3] require phpstan ^0.12.14 (for incremental analysis) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9b21acce3..5fc01e8d7 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "adhocore/json-comment": "^0.1.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.9", + "phpstan/phpstan": "^0.12.14", "irstea/phpunit-shim": "^8.5", "phpstan/phpstan-phpunit": "^0.12.6", "phpstan/phpstan-strict-rules": "^0.12.2" From b5dd147ec74ee4cc94e108bba9421a1ed756882e Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 14 Mar 2020 13:24:40 +0000 Subject: [PATCH 2/3] PlayerQuitEvent: fix types of quitMessage --- src/pocketmine/event/player/PlayerQuitEvent.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pocketmine/event/player/PlayerQuitEvent.php b/src/pocketmine/event/player/PlayerQuitEvent.php index de8608dd0..5af86865b 100644 --- a/src/pocketmine/event/player/PlayerQuitEvent.php +++ b/src/pocketmine/event/player/PlayerQuitEvent.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace pocketmine\event\player; +use pocketmine\lang\TextContainer; use pocketmine\lang\TranslationContainer; use pocketmine\Player; @@ -31,13 +32,13 @@ use pocketmine\Player; */ class PlayerQuitEvent extends PlayerEvent{ - /** @var TranslationContainer|string */ + /** @var TextContainer|string */ protected $quitMessage; /** @var string */ protected $quitReason; /** - * @param TranslationContainer|string $quitMessage + * @param TextContainer|string $quitMessage */ public function __construct(Player $player, $quitMessage, string $quitReason){ $this->player = $player; @@ -46,14 +47,14 @@ class PlayerQuitEvent extends PlayerEvent{ } /** - * @param TranslationContainer|string $quitMessage + * @param TextContainer|string $quitMessage */ public function setQuitMessage($quitMessage) : void{ $this->quitMessage = $quitMessage; } /** - * @return TranslationContainer|string + * @return TextContainer|string */ public function getQuitMessage(){ return $this->quitMessage; From f84abcd1fefa571040ab3778a68c1208f0142f41 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Sat, 14 Mar 2020 13:36:35 +0000 Subject: [PATCH 3/3] sync composer.lock with 0dd68e587fcffdf16f08aa9db6bf246a676c1cfc --- composer.lock | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 9e87c7c4b..4ff8a37c6 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "e22866a7924c444da73ff31b831b30cb", + "content-hash": "0a965a0cd39d5b3dd7b0ee1f0abe009b", "packages": [ { "name": "adhocore/json-comment", @@ -609,5 +609,6 @@ "ext-zip": "*", "ext-zlib": ">=1.2.11" }, - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" }