Modernize type declarations in src/world/format

src/world/format/BiomeArray.php

@@ -29,9 +29,7 @@ use function str_repeat;
 use function strlen;
 
 final class BiomeArray{
-
+	private string $payload;
-	/** @var string */
-	private $payload;
 
 	/**
 	 * @param string $payload ZZZZXXXX key bits

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 int $terrainDirtyFlags = 0;
-	private $terrainDirtyFlags = 0;
 
 	/** @var bool|null */
 	protected $lightPopulated = false;

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

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;
+	private array $blockLayers;
-
-	/** @var LightArray|null */
-	private $blockLight;
-	/** @var LightArray|null */
-	private $skyLight;
 
 	/**
 	 * SubChunk constructor.
 	 *
 	 * @param PalettedBlockArray[] $blocks
 	 */
-	public function __construct(int $emptyBlockId, array $blocks, ?LightArray $skyLight = null, ?LightArray $blockLight = null){
+	public function __construct(
-		$this->emptyBlockId = $emptyBlockId;
+		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;
 	}
 
 	/**

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 */
+	public function __construct(
-	private $oldProvider;
+		private WorldProvider $oldProvider,
-	/** @var WritableWorldProviderManagerEntry */
+		private WritableWorldProviderManagerEntry $newProvider,
-	private $newProvider;
+		string $backupPath,
-
+		\Logger $logger,
-	/** @var string */
+		private int $chunksPerProgressUpdate = 256
-	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;
 		$this->logger = new \PrefixedLogger($logger, "World Converter: " . $this->oldProvider->getWorldData()->getName());
-		$this->chunksPerProgressUpdate = $chunksPerProgressUpdate;
 
 		if(!file_exists($backupPath)){
 			@mkdir($backupPath, 0777, true);

src/world/format/io/region/RegionGarbageMap.php

@@ -32,9 +32,8 @@ use const SORT_NUMERIC;
 final class RegionGarbageMap{
 
 	/** @var RegionLocationTableEntry[] */
-	private $entries = [];
+	private array $entries = [];
-	/** @var bool */
+	private bool $clean = false;
-	private $clean = false;
 
 	/**
 	 * @param RegionLocationTableEntry[] $entries

src/world/format/io/region/RegionLocationTableEntry.php

@@ -26,13 +26,9 @@ namespace pocketmine\world\format\io\region;
 use function range;
 
 class RegionLocationTableEntry{
-
+	private int $firstSector;
-	/** @var int */
+	private int $sectorCount;
-	private $firstSector;
+	private int $timestamp;
-	/** @var int */
-	private $sectorCount;
-	/** @var int */
-	private $timestamp;
 
 	/**
 	 * @throws \InvalidArgumentException