From c0b15de504adaf4a53ad30395d7dad2c2c080045 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Tue, 17 May 2022 21:55:16 +0100
Subject: [PATCH] Modernize private static property declarations

---
 src/entity/Entity.php                             | 3 +--
 src/event/Event.php                               | 4 ++--
 src/network/mcpe/cache/ChunkCache.php             | 2 +-
 src/network/mcpe/convert/SkinAdapterSingleton.php | 3 +--
 src/permission/PermissionManager.php              | 3 +--
 src/thread/ThreadManager.php                      | 3 +--
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/entity/Entity.php b/src/entity/Entity.php
index c178c7895..7085a8827 100644
--- a/src/entity/Entity.php
+++ b/src/entity/Entity.php
@@ -80,8 +80,7 @@ abstract class Entity{
 	public const MOTION_THRESHOLD = 0.00001;
 	protected const STEP_CLIP_MULTIPLIER = 0.4;
 
-	/** @var int */
-	private static $entityCount = 1;
+	private static int $entityCount = 1;
 
 	/**
 	 * Returns a new runtime entity ID for a new entity.
diff --git a/src/event/Event.php b/src/event/Event.php
index b9a8f9828..17f0417c5 100644
--- a/src/event/Event.php
+++ b/src/event/Event.php
@@ -30,8 +30,8 @@ use function get_class;
 
 abstract class Event{
 	private const MAX_EVENT_CALL_DEPTH = 50;
-	/** @var int */
-	private static $eventCallDepth = 1;
+
+	private static int $eventCallDepth = 1;
 
 	/** @var string|null */
 	protected $eventName = null;
diff --git a/src/network/mcpe/cache/ChunkCache.php b/src/network/mcpe/cache/ChunkCache.php
index 11427be2c..e03c672ba 100644
--- a/src/network/mcpe/cache/ChunkCache.php
+++ b/src/network/mcpe/cache/ChunkCache.php
@@ -39,7 +39,7 @@ use function strlen;
  */
 class ChunkCache implements ChunkListener{
 	/** @var self[][] */
-	private static $instances = [];
+	private static array $instances = [];
 
 	/**
 	 * Fetches the ChunkCache instance for the given world. This lazily creates cache systems as needed.
diff --git a/src/network/mcpe/convert/SkinAdapterSingleton.php b/src/network/mcpe/convert/SkinAdapterSingleton.php
index c49d3a780..2962b866e 100644
--- a/src/network/mcpe/convert/SkinAdapterSingleton.php
+++ b/src/network/mcpe/convert/SkinAdapterSingleton.php
@@ -27,8 +27,7 @@ namespace pocketmine\network\mcpe\convert;
  * Accessor for SkinAdapter
  */
 class SkinAdapterSingleton{
-	/** @var SkinAdapter|null */
-	private static $skinAdapter = null;
+	private static ?SkinAdapter $skinAdapter = null;
 
 	public static function get() : SkinAdapter{
 		if(self::$skinAdapter === null){
diff --git a/src/permission/PermissionManager.php b/src/permission/PermissionManager.php
index b8c859af3..4123fb63d 100644
--- a/src/permission/PermissionManager.php
+++ b/src/permission/PermissionManager.php
@@ -27,8 +27,7 @@ use function count;
 use function spl_object_id;
 
 class PermissionManager{
-	/** @var PermissionManager|null */
-	private static $instance = null;
+	private static ?self $instance = null;
 
 	public static function getInstance() : PermissionManager{
 		if(self::$instance === null){
diff --git a/src/thread/ThreadManager.php b/src/thread/ThreadManager.php
index bf39c31a7..2ade68f6e 100644
--- a/src/thread/ThreadManager.php
+++ b/src/thread/ThreadManager.php
@@ -27,8 +27,7 @@ use function spl_object_id;
 
 class ThreadManager extends \Volatile{
 
-	/** @var ThreadManager|null */
-	private static $instance = null;
+	private static ?self $instance = null;
 
 	public static function init() : void{
 		self::$instance = new ThreadManager();