Merge branch 'stable' into next-minor

.php-cs-fixer.php

@@ -74,6 +74,7 @@ return (new PhpCsFixer\Config)
 		'return_type_declaration' => [
 			'space_before' => 'one'
 		],
+		'single_blank_line_at_eof' => true,
 		'single_import_per_statement' => true,
 		'strict_param' => true,
 		'unary_operator_spaces' => true,

build/generate-registry-annotations.php

@@ -116,4 +116,3 @@ foreach(new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($argv[1],
 		echo "No changes made to file $file\n";
 	}
 }
-

composer.json

@@ -53,7 +53,7 @@
       "webmozart/path-util": "^2.3"
    },
    "require-dev": {
-      "phpstan/phpstan": "1.3.1",
+      "phpstan/phpstan": "1.3.3",
       "phpstan/phpstan-phpunit": "^1.0.0",
       "phpstan/phpstan-strict-rules": "^1.0.0",
       "phpunit/phpunit": "^9.2"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8b6fac2b9bbfe685d654ed417713d894",
+    "content-hash": "934b70469f9dcb4c9697f69e6c4a9ec5",
     "packages": [
         {
             "name": "adhocore/json-comment",
@@ -1900,16 +1900,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.3.1",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "c3e7a5837829b3cd5907b895da73a4da084a9f8f"
+                "reference": "151a51f6149855785fbd883e79768c0abc96b75f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c3e7a5837829b3cd5907b895da73a4da084a9f8f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/151a51f6149855785fbd883e79768c0abc96b75f",
-                "reference": "c3e7a5837829b3cd5907b895da73a4da084a9f8f",
+                "reference": "151a51f6149855785fbd883e79768c0abc96b75f",
                 "shasum": ""
             },
             "require": {
@@ -1940,7 +1940,7 @@
             "description": "PHPStan - PHP Static Analysis Tool",
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.3.1"
+                "source": "https://github.com/phpstan/phpstan/tree/1.3.3"
             },
             "funding": [
                 {
@@ -1960,7 +1960,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T17:12:37+00:00"
+            "time": "2022-01-07T09:49:03+00:00"
         },
         {
             "name": "phpstan/phpstan-phpunit",

src/block/inventory/CraftingTableInventory.php

@@ -34,4 +34,4 @@ final class CraftingTableInventory extends CraftingGrid implements BlockInventor
 		$this->holder = $holder;
 		parent::__construct(CraftingGrid::SIZE_BIG);
 	}
-}
+}

src/crafting/FurnaceRecipeManager.php

@@ -65,4 +65,4 @@ final class FurnaceRecipeManager{
 	public function match(Item $input) : ?FurnaceRecipe{
 		return $this->furnaceRecipes[$input->getId() . ":" . $input->getMeta()] ?? $this->furnaceRecipes[$input->getId() . ":?"] ?? null;
 	}
-}
+}

src/crash/CrashDumpData.php

@@ -81,4 +81,4 @@ final class CrashDumpData implements \JsonSerializable{
 		$result["server.properties"] = $this->serverDotProperties;
 		return $result;
 	}
-}
+}

src/crash/CrashDumpDataGeneral.php

@@ -43,4 +43,4 @@ final class CrashDumpDataGeneral{
 		public string $os,
 		public array $composer_libraries,
 	){}
-}
+}

src/crash/CrashDumpDataPluginEntry.php

@@ -42,4 +42,4 @@ final class CrashDumpDataPluginEntry{
 		public string $load,
 		public string $website,
 	){}
-}
+}

src/crash/CrashDumpRenderer.php

@@ -100,4 +100,4 @@ final class CrashDumpRenderer{
 	public function addLine(string $line = "") : void{
 		fwrite($this->fp, $line . PHP_EOL);
 	}
-}
+}

src/data/SavedDataLoadingException.php

@@ -25,4 +25,4 @@ namespace pocketmine\data;
 
 final class SavedDataLoadingException extends \RuntimeException{
 
-}
+}

src/data/bedrock/LegacyBiomeIdToStringIdMap.php

@@ -32,4 +32,4 @@ final class LegacyBiomeIdToStringIdMap extends LegacyToStringBidirectionalIdMap{
 	public function __construct(){
 		parent::__construct(Path::join(\pocketmine\BEDROCK_DATA_PATH, 'biome_id_map.json'));
 	}
-}
+}

src/entity/InvalidSkinException.php

@@ -25,4 +25,4 @@ namespace pocketmine\entity;
 
 final class InvalidSkinException extends \InvalidArgumentException{
 
-}
+}

src/entity/effect/StringToEffectParser.php

@@ -70,4 +70,4 @@ final class StringToEffectParser extends StringToTParser{
 	public function parse(string $input) : ?Effect{
 		return parent::parse($input);
 	}
-}
+}

src/event/block/BlockItemPickupEvent.php

@@ -57,4 +57,4 @@ class BlockItemPickupEvent extends BlockEvent implements Cancellable{
 	public function setInventory(?Inventory $inventory) : void{
 		$this->inventory = $inventory;
 	}
-}
+}

src/event/block/StructureGrowEvent.php

@@ -37,4 +37,4 @@ class StructureGrowEvent extends BlockEvent implements Cancellable{
 	public function getPlayer() : ?Player{
 		return $this->player;
 	}
-}
+}

src/event/player/PlayerDisplayNameChangeEvent.php

@@ -45,4 +45,4 @@ class PlayerDisplayNameChangeEvent extends PlayerEvent{
 	public function getNewName() : string{
 		return $this->newName;
 	}
-}
+}

src/inventory/PlayerCraftingInventory.php

@@ -33,4 +33,4 @@ final class PlayerCraftingInventory extends CraftingGrid implements TemporaryInv
 	}
 
 	public function getHolder() : Player{ return $this->holder; }
-}
+}

src/inventory/TemporaryInventory.php

@@ -25,4 +25,4 @@ namespace pocketmine\inventory;
 
 interface TemporaryInventory extends Inventory{
 
-}
+}

src/item/enchantment/StringToEnchantmentParser.php

@@ -63,4 +63,4 @@ final class StringToEnchantmentParser extends StringToTParser{
 	public function parse(string $input) : ?Enchantment{
 		return parent::parse($input);
 	}
-}
+}

src/network/NetworkInterfaceStartException.php

@@ -29,4 +29,4 @@ namespace pocketmine\network;
  */
 final class NetworkInterfaceStartException extends \RuntimeException{
 
-}
+}

src/network/mcpe/compression/Compressor.php

@@ -33,4 +33,4 @@ interface Compressor{
 	public function decompress(string $payload) : string;
 
 	public function compress(string $payload) : string;
-}
+}

src/network/mcpe/compression/DecompressionException.php

@@ -25,4 +25,4 @@ namespace pocketmine\network\mcpe\compression;
 
 final class DecompressionException extends \RuntimeException{
 
-}
+}

src/network/mcpe/raklib/RakLibThreadCrashInfo.php

@@ -59,4 +59,4 @@ final class RakLibThreadCrashInfo{
 	public function makePrettyMessage() : string{
 		return sprintf("%s: \"%s\" in %s on line %d", $this->class ?? "Fatal error", $this->message, Filesystem::cleanPath($this->file), $this->line);
 	}
-}
+}

src/plugin/PluginLoadTriageEntry.php

@@ -39,4 +39,4 @@ final class PluginLoadTriageEntry{
 	public function getLoader() : PluginLoader{ return $this->loader; }
 
 	public function getDescription() : PluginDescription{ return $this->description; }
-}
+}

src/plugin/PluginLoadabilityChecker.php

@@ -110,4 +110,4 @@ final class PluginLoadabilityChecker{
 
 		return null;
 	}
-}
+}

src/promise/Promise.php

@@ -52,4 +52,4 @@ final class Promise{
 	public function isResolved() : bool{
 		return $this->shared->resolved;
 	}
-}
+}

src/promise/PromiseResolver.php

@@ -72,4 +72,4 @@ final class PromiseResolver{
 	public function getPromise() : Promise{
 		return $this->promise;
 	}
-}
+}

src/utils/SingletonTrait.php

@@ -45,4 +45,4 @@ trait SingletonTrait{
 	public static function reset() : void{
 		self::$instance = null;
 	}
-}
+}

src/utils/StringToTParser.php

@@ -79,4 +79,4 @@ abstract class StringToTParser{
 	public function getKnownAliases() : array{
 		return array_keys($this->callbackMap);
 	}
-}
+}

src/world/ChunkLockId.php

@@ -35,4 +35,4 @@ use pocketmine\utils\NotSerializable;
 final class ChunkLockId{
 	use NotCloneable;
 	use NotSerializable;
-}
+}

src/world/generator/FlatGeneratorOptions.php

@@ -124,4 +124,4 @@ final class FlatGeneratorOptions{
 		return new self($structure, $biomeId, $options);
 	}
 
-}
+}

src/world/generator/GeneratorManagerEntry.php

@@ -45,4 +45,4 @@ final class GeneratorManagerEntry{
 			throw $exception;
 		}
 	}
-}
+}

tests/phpstan/rules/UnsafeForeachArrayOfStringRule.php

@@ -87,4 +87,4 @@ final class UnsafeForeachArrayOfStringRule implements Rule{
 		return [];
 	}
 
-}
+}

tests/phpunit/utils/fixtures/TestAbstractClass.php

@@ -6,4 +6,4 @@ namespace pocketmine\utils\fixtures;
 
 abstract class TestAbstractClass{
 
-}
+}

tests/phpunit/utils/fixtures/TestInstantiableClass.php

@@ -6,4 +6,4 @@ namespace pocketmine\utils\fixtures;
 
 class TestInstantiableClass extends TestAbstractClass implements TestInterface{
 
-}
+}

tests/phpunit/utils/fixtures/TestInterface.php

@@ -6,4 +6,4 @@ namespace pocketmine\utils\fixtures;
 
 interface TestInterface{
 
-}
+}

tests/phpunit/utils/fixtures/TestSubclassOfInstantiableClass.php

@@ -6,4 +6,4 @@ namespace pocketmine\utils\fixtures;
 
 class TestSubclassOfInstantiableClass extends TestInstantiableClass{
 
-}
+}

tests/phpunit/utils/fixtures/TestTrait.php

@@ -6,4 +6,4 @@ namespace pocketmine\utils\fixtures;
 
 trait TestTrait{
 
-}
+}