From fcc9e62c65217e42d2fcb916e3b61116c2c227af Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 10 Jun 2020 10:33:35 +0100 Subject: [PATCH] CommandEnum: specify enumValues type phpstan 0.12.26 starts reporting errors about the result of array_search() being given to some constructor or another because of the lack of key type specification. --- src/pocketmine/Player.php | 3 ++- src/pocketmine/network/mcpe/protocol/types/CommandEnum.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 49b4d88259..79b259a41d 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -172,6 +172,7 @@ use pocketmine\utils\TextFormat; use pocketmine\utils\UUID; use function abs; use function array_merge; +use function array_values; use function assert; use function base64_decode; use function ceil; @@ -742,7 +743,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{ } $data->aliases = new CommandEnum(); $data->aliases->enumName = ucfirst($command->getName()) . "Aliases"; - $data->aliases->enumValues = $aliases; + $data->aliases->enumValues = array_values($aliases); } $pk->commandData[$command->getName()] = $data; diff --git a/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php b/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php index e6621c7a4d..d353bbaadf 100644 --- a/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php +++ b/src/pocketmine/network/mcpe/protocol/types/CommandEnum.php @@ -26,7 +26,10 @@ namespace pocketmine\network\mcpe\protocol\types; class CommandEnum{ /** @var string */ public $enumName; - /** @var string[] */ + /** + * @var string[] + * @phpstan-var list + */ public $enumValues = []; }