Merge branch 'minor-next' into major-next

pmmp · Jan 8, 2025 · 02ac512 · 02ac512
2 parents 708784b + b3f1543
commit 02ac512
Show file tree

Hide file tree

Showing 46 changed files with 978 additions and 435 deletions.
diff --git a/build/server-phar.php b/build/server-phar.php
@@ -129,7 +129,7 @@ function buildPhar(string $pharPath, string $basePath, array $includedPaths, arr
 }
 
 function main() : void{
-	if(ini_get("phar.readonly") == 1){
+	if(ini_get("phar.readonly") === "1"){
 		echo "Set phar.readonly to 0 with -dphar.readonly=0" . PHP_EOL;
 		exit(1);
 	}

diff --git a/composer.json b/composer.json
@@ -52,9 +52,9 @@
       "symfony/filesystem": "~6.4.0"
    },
    "require-dev": {
-      "phpstan/phpstan": "1.11.11",
-      "phpstan/phpstan-phpunit": "^1.1.0",
-      "phpstan/phpstan-strict-rules": "^1.2.0",
+      "phpstan/phpstan": "2.1.1",
+      "phpstan/phpstan-phpunit": "^2.0.0",
+      "phpstan/phpstan-strict-rules": "^2.0.0",
       "phpunit/phpunit": "^10.5.24"
    },
    "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -17,6 +17,7 @@ rules:
 parameters:
 	level: 9
 	checkMissingCallableSignature: true
+	rememberPossiblyImpureFunctionValues: false #risky to remember these, better for performance to avoid repeated calls anyway
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- tests/phpstan/bootstrap.php
@@ -29,6 +30,7 @@ parameters:
 	paths:
 		- build
 		- src
+		- tests/phpstan/DummyPluginOwned.php
 		- tests/phpstan/rules
 		- tests/phpunit
 		- tests/plugins/TesterPlugin
@@ -42,6 +44,7 @@ parameters:
 		- pocketmine\DEBUG
 		- pocketmine\IS_DEVELOPMENT_BUILD
 	stubFiles:
+		- tests/phpstan/stubs/chunkutils2.stub
 		- tests/phpstan/stubs/JsonMapper.stub
 		- tests/phpstan/stubs/leveldb.stub
 		- tests/phpstan/stubs/pmmpthread.stub

diff --git a/src/Server.php b/src/Server.php
@@ -139,6 +139,7 @@
 use function filemtime;
 use function fopen;
 use function get_class;
+use function gettype;
 use function ini_set;
 use function is_array;
 use function is_dir;
@@ -923,6 +924,7 @@ public function __construct(
 			TimingsHandler::getCollectCallbacks()->add(function() : array{
 				$promises = [];
 				foreach($this->asyncPool->getRunningWorkers() as $workerId){
+					/** @phpstan-var PromiseResolver<list<string>> $resolver */
 					$resolver = new PromiseResolver();
 					$this->asyncPool->submitTaskToWorker(new TimingsCollectionTask($resolver), $workerId);
 
@@ -1018,7 +1020,11 @@ public function __construct(
 				copy(Path::join(\pocketmine\RESOURCE_PATH, 'plugin_list.yml'), $graylistFile);
 			}
 			try{
-				$pluginGraylist = PluginGraylist::fromArray(yaml_parse(Filesystem::fileGetContents($graylistFile)));
+				$array = yaml_parse(Filesystem::fileGetContents($graylistFile));
+				if(!is_array($array)){
+					throw new \InvalidArgumentException("Expected array for root, but have " . gettype($array));
+				}
+				$pluginGraylist = PluginGraylist::fromArray($array);
 			}catch(\InvalidArgumentException $e){
 				$this->logger->emergency("Failed to load $graylistFile: " . $e->getMessage());
 				$this->forceShutdownExit();
@@ -1180,7 +1186,7 @@ private function startupPrepareWorlds() : bool{
 
 		if($this->worldManager->getDefaultWorld() === null){
 			$default = $this->configGroup->getConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");
-			if(trim($default) == ""){
+			if(trim($default) === ""){
 				$this->logger->warning("level-name cannot be null, using default");
 				$default = "world";
 				$this->configGroup->setConfigString(ServerProperties::DEFAULT_WORLD_NAME, "world");

diff --git a/src/command/utils/CommandStringHelper.php b/src/command/utils/CommandStringHelper.php
@@ -51,9 +51,8 @@ public static function parseQuoteAware(string $commandLine) : array{
 		foreach($matches[0] as $k => $_){
 			for($i = 1; $i <= 2; ++$i){
 				if($matches[$i][$k] !== ""){
-					/** @var string $match */ //phpstan can't understand preg_match and friends by itself :(
 					$match = $matches[$i][$k];
-					$args[(int) $k] = preg_replace('/\\\\([\\\\"])/u', '$1', $match) ?? throw new AssumptionFailedError(preg_last_error_msg());
+					$args[] = preg_replace('/\\\\([\\\\"])/u', '$1', $match) ?? throw new AssumptionFailedError(preg_last_error_msg());
 					break;
 				}
 			}

diff --git a/src/crafting/CraftingManager.php b/src/crafting/CraftingManager.php
@@ -110,7 +110,6 @@ public static function sort(Item $i1, Item $i2) : int{
 
 	/**
 	 * @param Item[] $items
-	 * @phpstan-param list<Item> $items
 	 *
 	 * @return Item[]
 	 * @phpstan-return list<Item>
@@ -135,7 +134,6 @@ private static function pack(array $items) : array{
 
 	/**
 	 * @param Item[] $outputs
-	 * @phpstan-param list<Item> $outputs
 	 */
 	private static function hashOutputs(array $outputs) : string{
 		$outputs = self::pack($outputs);

diff --git a/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php b/src/data/bedrock/block/upgrade/BlockStateUpgradeSchemaUtils.php
@@ -37,7 +37,6 @@
 use Symfony\Component\Filesystem\Path;
 use function array_key_last;
 use function array_map;
-use function array_values;
 use function assert;
 use function count;
 use function get_debug_type;
@@ -138,8 +137,8 @@ public static function fromJsonModel(BlockStateUpgradeSchemaModel $model, int $s
 
 		$convertedRemappedValuesIndex = [];
 		foreach(Utils::stringifyKeys($model->remappedPropertyValuesIndex ?? []) as $mappingKey => $mappingValues){
-			foreach($mappingValues as $k => $oldNew){
-				$convertedRemappedValuesIndex[$mappingKey][$k] = new BlockStateUpgradeSchemaValueRemap(
+			foreach($mappingValues as $oldNew){
+				$convertedRemappedValuesIndex[$mappingKey][] = new BlockStateUpgradeSchemaValueRemap(
 					self::jsonModelToTag($oldNew->old),
 					self::jsonModelToTag($oldNew->new)
 				);
@@ -361,7 +360,7 @@ public static function toJsonModel(BlockStateUpgradeSchema $schema) : BlockState
 				//remaps with the same number of criteria should be sorted alphabetically, but this is not strictly necessary
 				return json_encode($a->oldState ?? []) <=> json_encode($b->oldState ?? []);
 			});
-			$result->remappedStates[$oldBlockName] = array_values($keyedRemaps);
+			$result->remappedStates[$oldBlockName] = $keyedRemaps; //usort strips keys, so this is already a list
 		}
 		if(isset($result->remappedStates)){
 			ksort($result->remappedStates);

diff --git a/src/data/runtime/RuntimeEnumMetadata.php b/src/data/runtime/RuntimeEnumMetadata.php
@@ -23,7 +23,6 @@
 
 namespace pocketmine\data\runtime;
 
-use function array_values;
 use function ceil;
 use function count;
 use function log;
@@ -60,7 +59,7 @@ public function __construct(
 		usort($members, fn(\UnitEnum $a, \UnitEnum $b) => $a->name <=> $b->name); //sort by name to ensure consistent ordering (and thus consistent bit assignments)
 
 		$this->bits = (int) ceil(log(count($members), 2));
-		$this->intToEnum = array_values($members);
+		$this->intToEnum = $members; //usort strips keys so this is already a list
 
 		$reversed = [];
 		foreach($this->intToEnum as $int => $enum){