diff --git a/src/resourcepacks/json/Manifest.php b/src/resourcepacks/json/Manifest.php index 94521c1f5..31c68973e 100644 --- a/src/resourcepacks/json/Manifest.php +++ b/src/resourcepacks/json/Manifest.php @@ -27,24 +27,17 @@ namespace pocketmine\resourcepacks\json; * Model for JsonMapper to represent resource pack manifest.json contents. */ final class Manifest{ - /** - * @var int - * @required - */ - public $format_version; + /** @required */ + public int $format_version; - /** - * @var ManifestHeader - * @required - */ - public $header; + /** @required */ + public ManifestHeader $header; /** * @var ManifestModuleEntry[] * @required */ - public $modules; + public array $modules; - /** @var ManifestMetadata|null */ - public $metadata = null; + public ?ManifestMetadata $metadata = null; } diff --git a/src/resourcepacks/json/ManifestHeader.php b/src/resourcepacks/json/ManifestHeader.php index 92f5aa7bc..60568a4db 100644 --- a/src/resourcepacks/json/ManifestHeader.php +++ b/src/resourcepacks/json/ManifestHeader.php @@ -24,31 +24,25 @@ declare(strict_types=1); namespace pocketmine\resourcepacks\json; final class ManifestHeader{ - /** @var string */ - public $description; - /** - * @var string - * @required - */ - public $name; + public string $description; - /** - * @var string - * @required - */ - public $uuid; + /** @required */ + public string $name; + + /** @required */ + public string $uuid; /** * @var int[] * @phpstan-var array{int, int, int} * @required */ - public $version; + public array $version; /** * @var int[] * @phpstan-var array{int, int, int} */ - public $min_engine_version; + public array $min_engine_version; } diff --git a/src/resourcepacks/json/ManifestMetadata.php b/src/resourcepacks/json/ManifestMetadata.php index 5eb0c9996..d44c42167 100644 --- a/src/resourcepacks/json/ManifestMetadata.php +++ b/src/resourcepacks/json/ManifestMetadata.php @@ -25,9 +25,9 @@ namespace pocketmine\resourcepacks\json; final class ManifestMetadata{ /** @var string[]|null */ - public $authors = null; - /** @var string|null */ - public $license = null; - /** @var string|null */ - public $url = null; + public ?array $authors = null; + + public ?string $license = null; + + public ?string $url = null; } diff --git a/src/resourcepacks/json/ManifestModuleEntry.php b/src/resourcepacks/json/ManifestModuleEntry.php index 26bb129c5..a97623b05 100644 --- a/src/resourcepacks/json/ManifestModuleEntry.php +++ b/src/resourcepacks/json/ManifestModuleEntry.php @@ -25,27 +25,18 @@ namespace pocketmine\resourcepacks\json; final class ManifestModuleEntry{ - /** - * @var string - */ - public $description; + public string $description; - /** - * @var string - * @required - */ - public $type; + /** @required */ + public string $type; - /** - * @var string - * @required - */ - public $uuid; + /** @required */ + public string $uuid; /** * @var int[] * @phpstan-var array{int, int, int} * @required */ - public $version; + public array $version; }