Release 4.7.3

Bumps [build/php](https://github.com/pmmp/php-build-scripts) from `f292501` to `e90ff50`.
- [Release notes](https://github.com/pmmp/php-build-scripts/releases)
- [Commits](f292501a70...e90ff50310)

---
updated-dependencies:
- dependency-name: build/php
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/discord-release-notify.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.21.1
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: 8.0
 
@@ -35,4 +35,4 @@ jobs:
         run: echo ::set-output name=TAG_NAME::$(echo "${{ github.ref }}" | sed 's{^refs/tags/{{')
 
       - name: Run webhook post script
-        run: php .github/workflows/discord-release-embed.php ${{ github.repo }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }}
+        run: php .github/workflows/discord-release-embed.php ${{ github.repository }} ${{ steps.tag-name.outputs.TAG_NAME }} ${{ github.token }} ${{ secrets.DISCORD_RELEASE_WEBHOOK }}

.github/workflows/draft-release.yml

@@ -18,7 +18,7 @@ jobs:
           submodules: true
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.21.1
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: 8.0
 

.github/workflows/main.yml

@@ -13,11 +13,11 @@ jobs:
     strategy:
       matrix:
         image: [ubuntu-20.04]
-        php: [8.0.18]
+        php: [8.0.22, 8.1.9]
 
     steps:
       - name: Build and prepare PHP cache
-        uses: pmmp/setup-php-action@aa636a4fe0c1c035fd9a3f05e360eadd86e06440
+        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
@@ -31,13 +31,13 @@ jobs:
       fail-fast: false
       matrix:
         image: [ubuntu-20.04]
-        php: [8.0.18]
+        php: [8.0.22, 8.1.9]
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup PHP
-        uses: pmmp/setup-php-action@aa636a4fe0c1c035fd9a3f05e360eadd86e06440
+        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
@@ -69,13 +69,13 @@ jobs:
       fail-fast: false
       matrix:
         image: [ubuntu-20.04]
-        php: [8.0.18]
+        php: [8.0.22, 8.1.9]
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup PHP
-        uses: pmmp/setup-php-action@aa636a4fe0c1c035fd9a3f05e360eadd86e06440
+        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
@@ -107,7 +107,7 @@ jobs:
       fail-fast: false
       matrix:
         image: [ubuntu-20.04]
-        php: [8.0.18]
+        php: [8.0.22, 8.1.9]
 
     steps:
       - uses: actions/checkout@v3
@@ -115,7 +115,7 @@ jobs:
           submodules: true
 
       - name: Setup PHP
-        uses: pmmp/setup-php-action@aa636a4fe0c1c035fd9a3f05e360eadd86e06440
+        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
@@ -147,13 +147,13 @@ jobs:
       fail-fast: false
       matrix:
         image: [ubuntu-20.04]
-        php: [8.0.18]
+        php: [8.0.22, 8.1.9]
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Setup PHP
-        uses: pmmp/setup-php-action@aa636a4fe0c1c035fd9a3f05e360eadd86e06440
+        uses: pmmp/setup-php-action@82a44d659bf5046612c69f036af3e14dc32e3fa8
         with:
           php-version: ${{ matrix.php }}
           install-path: "./bin"
@@ -195,10 +195,10 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup PHP and tools
-        uses: shivammathur/setup-php@2.21.1
+        uses: shivammathur/setup-php@2.21.2
         with:
           php-version: 8.0
-          tools: php-cs-fixer:3.2
+          tools: php-cs-fixer:3.8
 
       - name: Run PHP-CS-Fixer
         run: php-cs-fixer fix --dry-run --diff --ansi

.github/workflows/update-php-versions.php

@@ -22,7 +22,8 @@
 declare(strict_types=1);
 
 const VERSIONS = [
-	"8.0"
+	"8.0",
+	"8.1"
 ];
 
 $workflowFile = file_get_contents(__DIR__ . '/main.yml');

.php-cs-fixer.php

@@ -70,6 +70,10 @@ BODY,
 			'scope' => 'namespaced',
 			'include' => ['@all'],
 		],
+		'new_with_braces' => [
+			'named_class' => true,
+			'anonymous_class' => false,
+		],
 		'no_closing_tag' => true,
 		'no_empty_phpdoc' => true,
 		'no_extra_blank_lines' => true,

SECURITY.md

@@ -7,10 +7,11 @@ GitHub is public and anyone can see the issues you post on the issue tracker, in
 
 **WARNING: You may put live servers at risk by reporting a vulnerability on the GitHub issue tracker.**
 
-**Contact us** by sending an email to [**team@pmmp.io**](mailto:team@pmmp.io?subject=Security%20Vulnerability%20in%20PocketMine-MP). Include the following information:
+**Contact us** by sending an email to [**security@pmmp.io**](mailto:security@pmmp.io). Include the following information:
 
 - Version of PocketMine-MP
 - Detailed description of the vulnerability (e.g. how to exploit it, what the effects are)
+- Your GitHub username, if you wish to be credited for reporting the problem in the security advisory
 
 Please note that we can't guarantee a reply to every email.
 

changelogs/4.7.md

@@ -21,3 +21,26 @@ Released 14th August 2022.
 - Fixed Turtle Master potions not giving any effects.
 - Unimplemented items are no longer craftable.
 - Fixed incorrect items appearing in item frames (due to an obsolete workaround for 1.19.10).
+
+# 4.7.2
+Released 16th August 2022.
+
+## Fixes
+- Fixed crash when processing player skins with invalid geometry data.
+- Fixed spectator players being able to pick blocks using mousewheel click.
+- Improved supporting requirements for sugarcane.
+
+# 4.7.3
+Released 22nd August 2022.
+
+## General
+- Added complete translations for Spanish and Vietnamese.
+- All continuous integration (static analysis, unit tests, integration tests) are now performed on PHP 8.1 as well as 8.0.
+- InventoryTransaction now verifies that stack sizes of items after the transaction don't exceed the maximum stack size of the item type or the containing inventory.
+
+## Fixes
+- Fixed Normal generator crash on PHP 8.1.
+- Fixed a race condition during async worker shutdown that could lead to tasks executing in the wrong order. This (very rarely) led to a crash in `PopulationTask` due to its preceding `GeneratorRegisterTask` not being executed.
+- Fixed `/give` accepting negative amounts or amounts larger than 32767 (vanilla max).
+- Fixed placement conditions for vines (no longer able to be placed on the side of cacti).
+- Fixed incorrect documentation of `SignText::__construct()`.

composer.lock

@@ -532,16 +532,16 @@
         },
         {
             "name": "pocketmine/locale-data",
-            "version": "2.8.3",
+            "version": "2.8.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pmmp/Language.git",
-                "reference": "113c115a3b8976917eb22b74dccab464831b6483"
+                "reference": "e115d3d64a508065f1cedad1be55528906308456"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pmmp/Language/zipball/113c115a3b8976917eb22b74dccab464831b6483",
-                "reference": "113c115a3b8976917eb22b74dccab464831b6483",
+                "url": "https://api.github.com/repos/pmmp/Language/zipball/e115d3d64a508065f1cedad1be55528906308456",
+                "reference": "e115d3d64a508065f1cedad1be55528906308456",
                 "shasum": ""
             },
             "type": "library",
@@ -549,9 +549,9 @@
             "description": "Language resources used by PocketMine-MP",
             "support": {
                 "issues": "https://github.com/pmmp/Language/issues",
-                "source": "https://github.com/pmmp/Language/tree/2.8.3"
+                "source": "https://github.com/pmmp/Language/tree/2.8.7"
             },
-            "time": "2022-05-11T13:51:37+00:00"
+            "time": "2022-08-21T20:37:16+00:00"
         },
         {
             "name": "pocketmine/log",
@@ -1891,23 +1891,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.15",
+            "version": "9.2.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
-                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2593003befdcc10db5e213f9f28814f5aa8ac073",
+                "reference": "2593003befdcc10db5e213f9f28814f5aa8ac073",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.13.0",
+                "nikic/php-parser": "^4.14",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -1956,7 +1956,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.16"
             },
             "funding": [
                 {
@@ -1964,7 +1964,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-07T09:28:20+00:00"
+            "time": "2022-08-20T05:26:47+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2209,16 +2209,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.21",
+            "version": "9.5.22",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1"
+                "reference": "e329ac6e8744f461518272612a479fde958752fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1",
-                "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e329ac6e8744f461518272612a479fde958752fe",
+                "reference": "e329ac6e8744f461518272612a479fde958752fe",
                 "shasum": ""
             },
             "require": {
@@ -2295,7 +2295,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.22"
             },
             "funding": [
                 {
@@ -2307,7 +2307,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-06-19T12:14:25+00:00"
+            "time": "2022-08-20T08:25:46+00:00"
         },
         {
             "name": "sebastian/cli-parser",

phpstan.neon.dist

@@ -1,4 +1,5 @@
 includes:
+	- tests/phpstan/analyse-for-current-php-version.neon.php
 	- tests/phpstan/configs/actual-problems.neon
 	- tests/phpstan/configs/gc-hacks.neon
 	- tests/phpstan/configs/impossible-generics.neon

src/PocketMine.php

@@ -37,6 +37,7 @@ namespace pocketmine {
 	use Webmozart\PathUtil\Path;
 	use function defined;
 	use function extension_loaded;
+	use function function_exists;
 	use function getcwd;
 	use function phpversion;
 	use function preg_match;
@@ -160,7 +161,7 @@ namespace pocketmine {
 		if(PHP_DEBUG !== 0){
 			$logger->warning("This PHP binary was compiled in debug mode. This has a major impact on performance.");
 		}
-		if(extension_loaded("xdebug")){
+		if(extension_loaded("xdebug") && (!function_exists('xdebug_info') || count(xdebug_info('mode')) !== 0)){
 			$logger->warning("Xdebug extension is enabled. This has a major impact on performance.");
 		}
 		if(((int) ini_get('zend.assertions')) !== -1){

src/VersionInfo.php

@@ -31,7 +31,7 @@ use function str_repeat;
 
 final class VersionInfo{
 	public const NAME = "PocketMine-MP";
-	public const BASE_VERSION = "4.7.1";
+	public const BASE_VERSION = "4.7.3";
 	public const IS_DEVELOPMENT_BUILD = false;
 	public const BUILD_CHANNEL = "stable";
 

src/block/Sugarcane.php

@@ -98,7 +98,7 @@ class Sugarcane extends Flowable{
 
 	public function onNearbyBlockChange() : void{
 		$down = $this->getSide(Facing::DOWN);
-		if($down->isTransparent() && !$down->isSameType($this)){
+		if(!$this->isValidSupport($down)){
 			$this->position->getWorld()->useBreakOn($this->position);
 		}
 	}
@@ -122,9 +122,10 @@ class Sugarcane extends Flowable{
 		$down = $this->getSide(Facing::DOWN);
 		if($down->isSameType($this)){
 			return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
-		}elseif($down->getId() === BlockLegacyIds::GRASS || $down->getId() === BlockLegacyIds::DIRT || $down->getId() === BlockLegacyIds::SAND || $down->getId() === BlockLegacyIds::PODZOL){
+		}elseif($this->isValidSupport($down)){
 			foreach(Facing::HORIZONTAL as $side){
-				if($down->getSide($side) instanceof Water){
+				$sideBlock = $down->getSide($side);
+				if($sideBlock instanceof Water || $sideBlock instanceof FrostedIce){
 					return parent::place($tx, $item, $blockReplace, $blockClicked, $face, $clickVector, $player);
 				}
 			}
@@ -132,4 +133,15 @@ class Sugarcane extends Flowable{
 
 		return false;
 	}
+
+	private function isValidSupport(Block $block) : bool{
+		$id = $block->getId();
+		//TODO: rooted dirt, moss block
+		return $block->isSameType($this)
+			|| $id === BlockLegacyIds::GRASS
+			|| $id === BlockLegacyIds::DIRT
+			|| $id === BlockLegacyIds::PODZOL
+			|| $id === BlockLegacyIds::MYCELIUM
+			|| $id === BlockLegacyIds::SAND;
+	}
 }

src/block/Vine.php

@@ -116,7 +116,7 @@ class Vine extends Flowable{
 	}
 
 	public function place(BlockTransaction $tx, Item $item, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector, ?Player $player = null) : bool{
-		if(!$blockClicked->isSolid() || Facing::axis($face) === Axis::Y){
+		if(!$blockClicked->isFullCube() || Facing::axis($face) === Axis::Y){
 			return false;
 		}
 

src/block/utils/SignText.php

@@ -39,7 +39,7 @@ class SignText{
 	private array $lines;
 
 	/**
-	 * @param string[]|null $lines index-sensitive; omitting an index will leave it unchanged
+	 * @param string[]|null $lines index-sensitive; keys 0-3 will be used, regardless of array order
 	 *
 	 * @throws \InvalidArgumentException if the array size is greater than 4
 	 * @throws \InvalidArgumentException if invalid keys (out of bounds or string) are found in the array

src/command/defaults/GiveCommand.php

@@ -75,7 +75,11 @@ class GiveCommand extends VanillaCommand{
 		if(!isset($args[2])){
 			$item->setCount($item->getMaxStackSize());
 		}else{
-			$item->setCount((int) $args[2]);
+			$count = $this->getBoundedInt($sender, $args[2], 1, 32767);
+			if($count === null){
+				return true;
+			}
+			$item->setCount($count);
 		}
 
 		if(isset($args[3])){

src/entity/Skin.php

@@ -28,7 +28,6 @@ use pocketmine\utils\Limits;
 use function implode;
 use function in_array;
 use function json_encode;
-use function json_last_error_msg;
 use function strlen;
 use const JSON_THROW_ON_ERROR;
 
@@ -68,9 +67,10 @@ final class Skin{
 		}
 
 		if($geometryData !== ""){
-			$decodedGeometry = (new CommentedJsonDecoder())->decode($geometryData);
-			if($decodedGeometry === false){
-				throw new InvalidSkinException("Invalid geometry data (" . json_last_error_msg() . ")");
+			try{
+				$decodedGeometry = (new CommentedJsonDecoder())->decode($geometryData);
+			}catch(\RuntimeException $e){
+				throw new InvalidSkinException("Invalid geometry data: " . $e->getMessage(), 0, $e);
 			}
 
 			/*

src/entity/effect/StringToEffectParser.php

@@ -35,7 +35,7 @@ final class StringToEffectParser extends StringToTParser{
 	use SingletonTrait;
 
 	private static function make() : self{
-		$result = new self;
+		$result = new self();
 
 		$result->register("absorption", fn() => VanillaEffects::ABSORPTION());
 		$result->register("blindness", fn() => VanillaEffects::BLINDNESS());

src/event/HandlerListManager.php

@@ -31,7 +31,7 @@ class HandlerListManager{
 	private static ?self $globalInstance = null;
 
 	public static function global() : self{
-		return self::$globalInstance ?? (self::$globalInstance = new self);
+		return self::$globalInstance ?? (self::$globalInstance = new self());
 	}
 
 	/** @var HandlerList[] classname => HandlerList */

src/inventory/transaction/action/DropItemAction.php

@@ -42,6 +42,9 @@ class DropItemAction extends InventoryAction{
 		if($this->targetItem->isNull()){
 			throw new TransactionValidationException("Cannot drop an empty itemstack");
 		}
+		if($this->targetItem->getCount() > $this->targetItem->getMaxStackSize()){
+			throw new TransactionValidationException("Target item exceeds item type max stack size");
+		}
 	}
 
 	public function onPreExecute(Player $source) : bool{

src/inventory/transaction/action/SlotChangeAction.php

@@ -70,6 +70,12 @@ class SlotChangeAction extends InventoryAction{
 		if(!$this->inventory->getItem($this->inventorySlot)->equalsExact($this->sourceItem)){
 			throw new TransactionValidationException("Slot does not contain expected original item");
 		}
+		if($this->targetItem->getCount() > $this->targetItem->getMaxStackSize()){
+			throw new TransactionValidationException("Target item exceeds item type max stack size");
+		}
+		if($this->targetItem->getCount() > $this->inventory->getMaxStackSize()){
+			throw new TransactionValidationException("Target item exceeds inventory max stack size");
+		}
 	}
 
 	/**

src/item/StringToItemParser.php

@@ -41,7 +41,7 @@ final class StringToItemParser extends StringToTParser{
 	use SingletonTrait;
 
 	private static function make() : self{
-		$result = new self;
+		$result = new self();
 
 		foreach(DyeColor::getAll() as $color){
 			$prefix = fn(string $name) => $color->name() . "_" . $name;

src/item/enchantment/StringToEnchantmentParser.php

@@ -35,7 +35,7 @@ final class StringToEnchantmentParser extends StringToTParser{
 	use SingletonTrait;
 
 	private static function make() : self{
-		$result = new self;
+		$result = new self();
 
 		$result->register("blast_protection", fn() => VanillaEnchantments::BLAST_PROTECTION());
 		$result->register("efficiency", fn() => VanillaEnchantments::EFFICIENCY());

src/network/mcpe/handler/LoginPacketHandler.php

@@ -165,13 +165,13 @@ class LoginPacketHandler extends PacketHandler{
 				if(!is_array($claims["extraData"])){
 					throw new PacketHandlingException("'extraData' key should be an array");
 				}
-				$mapper = new \JsonMapper;
+				$mapper = new \JsonMapper();
 				$mapper->bEnforceMapType = false; //TODO: we don't really need this as an array, but right now we don't have enough models
 				$mapper->bExceptionOnMissingData = true;
 				$mapper->bExceptionOnUndefinedProperty = true;
 				try{
 					/** @var AuthenticationData $extraData */
-					$extraData = $mapper->map($claims["extraData"], new AuthenticationData);
+					$extraData = $mapper->map($claims["extraData"], new AuthenticationData());
 				}catch(\JsonMapper_Exception $e){
 					throw PacketHandlingException::wrap($e);
 				}
@@ -193,12 +193,12 @@ class LoginPacketHandler extends PacketHandler{
 			throw PacketHandlingException::wrap($e);
 		}
 
-		$mapper = new \JsonMapper;
+		$mapper = new \JsonMapper();
 		$mapper->bEnforceMapType = false; //TODO: we don't really need this as an array, but right now we don't have enough models
 		$mapper->bExceptionOnMissingData = true;
 		$mapper->bExceptionOnUndefinedProperty = true;
 		try{
-			$clientData = $mapper->map($clientDataClaims, new ClientData);
+			$clientData = $mapper->map($clientDataClaims, new ClientData());
 		}catch(\JsonMapper_Exception $e){
 			throw PacketHandlingException::wrap($e);
 		}

src/network/mcpe/raklib/RakLibInterface.php

@@ -84,8 +84,8 @@ class RakLibInterface implements ServerEventListener, AdvancedNetworkInterface{
 
 		$this->sleeper = new SleeperNotifier();
 
-		$mainToThreadBuffer = new \Threaded;
-		$threadToMainBuffer = new \Threaded;
+		$mainToThreadBuffer = new \Threaded();
+		$threadToMainBuffer = new \Threaded();
 
 		$this->rakLib = new RakLibServer(
 			$this->server->getLogger(),

src/permission/PermissionManager.php

@@ -31,7 +31,7 @@ class PermissionManager{
 
 	public static function getInstance() : PermissionManager{
 		if(self::$instance === null){
-			self::$instance = new self;
+			self::$instance = new self();
 		}
 
 		return self::$instance;

src/player/Player.php

@@ -1558,7 +1558,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
 
 		$ev = new PlayerBlockPickEvent($this, $block, $item);
 		$existingSlot = $this->inventory->first($item);
-		if($existingSlot === -1 && $this->hasFiniteResources()){
+		if($existingSlot === -1 && ($this->hasFiniteResources() || $this->isSpectator())){
 			$ev->cancel();
 		}
 		$ev->call();

src/scheduler/AsyncPool.php

@@ -163,7 +163,7 @@ class AsyncPool{
 			throw new \InvalidArgumentException("Cannot submit the same AsyncTask instance more than once");
 		}
 
-		$task->progressUpdates = new \Threaded;
+		$task->progressUpdates = new \Threaded();
 		$task->setSubmitted();
 
 		$this->getWorker($worker)->stack($task);

src/thread/Worker.php

@@ -56,7 +56,9 @@ abstract class Worker extends \Worker{
 		$this->isKilled = true;
 
 		if(!$this->isShutdown()){
-			while($this->unstack() !== null);
+			$this->synchronized(function() : void{
+				while($this->unstack() !== null);
+			});
 			$this->notify();
 			$this->shutdown();
 		}

src/utils/SingletonTrait.php

@@ -28,7 +28,7 @@ trait SingletonTrait{
 	private static $instance = null;
 
 	private static function make() : self{
-		return new self;
+		return new self();
 	}
 
 	public static function getInstance() : self{

src/world/WorldCreationOptions.php

@@ -48,7 +48,7 @@ final class WorldCreationOptions{
 	}
 
 	public static function create() : self{
-		return new self;
+		return new self();
 	}
 
 	/** @phpstan-return class-string<Generator> */

src/world/generator/normal/Normal.php

@@ -123,6 +123,7 @@ class Normal extends Generator{
 	private function pickBiome(int $x, int $z) : Biome{
 		$hash = $x * 2345803 ^ $z * 9236449 ^ $this->seed;
 		$hash *= $hash + 223;
+		$hash = (int) $hash;
 		$xNoise = $hash >> 20 & 3;
 		$zNoise = $hash >> 22 & 3;
 		if($xNoise == 3){

tests/phpstan/analyse-for-current-php-version.neon.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+/*
+ * This hack works around a "feature" in PHPStan which locks in analysis version based on platform.php in composer.json
+ * See https://github.com/phpstan/phpstan/issues/7701 for details
+ */
+return [
+	'parameters' => [
+		'phpVersion' => PHP_VERSION_ID
+	]
+];

tests/phpstan/configs/phpstan-bugs.neon

@@ -35,11 +35,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/handler/InGamePacketHandler.php
 
-		-
-			message: "#^Negated boolean expression 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
@@ -80,3 +75,8 @@ parameters:
 			count: 2
 			path: ../../../src/world/format/io/region/RegionLoader.php
 
+		-
+			message: "#^Casting to int something that's already int\\.$#"
+			count: 1
+			path: ../../../src/world/generator/normal/Normal.php
+