Denoise NetworkSession with typed properties

This commit is contained in:
Dylan K. Taylor 2021-06-13 22:27:23 +01:00
parent e5dd5a5745
commit 3d0b21f30c
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D

View File

@ -125,72 +125,50 @@ use function time;
use function ucfirst; use function ucfirst;
class NetworkSession{ class NetworkSession{
/** @var \PrefixedLogger */ private \PrefixedLogger $logger;
private $logger; private Server $server;
/** @var Server */ private ?Player $player = null;
private $server; private NetworkSessionManager $manager;
/** @var Player|null */ private string $ip;
private $player = null; private int $port;
/** @var NetworkSessionManager */ private ?PlayerInfo $info = null;
private $manager; private ?int $ping = null;
/** @var string */
private $ip;
/** @var int */
private $port;
/** @var PlayerInfo|null */
private $info = null;
/** @var int|null */
private $ping = null;
/** @var PacketHandler|null */ private ?PacketHandler $handler = null;
private $handler = null;
/** @var bool */ private bool $connected = true;
private $connected = true; private bool $disconnectGuard = false;
/** @var bool */ private bool $loggedIn = false;
private $disconnectGuard = false; private bool $authenticated = false;
/** @var bool */ private int $connectTime;
private $loggedIn = false; private ?CompoundTag $cachedOfflinePlayerData = null;
/** @var bool */
private $authenticated = false;
/** @var int */
private $connectTime;
/** @var CompoundTag|null */
private $cachedOfflinePlayerData = null;
/** @var EncryptionContext|null */ private ?EncryptionContext $cipher = null;
private $cipher = null;
/** @var Packet[] */ /** @var Packet[] */
private $sendBuffer = []; private array $sendBuffer = [];
/** /**
* @var \SplQueue|CompressBatchPromise[] * @var \SplQueue|CompressBatchPromise[]
* @phpstan-var \SplQueue<CompressBatchPromise> * @phpstan-var \SplQueue<CompressBatchPromise>
*/ */
private $compressedQueue; private \SplQueue $compressedQueue;
/** @var Compressor */ private Compressor $compressor;
private $compressor; private bool $forceAsyncCompression = true;
/** @var bool */
private $forceAsyncCompression = true;
/** @var PacketPool */ private PacketPool $packetPool;
private $packetPool;
/** @var InventoryManager|null */ private ?InventoryManager $invManager = null;
private $invManager = null;
/** @var PacketSender */ private PacketSender $sender;
private $sender;
/** @var PacketBroadcaster */ private PacketBroadcaster $broadcaster;
private $broadcaster;
/** /**
* @var \Closure[]|ObjectSet * @var \Closure[]|ObjectSet
* @phpstan-var ObjectSet<\Closure() : void> * @phpstan-var ObjectSet<\Closure() : void>
*/ */
private $disposeHooks; private ObjectSet $disposeHooks;
public function __construct(Server $server, NetworkSessionManager $manager, PacketPool $packetPool, PacketSender $sender, PacketBroadcaster $broadcaster, Compressor $compressor, string $ip, int $port){ public function __construct(Server $server, NetworkSessionManager $manager, PacketPool $packetPool, PacketSender $sender, PacketBroadcaster $broadcaster, Compressor $compressor, string $ip, int $port){
$this->server = $server; $this->server = $server;