From eefb6ae8e7a109a97658b7c6c5768cbffaed58a1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 17 Jun 2020 21:29:16 +0100 Subject: [PATCH] LoginPacketHandler: use reference to new PlayerInfo directly, fixes a PHPStan level 8 error --- src/network/mcpe/handler/LoginPacketHandler.php | 7 ++++--- tests/phpstan/configs/l8-baseline.neon | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/network/mcpe/handler/LoginPacketHandler.php b/src/network/mcpe/handler/LoginPacketHandler.php index 7203f4bd0..c6577d625 100644 --- a/src/network/mcpe/handler/LoginPacketHandler.php +++ b/src/network/mcpe/handler/LoginPacketHandler.php @@ -124,17 +124,18 @@ class LoginPacketHandler extends PacketHandler{ }catch(\InvalidArgumentException $e){ throw BadPacketException::wrap($e, "Failed to parse login UUID"); } - ($this->playerInfoConsumer)(new PlayerInfo( + $playerInfo = new PlayerInfo( $extraData->displayName, $uuid, $skin, $clientData->LanguageCode, $extraData->XUID, (array) $clientData - )); + ); + ($this->playerInfoConsumer)($playerInfo); $ev = new PlayerPreLoginEvent( - $this->session->getPlayerInfo(), + $playerInfo, $this->session->getIp(), $this->session->getPort(), $this->server->requiresAuthentication() diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon index 19c3f1f46..8b49c9680 100644 --- a/tests/phpstan/configs/l8-baseline.neon +++ b/tests/phpstan/configs/l8-baseline.neon @@ -485,11 +485,6 @@ parameters: count: 1 path: ../../../src/network/mcpe/encryption/PrepareEncryptionTask.php - - - message: "#^Parameter \\#1 \\$playerInfo of class pocketmine\\\\event\\\\player\\\\PlayerPreLoginEvent constructor expects pocketmine\\\\player\\\\PlayerInfo, pocketmine\\\\player\\\\PlayerInfo\\|null given\\.$#" - count: 1 - path: ../../../src/network/mcpe/handler/LoginPacketHandler.php - - message: "#^Cannot call method getUsername\\(\\) on pocketmine\\\\player\\\\PlayerInfo\\|null\\.$#" count: 2