PopulationTask: stop using dynamic properties

src/world/generator/PopulationTask.php

@@ -31,7 +31,12 @@ use pocketmine\world\format\Chunk;
 use pocketmine\world\format\io\FastChunkSerializer;
 use pocketmine\world\SimpleChunkManager;
 use pocketmine\world\World;
+use function array_map;
+use function igbinary_serialize;
+use function igbinary_unserialize;
 use function intdiv;
+use function is_array;
+use function is_string;
 
 class PopulationTask extends AsyncTask{
 	private const TLS_KEY_WORLD = "world";
@@ -46,25 +51,7 @@ class PopulationTask extends AsyncTask{
 	/** @var string|null */
 	public $chunk;
 
-	/** @var string|null */
+	private string $adjacentChunks;
-	public $chunk0;
-	/** @var string|null */
-	public $chunk1;
-	/** @var string|null */
-	public $chunk2;
-	/** @var string|null */
-	public $chunk3;
-
-	//center chunk
-
-	/** @var string|null */
-	public $chunk5;
-	/** @var string|null */
-	public $chunk6;
-	/** @var string|null */
-	public $chunk7;
-	/** @var string|null */
-	public $chunk8;
 
 	public function __construct(World $world, int $chunkX, int $chunkZ, ?Chunk $chunk){
 		$this->worldId = $world->getId();
@@ -72,9 +59,10 @@ class PopulationTask extends AsyncTask{
 		$this->chunkZ = $chunkZ;
 		$this->chunk = $chunk !== null ? FastChunkSerializer::serializeTerrain($chunk) : null;
 
-		foreach($world->getAdjacentChunks($chunkX, $chunkZ) as $i => $c){
+		$this->adjacentChunks = igbinary_serialize(array_map(
-			$this->{"chunk$i"} = $c !== null ? FastChunkSerializer::serializeTerrain($c) : null;
+			fn(?Chunk $c) => $c !== null ? FastChunkSerializer::serializeTerrain($c) : null,
-		}
+			$world->getAdjacentChunks($chunkX, $chunkZ)
+		)) ?? throw new AssumptionFailedError("igbinary_serialize() returned null");
 
 		$this->storeLocal(self::TLS_KEY_WORLD, $world);
 	}
@@ -87,27 +75,19 @@ class PopulationTask extends AsyncTask{
 		$generator = $context->getGenerator();
 		$manager = new SimpleChunkManager($context->getWorldMinY(), $context->getWorldMaxY());
 
-		/** @var Chunk[] $chunks */
-		$chunks = [];
-		$oldModCounts = [];
-
 		$chunk = $this->chunk !== null ? FastChunkSerializer::deserializeTerrain($this->chunk) : null;
 
-		for($i = 0; $i < 9; ++$i){
+		/** @var string[] $serialChunks */
-			if($i === 4){
+		$serialChunks = igbinary_unserialize($this->adjacentChunks);
-				continue;
+		$chunks = array_map(
-			}
+			fn(?string $serialized) => $serialized !== null ? FastChunkSerializer::deserializeTerrain($serialized) : null,
-			$ck = $this->{"chunk$i"};
+			$serialChunks
-			if($ck === null){
+		);
-				$chunks[$i] = null;
+		$oldModCounts = array_map(fn(?Chunk $chunk) => $chunk !== null ? $chunk->getModificationCount() : null, $chunks);
-			}else{
-				$chunks[$i] = FastChunkSerializer::deserializeTerrain($ck);
-				$oldModCounts[$i] = $chunks[$i]->getModificationCount();
-			}
-		}
 
 		self::setOrGenerateChunk($manager, $generator, $this->chunkX, $this->chunkZ, $chunk);
 
+		/** @var Chunk[] $resultChunks */
 		$resultChunks = []; //this is just to keep phpstan's type inference happy
 		foreach($chunks as $i => $c){
 			$cX = (-1 + $i % 3) + $this->chunkX;
@@ -125,10 +105,11 @@ class PopulationTask extends AsyncTask{
 
 		$this->chunk = FastChunkSerializer::serializeTerrain($chunk);
 
+		$serialChunks = [];
 		foreach($chunks as $i => $c){
-			$oldModCount = $oldModCounts[$i] ?? 0;
+			$serialChunks[$i] = $oldModCounts[$i] !== $c->getModificationCount() ? FastChunkSerializer::serializeTerrain($c) : null;
-			$this->{"chunk$i"} = $oldModCount !== $c->getModificationCount() ? FastChunkSerializer::serializeTerrain($c) : null;
 		}
+		$this->adjacentChunks = igbinary_serialize($serialChunks) ?? throw new AssumptionFailedError("igbinary_serialize() returned null");
 	}
 
 	private static function setOrGenerateChunk(SimpleChunkManager $manager, Generator $generator, int $chunkX, int $chunkZ, ?Chunk $chunk) : Chunk{
@@ -153,12 +134,13 @@ class PopulationTask extends AsyncTask{
 				FastChunkSerializer::deserializeTerrain($this->chunk) :
 				throw new AssumptionFailedError("Center chunk should never be null");
 
+			/**
+			 * @var string[]|null[] $serialAdjacentChunks
+			 * @phpstan-var array<int, string|null> $serialAdjacentChunks
+			 */
+			$serialAdjacentChunks = igbinary_unserialize($this->adjacentChunks);
 			$adjacentChunks = [];
-			for($i = 0; $i < 9; ++$i){
+			foreach($serialAdjacentChunks as $i => $c){
-				if($i === 4){
-					continue;
-				}
-				$c = $this->{"chunk$i"};
 				if($c !== null){
 					$xx = -1 + $i % 3;
 					$zz = -1 + intdiv($i, 3);

tests/phpstan/configs/actual-problems.neon

@@ -5,8 +5,3 @@ parameters:
 			count: 1
 			path: ../../../src/event/entity/EntityShootBowEvent.php
 
-		-
-			message: "#^Variable property access on \\$this\\(pocketmine\\\\world\\\\generator\\\\PopulationTask\\)\\.$#"
-			count: 4
-			path: ../../../src/world/generator/PopulationTask.php
-