Merge remote-tracking branch 'origin/stable' into minor-next

tests/phpstan/configs/actual-problems.neon

@@ -32,7 +32,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset 'git' on mixed\\.$#"
-			count: 2
+			count: 1
 			path: ../../../src/VersionInfo.php
 
 		-
@@ -807,7 +807,7 @@ parameters:
 
 		-
 			message: "#^Cannot access offset string on mixed\\.$#"
-			count: 3
+			count: 2
 			path: ../../../src/utils/Config.php
 
 		-
@@ -965,11 +965,6 @@ parameters:
 			count: 2
 			path: ../../../src/world/World.php
 
-		-
-			message: "#^Parameter \\#3 \\$chunk of method pocketmine\\\\player\\\\Player\\:\\:onChunkChanged\\(\\) expects pocketmine\\\\world\\\\format\\\\Chunk, pocketmine\\\\world\\\\format\\\\Chunk\\|null given\\.$#"
-			count: 1
-			path: ../../../src/world/World.php
-
 		-
 			message: "#^Parameter \\#3 \\$y of method pocketmine\\\\block\\\\Block\\:\\:position\\(\\) expects int, float\\|int given\\.$#"
 			count: 2

tests/phpstan/configs/phpstan-bugs.neon

@@ -20,21 +20,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/projectile/Projectile.php
 
-		-
-			message: "#^Match arm comparison between 1\\|2\\|3\\|4 and 0 is always false\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
-		-
-			message: "#^Match arm comparison between 4 and 4 is always true\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
-		-
-			message: "#^Match arm is unreachable because previous comparison is always true\\.$#"
-			count: 1
-			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
-
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\raklib\\\\PthreadsChannelWriter\\:\\:\\$buffer is never read, only written\\.$#"
 			count: 1

tests/phpunit/scheduler/AsyncPoolTest.php

@@ -121,4 +121,23 @@ class AsyncPoolTest extends TestCase{
 			usleep(50 * 1000);
 		}
 	}
+
+	public function testNullComplexDataFetch() : void{
+		$this->pool->submitTask(new class extends AsyncTask{
+			public function __construct(){
+				$this->storeLocal("null", null);
+			}
+
+			public function onRun() : void{
+				//dummy
+			}
+
+			public function onCompletion() : void{
+				AsyncPoolTest::assertNull($this->fetchLocal("null"));
+			}
+		});
+		while($this->pool->collectTasks()){
+			usleep(50 * 1000);
+		}
+	}
 }