Modernize private property declarations in src/item

src/item/Armor.php

@@ -40,8 +40,7 @@ class Armor extends Durable{
 
 	public const TAG_CUSTOM_COLOR = "customColor"; //TAG_Int
 
-	/** @var ArmorTypeInfo */
+	private ArmorTypeInfo $armorInfo;
-	private $armorInfo;
 
 	/** @var Color|null */
 	protected $customColor = null;

src/item/ArmorTypeInfo.php

@@ -24,19 +24,11 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 class ArmorTypeInfo{
-
+	public function __construct(
-	/** @var int */
+		private int $defensePoints,
-	private $defensePoints;
+		private int $maxDurability,
-	/** @var int */
+		private int $armorSlot
-	private $maxDurability;
+	){}
-	/** @var int */
-	private $armorSlot;
-
-	public function __construct(int $defensePoints, int $maxDurability, int $armorSlot){
-		$this->defensePoints = $defensePoints;
-		$this->maxDurability = $maxDurability;
-		$this->armorSlot = $armorSlot;
-	}
 
 	public function getDefensePoints() : int{
 		return $this->defensePoints;

src/item/Banner.php

@@ -39,14 +39,13 @@ class Banner extends ItemBlockWallOrFloor{
 	public const TAG_PATTERN_COLOR = TileBanner::TAG_PATTERN_COLOR;
 	public const TAG_PATTERN_NAME = TileBanner::TAG_PATTERN_NAME;
 
-	/** @var DyeColor */
+	private DyeColor $color;
-	private $color;
 
 	/**
 	 * @var BannerPatternLayer[]
 	 * @phpstan-var list<BannerPatternLayer>
 	 */
-	private $patterns = [];
+	private array $patterns = [];
 
 	public function __construct(ItemIdentifier $identifier, Block $floorVariant, Block $wallVariant){
 		parent::__construct($identifier, $floorVariant, $wallVariant);

src/item/Bed.php

@@ -28,9 +28,7 @@ use pocketmine\block\utils\DyeColor;
 use pocketmine\block\VanillaBlocks;
 
 class Bed extends Item{
-
+	private DyeColor $color;
-	/** @var DyeColor */
-	private $color;
 
 	public function __construct(ItemIdentifier $identifier, string $name, DyeColor $color){
 		parent::__construct($identifier, $name);

src/item/Boat.php

@@ -26,8 +26,7 @@ namespace pocketmine\item;
 use pocketmine\block\utils\TreeType;
 
 class Boat extends Item{
-	/** @var TreeType */
+	private TreeType $woodType;
-	private $woodType;
 
 	public function __construct(ItemIdentifier $identifier, string $name, TreeType $woodType){
 		parent::__construct($identifier, $name);

src/item/Durable.php

@@ -32,8 +32,7 @@ abstract class Durable extends Item{
 
 	/** @var int */
 	protected $damage = 0;
-	/** @var bool */
+	private bool $unbreakable = false;
-	private $unbreakable = false;
 
 	public function getMeta() : int{
 		return $this->damage;

src/item/Dye.php

@@ -26,9 +26,7 @@ namespace pocketmine\item;
 use pocketmine\block\utils\DyeColor;
 
 class Dye extends Item{
-
+	private DyeColor $color;
-	/** @var DyeColor */
-	private $color;
 
 	public function __construct(ItemIdentifier $identifier, string $name, DyeColor $color){
 		parent::__construct($identifier, $name);

src/item/Item.php

@@ -65,10 +65,9 @@ class Item implements \JsonSerializable{
 	public const TAG_DISPLAY_NAME = "Name";
 	public const TAG_DISPLAY_LORE = "Lore";
 
-	/** @var ItemIdentifier */
+	private ItemIdentifier $identifier;
-	private $identifier;
+	private CompoundTag $nbt;
-	/** @var CompoundTag */
+
-	private $nbt;
 	/** @var int */
 	protected $count = 1;
 	/** @var string */

src/item/ItemBlock.php

@@ -30,8 +30,7 @@ use pocketmine\block\BlockFactory;
  * Class used for Items that can be Blocks
  */
 class ItemBlock extends Item{
-	/** @var int */
+	private int $blockFullId;
-	private $blockFullId;
 
 	public function __construct(ItemIdentifier $identifier, Block $block){
 		parent::__construct($identifier, $block->getName());

src/item/ItemBlockWallOrFloor.php

@@ -29,11 +29,8 @@ use pocketmine\math\Axis;
 use pocketmine\math\Facing;
 
 class ItemBlockWallOrFloor extends Item{
-
+	private int $floorVariant;
-	/** @var int */
+	private int $wallVariant;
-	private $floorVariant;
-	/** @var int */
-	private $wallVariant;
 
 	public function __construct(ItemIdentifier $identifier, Block $floorVariant, Block $wallVariant){
 		parent::__construct($identifier, $floorVariant->getName());

src/item/ItemFactory.php

@@ -55,7 +55,7 @@ class ItemFactory{
 	use SingletonTrait;
 
 	/** @var Item[] */
-	private $list = [];
+	private array $list = [];
 
 	public function __construct(){
 		$this->registerArmorItems();

src/item/ItemIdentifier.php

@@ -24,11 +24,8 @@ declare(strict_types=1);
 namespace pocketmine\item;
 
 final class ItemIdentifier{
-
+	private int $id;
-	/** @var int */
+	private int $meta;
-	private $id;
-	/** @var int */
-	private $meta;
 
 	public function __construct(int $id, int $meta){
 		if($id < -0x8000 || $id > 0x7fff){ //signed short range

src/item/LegacyStringToItemParser.php

@@ -50,9 +50,6 @@ use function trim;
 final class LegacyStringToItemParser{
 	use SingletonTrait;
 
-	/** @var ItemFactory */
-	private $itemFactory;
-
 	private static function make() : self{
 		$result = new self(ItemFactory::getInstance());
 
@@ -73,11 +70,9 @@ final class LegacyStringToItemParser{
 	 * @var int[]
 	 * @phpstan-var array<string, int>
 	 */
-	private $map = [];
+	private array $map = [];
 
-	public function __construct(ItemFactory $itemFactory){
+	public function __construct(private ItemFactory $itemFactory){}
-		$this->itemFactory = $itemFactory;
-	}
 
 	public function addMapping(string $alias, int $id) : void{
 		$this->map[$alias] = $id;

src/item/LiquidBucket.php

@@ -31,9 +31,7 @@ use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 
 class LiquidBucket extends Item{
-
+	private Liquid $liquid;
-	/** @var Liquid */
-	private $liquid;
 
 	public function __construct(ItemIdentifier $identifier, string $name, Liquid $liquid){
 		parent::__construct($identifier, $name);

src/item/Record.php

@@ -26,9 +26,9 @@ namespace pocketmine\item;
 use pocketmine\block\utils\RecordType;
 
 class Record extends Item{
-	/** @var RecordType */
+	private RecordType $recordType;
-	private $recordType;
 
+	//TODO: inconsistent parameter order
 	public function __construct(ItemIdentifier $identifier, RecordType $recordType, string $name){
 		$this->recordType = $recordType;
 		parent::__construct($identifier, $name);

src/item/Skull.php

@@ -28,9 +28,7 @@ use pocketmine\block\utils\SkullType;
 use pocketmine\block\VanillaBlocks;
 
 class Skull extends Item{
-
+	private SkullType $skullType;
-	/** @var SkullType */
-	private $skullType;
 
 	public function __construct(ItemIdentifier $identifier, string $name, SkullType $skullType){
 		parent::__construct($identifier, $name);

src/item/ToolTier.php

@@ -52,21 +52,14 @@ final class ToolTier{
 		);
 	}
 
-	/** @var int */
+	private function __construct(
-	private $harvestLevel;
+		string $name,
-	/** @var int */
+		private int $harvestLevel,
-	private $maxDurability;
+		private int $maxDurability,
-	/** @var int */
+		private int $baseAttackPoints,
-	private $baseAttackPoints;
+		private int $baseEfficiency
-	/** @var int */
+	){
-	private $baseEfficiency;
-
-	private function __construct(string $name, int $harvestLevel, int $maxDurability, int $baseAttackPoints, int $baseEfficiency){
 		$this->Enum___construct($name);
-		$this->harvestLevel = $harvestLevel;
-		$this->maxDurability = $maxDurability;
-		$this->baseAttackPoints = $baseAttackPoints;
-		$this->baseEfficiency = $baseEfficiency;
 	}
 
 	public function getHarvestLevel() : int{

src/item/WritableBookBase.php

@@ -42,7 +42,7 @@ abstract class WritableBookBase extends Item{
 	 * @var WritableBookPage[]
 	 * @phpstan-var list<WritableBookPage>
 	 */
-	private $pages = [];
+	private array $pages = [];
 
 	public function __construct(ItemIdentifier $identifier, string $name){
 		parent::__construct($identifier, $name);

src/item/WritableBookPage.php

@@ -32,10 +32,8 @@ class WritableBookPage{
 	public const PAGE_LENGTH_HARD_LIMIT_BYTES = Limits::INT16_MAX;
 	public const PHOTO_NAME_LENGTH_HARD_LIMIT_BYTES = Limits::INT16_MAX;
 
-	/** @var string */
+	private string $text;
-	private $text;
+	private string $photoName;
-	/** @var string */
-	private $photoName;
 
 	/**
 	 * @throws \InvalidArgumentException

src/item/WrittenBook.php

@@ -40,12 +40,9 @@ class WrittenBook extends WritableBookBase{
 	public const TAG_AUTHOR = "author"; //TAG_String
 	public const TAG_TITLE = "title"; //TAG_String
 
-	/** @var int */
+	private int $generation = self::GENERATION_ORIGINAL;
-	private $generation = self::GENERATION_ORIGINAL;
+	private string $author = "";
-	/** @var string */
+	private string $title = "";
-	private $author = "";
-	/** @var string */
-	private $title = "";
 
 	public function getMaxStackSize() : int{
 		return 16;

src/item/enchantment/EnchantmentInstance.php

@@ -29,21 +29,10 @@ namespace pocketmine\item\enchantment;
  * Note: This class is assumed to be immutable. Consider this before making alterations.
  */
 final class EnchantmentInstance{
-	/** @var Enchantment */
+	public function __construct(
-	private $enchantment;
+		private Enchantment $enchantment,
-	/** @var int */
+		private int $level = 1
-	private $level;
+	){}
-
-	/**
-	 * EnchantmentInstance constructor.
-	 *
-	 * @param Enchantment $enchantment Enchantment type
-	 * @param int         $level Level of enchantment
-	 */
-	public function __construct(Enchantment $enchantment, int $level = 1){
-		$this->enchantment = $enchantment;
-		$this->level = $level;
-	}
 
 	/**
 	 * Returns the type of this enchantment.