update to PHP 8.1

aternosorg · Nov 13, 2023 · 41106bc · 41106bc
1 parent c6b0d14
commit 41106bc
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 40 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
   ],
   "require": {
     "pocketmine/binaryutils": "^0.2.1",
-    "php": ">=8.0",
+    "php": ">=8.1",
     "php-64bit": "*",
     "ext-zlib": "*",
     "ext-json": "*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Deserializer/BedrockEditionNbtDeserializer.php b/src/Deserializer/BedrockEditionNbtDeserializer.php
@@ -68,7 +68,7 @@ public function readInt(): DeserializerIntReadResult
     public function readLong(): DeserializerIntReadResult
     {
         $raw = $this->getReader()->read(8);
-        $value = @unpack("q", MachineByteOrder::isBigEndian() ? strrev($raw) : $raw)[1] ?? 0;;
+        $value = @unpack("q", MachineByteOrder::isBigEndian() ? strrev($raw) : $raw)[1] ?? 0;
         return new DeserializerIntReadResult($value, $raw);
     }
 

diff --git a/src/String/StringDataFormatException.php b/src/String/StringDataFormatException.php
@@ -2,7 +2,9 @@
 
 namespace Aternos\Nbt\String;
 
-class StringDataFormatException extends \Exception
+use Exception;
+
+class StringDataFormatException extends Exception
 {
 
-}
+}
diff --git a/src/Tag/ArrayValueTag.php b/src/Tag/ArrayValueTag.php
@@ -81,23 +81,23 @@ abstract protected function checkArrayValue($value): bool;
     /**
      * @inheritDoc
      */
-    public function current()
+    public function current(): mixed
     {
         return current($this->valueArray);
     }
 
     /**
      * @inheritDoc
      */
-    public function next()
+    public function next(): void
     {
         next($this->valueArray);
     }
 
     /**
      * @inheritDoc
      */
-    public function key()
+    public function key(): string|int|null
     {
         return key($this->valueArray);
     }
@@ -113,7 +113,7 @@ public function valid(): bool
     /**
      * @inheritDoc
      */
-    public function rewind()
+    public function rewind(): void
     {
         reset($this->valueArray);
     }
@@ -129,7 +129,7 @@ public function offsetExists($offset): bool
     /**
      * @inheritDoc
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         return $this->valueArray[$offset];
     }
@@ -138,7 +138,7 @@ public function offsetGet($offset)
      * @inheritDoc
      * @throws Exception
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         if (!$this->checkArrayValue($value)) {
             throw new Exception("Invalid array value");
@@ -156,7 +156,7 @@ public function offsetSet($offset, $value)
     /**
      * @inheritDoc
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->valueArray[$offset]);
     }
@@ -181,14 +181,14 @@ abstract protected function checkArrayKey($offset): bool;
     protected function getValueString(): string
     {
         return $this->count() . " entr" . ($this->count() === 1 ? "y" : "ies") . "\n[\n" .
-            $this->indent(implode(", \n", array_map("strval", $this->valueArray))) .
+            $this->indent(implode(", \n", array_map(strval(...), $this->valueArray))) .
             "\n]";
     }
 
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->valueArray;
     }

diff --git a/src/Tag/ByteArrayTag.php b/src/Tag/ByteArrayTag.php
@@ -68,7 +68,7 @@ protected function checkArrayKey($offset): bool
     protected function getValueString(): string
     {
         $values = array_map(function ($elem) {
-            return str_pad(dechex($elem), 2, "0", STR_PAD_RIGHT);
+            return str_pad(dechex($elem), 2, "0");
         }, array_slice($this->valueArray, 0, 32));
         if (count($this->valueArray) > 32) {
             $values[] = "...";

diff --git a/src/Tag/CompoundTag.php b/src/Tag/CompoundTag.php
@@ -47,7 +47,7 @@ public function writeContent(Writer $writer): static
             if (in_array($value->getName(), $writtenNames)) {
                 throw new Exception("Duplicate key '" . $value->getName() . "' in compound tag");
             }
-            $value->writeData($writer, true);
+            $value->writeData($writer);
         }
         (new EndTag($this->options))->writeData($writer);
         return $this;
@@ -116,23 +116,23 @@ public function offsetSet($offset, $value): void
     /**
      * @inheritDoc
      */
-    public function current()
+    public function current(): bool|Tag
     {
         return current($this->valueArray);
     }
 
     /**
      * @inheritDoc
      */
-    public function next()
+    public function next(): void
     {
         next($this->valueArray);
     }
 
     /**
      * @inheritDoc
      */
-    public function key()
+    public function key(): ?string
     {
         return $this->current()->getName();
     }
@@ -148,7 +148,7 @@ public function valid(): bool
     /**
      * @inheritDoc
      */
-    public function rewind()
+    public function rewind(): void
     {
         reset($this->valueArray);
     }
@@ -169,7 +169,7 @@ public function offsetExists($offset): bool
     /**
      * @inheritDoc
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): ?Tag
     {
         foreach ($this->valueArray as $val) {
             if ($val->getName() === $offset) {
@@ -183,7 +183,7 @@ public function offsetGet($offset)
      * @inheritDoc
      * @throws Exception
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         if($this->isRaw()) {
             throw new Exception("Raw compound tags cannot be modified");
@@ -214,14 +214,14 @@ protected function getValueString(): string
             return strlen($this->rawContent) . " bytes";
         }
         return $this->count() . " entr" . ($this->count() === 1 ? "y" : "ies") . "\n{\n" .
-            $this->indent(implode(", \n", array_map("strval", array_values($this->valueArray)))) .
+            $this->indent(implode(", \n", array_map(strval(...), array_values($this->valueArray)))) .
             "\n}";
     }
 
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $data = [];
         foreach ($this->valueArray as $value) {

diff --git a/src/Tag/EndTag.php b/src/Tag/EndTag.php
@@ -52,7 +52,7 @@ protected function getValueString(): string
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return null;
     }

diff --git a/src/Tag/FloatValueTag.php b/src/Tag/FloatValueTag.php
@@ -35,7 +35,7 @@ protected function getValueString(): string
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): int|float
     {
         return $this->value;
     }

diff --git a/src/Tag/IntValueTag.php b/src/Tag/IntValueTag.php
@@ -35,7 +35,7 @@ protected function getValueString(): string
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): int
     {
         return $this->value;
     }

diff --git a/src/Tag/ListTag.php b/src/Tag/ListTag.php
@@ -192,7 +192,7 @@ protected function getTagTypeString(): string
     /**
      * @inheritDoc
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         if ($this->isRaw()) {
             throw new Exception("Raw list tags cannot be modified");
@@ -209,7 +209,7 @@ public function offsetSet($offset, $value)
      * @inheritDoc
      * @throws Exception
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         if ($this->isRaw()) {
             throw new Exception("Raw list tags cannot be modified");

diff --git a/src/Tag/StringTag.php b/src/Tag/StringTag.php
@@ -81,7 +81,7 @@ protected function getValueString(): string
     /**
      * @inheritDoc
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): string
     {
         return $this->value;
     }