improve code style, support PHP 8

composer.json

@@ -16,6 +16,7 @@
   ],
   "require": {
     "pocketmine/binaryutils": "^0.2.1",
+    "php": "^7.4 || ^8.0",
     "php-64bit": "*",
     "ext-zlib": "*",
     "ext-json": "*"

src/Serializer/JavaEditionNbtSerializer.php

@@ -76,7 +76,8 @@ public function encodeShort(int $value): string
     }
 
     /**
-     * @inheritDoc
+     * @param string $data
+     * @return int
      */
     public function decodeInt(string $data): int
     {

src/Tag/ArrayValueTag.php

@@ -23,7 +23,7 @@ public function generatePayload(NbtSerializer $serializer): string
     {
         $count = $this->count();
         if($count > 0x7fffffff) {
-            throw new \Exception("Array exceeds maximum length of " . 0x7fffffff . " entries");
+            throw new Exception("Array exceeds maximum length of " . 0x7fffffff . " entries");
         }
         return $serializer->encodeLengthPrefix($this->count()) . $this->generateValues($serializer);
     }

src/Tag/CompoundTag.php

@@ -2,11 +2,14 @@
 
 namespace Aternos\Nbt\Tag;
 
+use ArrayAccess;
 use Aternos\Nbt\IO\Reader\Reader;
 use Aternos\Nbt\Serializer\NbtSerializer;
+use Countable;
 use Exception;
+use Iterator;
 
-class CompoundTag extends Tag implements \Iterator, \ArrayAccess, \Countable
+class CompoundTag extends Tag implements Iterator, ArrayAccess, Countable
 {
     public const TYPE = TagType::TAG_Compound;
 

src/Tag/IntValueTag.php

@@ -2,8 +2,6 @@
 
 namespace Aternos\Nbt\Tag;
 
-use Aternos\Nbt\IO\Reader\Reader;
-
 abstract class IntValueTag extends Tag
 {
     protected int $value;

src/Tag/StringTag.php

@@ -4,6 +4,7 @@
 
 use Aternos\Nbt\IO\Reader\Reader;
 use Aternos\Nbt\Serializer\NbtSerializer;
+use Exception;
 
 class StringTag extends Tag
 {
@@ -39,13 +40,13 @@ public function getLength(): int
 
     /**
      * @inheritDoc
-     * @throws \Exception
+     * @throws Exception
      */
     public function generatePayload(NbtSerializer $serializer): string
     {
         $length = strlen($this->value);
         if($length > 0xffff) {
-            throw new \Exception("String exceeds maximum length of " . 0xffff . " characters");
+            throw new Exception("String exceeds maximum length of " . 0xffff . " characters");
         }
         return $serializer->encodeStringLengthPrefix($length) . $this->value;
     }

src/Tag/Tag.php

@@ -140,7 +140,7 @@ public function write(Writer $writer): Tag
         if(!($this instanceof CompoundTag) && !(in_array($writer->getFormat(), [NbtFormat::BEDROCK_EDITION_NETWORK, NbtFormat::BEDROCK_EDITION]) && $this instanceof ListTag)){
             throw new Exception("NBT files must start with a CompoundTag (or ListTag for Minecraft Bedrock Edition)");
         }
-        $writer->write($this->serialize($writer->getSerializer()), true);
+        $writer->write($this->serialize($writer->getSerializer()));
         return $this;
     }