diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index f2030141e..cc068c3e3 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -53,7 +53,6 @@ use pocketmine\level\format\io\ChunkRequestTask; use pocketmine\level\format\io\exception\CorruptedChunkException; use pocketmine\level\format\io\exception\UnsupportedChunkFormatException; use pocketmine\level\format\io\LevelProvider; -use pocketmine\level\generator\Generator; use pocketmine\level\generator\GeneratorManager; use pocketmine\level\generator\GeneratorRegisterTask; use pocketmine\level\generator\GeneratorUnregisterTask; @@ -289,7 +288,10 @@ class Level implements ChunkManager, Metadatable{ /** @var bool */ private $doingTick = false; - /** @var string|Generator */ + /** + * @var string + * @phpstan-var class-string<\pocketmine\level\generator\Generator> + */ private $generator; /** @var bool */ diff --git a/src/pocketmine/level/generator/GeneratorRegisterTask.php b/src/pocketmine/level/generator/GeneratorRegisterTask.php index 34b49f7e2..03f58339f 100644 --- a/src/pocketmine/level/generator/GeneratorRegisterTask.php +++ b/src/pocketmine/level/generator/GeneratorRegisterTask.php @@ -35,7 +35,10 @@ use function unserialize; class GeneratorRegisterTask extends AsyncTask{ - /** @var string */ + /** + * @var string + * @phpstan-var class-string + */ public $generatorClass; /** @var string */ public $settings; @@ -48,6 +51,7 @@ class GeneratorRegisterTask extends AsyncTask{ /** * @param mixed[] $generatorSettings + * @phpstan-param class-string $generatorClass * @phpstan-param array $generatorSettings */ public function __construct(Level $level, string $generatorClass, array $generatorSettings = []){ diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon index 8b56da323..24562f342 100644 --- a/tests/phpstan/configs/l7-baseline.neon +++ b/tests/phpstan/configs/l7-baseline.neon @@ -565,11 +565,6 @@ parameters: count: 1 path: ../../../src/pocketmine/level/Explosion.php - - - message: "#^Parameter \\#2 \\$generatorClass of class pocketmine\\\\level\\\\generator\\\\GeneratorRegisterTask constructor expects string, pocketmine\\\\level\\\\generator\\\\Generator\\|string given\\.$#" - count: 1 - path: ../../../src/pocketmine/level/Level.php - - message: "#^Cannot access offset 'priority' on array\\('priority' \\=\\> int, 'data' \\=\\> pocketmine\\\\math\\\\Vector3\\)\\|int\\|pocketmine\\\\math\\\\Vector3\\.$#" count: 1