Modernize private property declarations in src/network

This commit is contained in:
Dylan K. Taylor
2022-05-17 21:22:33 +01:00
parent cd016bedce
commit 6eac2ea7a5
31 changed files with 154 additions and 340 deletions

View File

@ -26,12 +26,7 @@ namespace pocketmine\network\mcpe\raklib;
use raklib\server\ipc\InterThreadChannelReader;
final class PthreadsChannelReader implements InterThreadChannelReader{
/** @var \Threaded */
private $buffer;
public function __construct(\Threaded $buffer){
$this->buffer = $buffer;
}
public function __construct(private \Threaded $buffer){}
public function read() : ?string{
return $this->buffer->shift();

View File

@ -20,12 +20,7 @@ namespace pocketmine\network\mcpe\raklib;
use raklib\server\ipc\InterThreadChannelWriter;
final class PthreadsChannelWriter implements InterThreadChannelWriter{
/** @var \Threaded */
private $buffer;
public function __construct(\Threaded $buffer){
$this->buffer = $buffer;
}
public function __construct(private \Threaded $buffer){}
public function write(string $str) : void{
$this->buffer[] = $str;

View File

@ -62,31 +62,21 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
private const MCPE_RAKNET_PACKET_ID = "\xfe";
/** @var Server */
private $server;
private Server $server;
private Network $network;
/** @var Network */
private $network;
/** @var int */
private $rakServerId;
/** @var RakLibServer */
private $rakLib;
private int $rakServerId;
private RakLibServer $rakLib;
/** @var NetworkSession[] */
private $sessions = [];
private array $sessions = [];
/** @var RakLibToUserThreadMessageReceiver */
private $eventReceiver;
/** @var UserToRakLibThreadMessageSender */
private $interface;
private RakLibToUserThreadMessageReceiver $eventReceiver;
private UserToRakLibThreadMessageSender $interface;
/** @var SleeperNotifier */
private $sleeper;
private SleeperNotifier $sleeper;
/** @var PacketBroadcaster */
private $broadcaster;
private PacketBroadcaster $broadcaster;
public function __construct(Server $server, string $ip, int $port, bool $ipV6){
$this->server = $server;

View File

@ -26,19 +26,12 @@ namespace pocketmine\network\mcpe\raklib;
use pocketmine\network\mcpe\PacketSender;
class RakLibPacketSender implements PacketSender{
private bool $closed = false;
/** @var int */
private $sessionId;
/** @var RakLibInterface */
private $handler;
/** @var bool */
private $closed = false;
public function __construct(int $sessionId, RakLibInterface $handler){
$this->sessionId = $sessionId;
$this->handler = $handler;
}
public function __construct(
private int $sessionId,
private RakLibInterface $handler
){}
public function send(string $payload, bool $immediate) : void{
if(!$this->closed){