Update composer dev dependencies

Author: dktapps

build/generate-block-serializer-consts.php

@@ -29,6 +29,9 @@
 use pocketmine\data\bedrock\block\BlockTypeNames;
 use pocketmine\errorhandler\ErrorToExceptionHandler;
 use pocketmine\nbt\NbtException;
+use pocketmine\nbt\tag\ByteTag;
+use pocketmine\nbt\tag\IntTag;
+use pocketmine\nbt\tag\StringTag;
 use pocketmine\network\mcpe\convert\BlockStateDictionary;
 use pocketmine\utils\AssumptionFailedError;
 use pocketmine\utils\Utils;
@@ -78,6 +81,9 @@ function generateBlockPaletteReport(array $states) : BlockPaletteReport{
 		$name = $stateData->getName();
 		$result->seenTypes[$name] = $name;
 		foreach(Utils::stringifyKeys($stateData->getStates()) as $k => $v){
+			if(!$v instanceof ByteTag && !$v instanceof IntTag && !$v instanceof StringTag){
+				throw new AssumptionFailedError("Assumed all state tags should be TAG_Byte, TAG_Int or TAG_String, but found $k ($v) on block $name");
+			}
 			$result->seenStateValues[$k][$v->getValue()] = $v->getValue();
 			asort($result->seenStateValues[$k]);
 		}

composer.json

@@ -52,7 +52,7 @@
       "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "2.1.17",
+      "phpstan/phpstan": "2.1.25",
       "phpstan/phpstan-phpunit": "^2.0.0",
       "phpstan/phpstan-strict-rules": "^2.0.0",
       "phpunit/phpunit": "^10.5.24"

composer.lock

@@ -278,6 +278,10 @@ private function applyPropertyValueChanged(BlockStateUpgradeSchema $schema, stri
 	private function applyPropertyFlattened(BlockStateUpgradeSchemaFlattenInfo $flattenInfo, string $oldName, array $states) : array{
 		$flattenedValue = $states[$flattenInfo->flattenedProperty] ?? null;
 		$expectedType = $flattenInfo->flattenedPropertyType;
+		if($expectedType === null){
+			//TODO: we can't make this non-nullable in a patch release
+			throw new AssumptionFailedError("We never give this null");
+		}
 		if(!$flattenedValue instanceof $expectedType){
 			//flattened property is not of the expected type, so this transformation is not applicable
 			return [$oldName, $states];

src/data/bedrock/block/upgrade/BlockStateUpgrader.php

@@ -948,6 +948,12 @@ parameters:
 			count: 1
 			path: ../../../src/plugin/PluginDescription.php
 
+		-
+			message: '#^Property pocketmine\\plugin\\PluginDescription\:\:\$srcNamespacePrefix \(string\) does not accept mixed\.$#'
+			identifier: assign.propertyType
+			count: 1
+			path: ../../../src/plugin/PluginDescription.php
+
 		-
 			message: '#^Cannot call method addChild\(\) on pocketmine\\permission\\Permission\|null\.$#'
 			identifier: method.nonObject
@@ -990,6 +996,12 @@ parameters:
 			count: 1
 			path: ../../../src/scheduler/TaskScheduler.php
 
+		-
+			message: '#^Possibly invalid array key type mixed\.$#'
+			identifier: offsetAccess.invalidOffset
+			count: 1
+			path: ../../../src/thread/ThreadManager.php
+
 		-
 			message: '#^Cannot access offset string on mixed\.$#'
 			identifier: offsetAccess.nonOffsetAccessible

tests/phpstan/configs/actual-problems.neon

@@ -192,18 +192,6 @@ parameters:
 			count: 1
 			path: ../../../src/network/mcpe/cache/CraftingDataCache.php
 
-		-
-			message: '#^Method pocketmine\\network\\mcpe\\compression\\ZlibCompressor\:\:getNetworkId\(\) never returns 1 so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: ../../../src/network/mcpe/compression/ZlibCompressor.php
-
-		-
-			message: '#^Method pocketmine\\network\\mcpe\\compression\\ZlibCompressor\:\:getNetworkId\(\) never returns 255 so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: ../../../src/network/mcpe/compression/ZlibCompressor.php
-
 		-
 			message: '#^Parameter \#1 \$states of class pocketmine\\network\\mcpe\\convert\\BlockStateDictionary constructor expects list\<pocketmine\\network\\mcpe\\convert\\BlockStateDictionaryEntry\>, array\<int\<0, max\>, pocketmine\\network\\mcpe\\convert\\BlockStateDictionaryEntry\> given\.$#'
 			identifier: argument.type

tests/phpstan/configs/phpstan-bugs.neon

@@ -30,3 +30,26 @@ parameters:
 			count: 4
 			path: ../../../src/world/generator/noise/Noise.php
 
+		-
+			message: '#^Parameter \$q00 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q01 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q10 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php
+
+		-
+			message: '#^Parameter \$q11 of static method pocketmine\\world\\generator\\noise\\Noise\:\:bilinearLerp\(\) expects float, float\|null given\.$#'
+			identifier: argument.type
+			count: 1
+			path: ../../../src/world/generator/noise/Noise.php

tests/phpstan/configs/spl-fixed-array-sucks.neon

@@ -47,7 +47,7 @@ public function testEachMemberClone(\Closure $provider) : void{
 	public function testGetAllClone() : void{
 		$list1 = TestCloningRegistry::getAll();
 		$list2 = TestCloningRegistry::getAll();
-		foreach(Utils::promoteKeys($list1) as $k => $member){
+		foreach(Utils::stringifyKeys($list1) as $k => $member){
 			self::assertNotSame($member, $list2[$k], "VanillaBlocks ought to clone its members");
 		}
 	}

tests/phpunit/utils/CloningRegistryTraitTest.php

@@ -354,6 +354,9 @@ function processStateGroup(string $oldName, array $upgradeTable, BlockStateUpgra
  * @param string[] $strings
  */
 function findCommonPrefix(array $strings) : string{
+	if(count($strings) === 0){
+		return "";
+	}
 	sort($strings, SORT_STRING);
 
 	$first = $strings[array_key_first($strings)];