From de12b701ac7f0350eef777d9ef51dd14def9bb9b Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 28 Apr 2022 13:07:58 +0100
Subject: [PATCH] Modernize type declarations in src/world/format

---
 src/world/format/BiomeArray.php               |  4 +--
 src/world/format/Chunk.php                    |  3 +--
 src/world/format/HeightArray.php              |  2 +-
 src/world/format/SubChunk.php                 | 20 +++++---------
 src/world/format/io/FormatConverter.php       | 27 +++++++------------
 .../format/io/region/RegionGarbageMap.php     |  5 ++--
 .../io/region/RegionLocationTableEntry.php    | 10 +++----
 7 files changed, 24 insertions(+), 47 deletions(-)

diff --git a/src/world/format/BiomeArray.php b/src/world/format/BiomeArray.php
index ed45e88fc..79091d7ea 100644
--- a/src/world/format/BiomeArray.php
+++ b/src/world/format/BiomeArray.php
@@ -29,9 +29,7 @@ use function str_repeat;
 use function strlen;
 
 final class BiomeArray{
-
-	/** @var string */
-	private $payload;
+	private string $payload;
 
 	/**
 	 * @param string $payload ZZZZXXXX key bits
diff --git a/src/world/format/Chunk.php b/src/world/format/Chunk.php
index 6a8dad59c..b3265cbdb 100644
--- a/src/world/format/Chunk.php
+++ b/src/world/format/Chunk.php
@@ -43,8 +43,7 @@ class Chunk{
 	public const COORD_BIT_SIZE = SubChunk::COORD_BIT_SIZE;
 	public const COORD_MASK = SubChunk::COORD_MASK;
 
-	/** @var int */
-	private $terrainDirtyFlags = 0;
+	private int $terrainDirtyFlags = 0;
 
 	/** @var bool|null */
 	protected $lightPopulated = false;
diff --git a/src/world/format/HeightArray.php b/src/world/format/HeightArray.php
index 88df7299b..faf9e19be 100644
--- a/src/world/format/HeightArray.php
+++ b/src/world/format/HeightArray.php
@@ -32,7 +32,7 @@ final class HeightArray{
 	 * @var \SplFixedArray|int[]
 	 * @phpstan-var \SplFixedArray<int>
 	 */
-	private $array;
+	private \SplFixedArray $array;
 
 	/**
 	 * @param int[] $values ZZZZXXXX key bit order
diff --git a/src/world/format/SubChunk.php b/src/world/format/SubChunk.php
index ea20b917f..81a749949 100644
--- a/src/world/format/SubChunk.php
+++ b/src/world/format/SubChunk.php
@@ -32,27 +32,21 @@ class SubChunk{
 	public const COORD_MASK = ~(~0 << self::COORD_BIT_SIZE);
 	public const EDGE_LENGTH = 1 << self::COORD_BIT_SIZE;
 
-	/** @var int */
-	private $emptyBlockId;
 	/** @var PalettedBlockArray[] */
-	private $blockLayers;
-
-	/** @var LightArray|null */
-	private $blockLight;
-	/** @var LightArray|null */
-	private $skyLight;
+	private array $blockLayers;
 
 	/**
 	 * SubChunk constructor.
 	 *
 	 * @param PalettedBlockArray[] $blocks
 	 */
-	public function __construct(int $emptyBlockId, array $blocks, ?LightArray $skyLight = null, ?LightArray $blockLight = null){
-		$this->emptyBlockId = $emptyBlockId;
+	public function __construct(
+		private int $emptyBlockId,
+		array $blocks, //TODO: promote this once we can break BC again (needs a name change)
+		private ?LightArray $skyLight = null,
+		private ?LightArray $blockLight = null
+	){
 		$this->blockLayers = $blocks;
-
-		$this->skyLight = $skyLight;
-		$this->blockLight = $blockLight;
 	}
 
 	/**
diff --git a/src/world/format/io/FormatConverter.php b/src/world/format/io/FormatConverter.php
index 2599415c4..b2c2b2afb 100644
--- a/src/world/format/io/FormatConverter.php
+++ b/src/world/format/io/FormatConverter.php
@@ -41,26 +41,17 @@ use function rtrim;
 use const DIRECTORY_SEPARATOR;
 
 class FormatConverter{
+	private string $backupPath;
+	private \Logger $logger;
 
-	/** @var WorldProvider */
-	private $oldProvider;
-	/** @var WritableWorldProviderManagerEntry */
-	private $newProvider;
-
-	/** @var string */
-	private $backupPath;
-
-	/** @var \Logger */
-	private $logger;
-
-	/** @var int */
-	private $chunksPerProgressUpdate;
-
-	public function __construct(WorldProvider $oldProvider, WritableWorldProviderManagerEntry $newProvider, string $backupPath, \Logger $logger, int $chunksPerProgressUpdate = 256){
-		$this->oldProvider = $oldProvider;
-		$this->newProvider = $newProvider;
+	public function __construct(
+		private WorldProvider $oldProvider,
+		private WritableWorldProviderManagerEntry $newProvider,
+		string $backupPath,
+		\Logger $logger,
+		private int $chunksPerProgressUpdate = 256
+	){
 		$this->logger = new \PrefixedLogger($logger, "World Converter: " . $this->oldProvider->getWorldData()->getName());
-		$this->chunksPerProgressUpdate = $chunksPerProgressUpdate;
 
 		if(!file_exists($backupPath)){
 			@mkdir($backupPath, 0777, true);
diff --git a/src/world/format/io/region/RegionGarbageMap.php b/src/world/format/io/region/RegionGarbageMap.php
index 9b0373449..b07b2f111 100644
--- a/src/world/format/io/region/RegionGarbageMap.php
+++ b/src/world/format/io/region/RegionGarbageMap.php
@@ -32,9 +32,8 @@ use const SORT_NUMERIC;
 final class RegionGarbageMap{
 
 	/** @var RegionLocationTableEntry[] */
-	private $entries = [];
-	/** @var bool */
-	private $clean = false;
+	private array $entries = [];
+	private bool $clean = false;
 
 	/**
 	 * @param RegionLocationTableEntry[] $entries
diff --git a/src/world/format/io/region/RegionLocationTableEntry.php b/src/world/format/io/region/RegionLocationTableEntry.php
index c3c68be87..7ff00f6d0 100644
--- a/src/world/format/io/region/RegionLocationTableEntry.php
+++ b/src/world/format/io/region/RegionLocationTableEntry.php
@@ -26,13 +26,9 @@ namespace pocketmine\world\format\io\region;
 use function range;
 
 class RegionLocationTableEntry{
-
-	/** @var int */
-	private $firstSector;
-	/** @var int */
-	private $sectorCount;
-	/** @var int */
-	private $timestamp;
+	private int $firstSector;
+	private int $sectorCount;
+	private int $timestamp;
 
 	/**
 	 * @throws \InvalidArgumentException