return correct keys when iterating over CompoundTags, improve compoun…

…d/array tag stringification
aternosorg · Sep 9, 2021 · 32eeba4 · 32eeba4
1 parent 0542867
commit 32eeba4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Tag/ArrayValueTag.php b/src/Tag/ArrayValueTag.php
@@ -154,7 +154,9 @@ abstract protected function checkArrayKey($offset): bool;
      */
     protected function getValueString(): string
     {
-        return $this->count() . " entries\n[\n" . $this->indent(implode(", \n", array_map("strval", $this->valueArray))) . "\n]";
+        return $this->count() . " entr" . ($this->count() === 1 ? "y" : "ies") . "\n[\n" .
+            $this->indent(implode(", \n", array_map("strval", $this->valueArray))) .
+            "\n]";
     }
 
     /**

diff --git a/src/Tag/ByteArrayTag.php b/src/Tag/ByteArrayTag.php
@@ -62,6 +62,6 @@ protected function getValueString(): string
         if(count($this->valueArray) > 32) {
             $values[] = "...";
         }
-        return $this->count() . " bytes [" . implode(" ", $values) . "]";
+        return $this->count() . " byte" . ($this->count() === 1 ? "" : "s") . " [" . implode(" ", $values) . "]";
     }
 }
diff --git a/src/Tag/CompoundTag.php b/src/Tag/CompoundTag.php
@@ -91,7 +91,7 @@ public function next()
      */
     public function key()
     {
-        return key($this->valueArray);
+        return $this->current()->getName();
     }
 
     /**
@@ -162,7 +162,9 @@ public function count(): int
      */
     protected function getValueString(): string
     {
-        return $this->count() . " entries\n{\n" . $this->indent(implode(", \n", array_map("strval", array_values($this->valueArray)))) . "\n}";
+        return $this->count() . " entr" . ($this->count() === 1 ? "y" : "ies") . "\n{\n" .
+            $this->indent(implode(", \n", array_map("strval", array_values($this->valueArray)))) .
+            "\n}";
     }
 
     /**