fix: IterableFieldTrait:current() should be compatible with Iterator:…

src/Entity/IterableFieldTrait.php

@@ -4,59 +4,14 @@
 
 namespace Bolt\Entity;
 
-trait IterableFieldTrait
-{
-    private $iteratorCursor = 0;
-
-    /** @var array Field */
-    private $fields = [];
-
-    /**
-     * Makes ListFieldInterface fields |length filter
-     * return the number of elements in the field
-     */
-    public function count(): int
-    {
-        return count($this->getValue());
-    }
-
-    /**
-     * Makes ListFieldInterface fields .length attribute
-     * return the number of elements in the field
-     */
-    public function length(): int
+if (PHP_MAJOR_VERSION >= 8) {
+    trait IterableFieldTrait
     {
-        return $this->count();
+        use IterableFieldTraitPhp8;
     }
-
-    /**
-     * @return Field|string
-     */
-    public function current()
+} else {
+    trait IterableFieldTrait
     {
-        return $this->fields[$this->iteratorCursor];
-    }
-
-    public function next(): void
-    {
-        ++$this->iteratorCursor;
-    }
-
-    public function key(): int
-    {
-        return $this->iteratorCursor;
-    }
-
-    public function valid(): bool
-    {
-        return isset($this->fields[$this->iteratorCursor]);
-    }
-
-    public function rewind(): void
-    {
-        // Ensure $this->fields is initialised
-        $this->fields = $this->getValue();
-
-        $this->iteratorCursor = 0;
+        use IterableFieldTraitPhp7;
     }
 }

src/Entity/IterableFieldTraitPhp7.php

@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bolt\Entity;
+
+trait IterableFieldTraitPhp7
+{
+    private $iteratorCursor = 0;
+
+    /** @var array Field */
+    private $fields = [];
+
+    /**
+     * Makes ListFieldInterface fields |length filter
+     * return the number of elements in the field
+     */
+    public function count(): int
+    {
+        return count($this->getValue());
+    }
+
+    /**
+     * Makes ListFieldInterface fields .length attribute
+     * return the number of elements in the field
+     */
+    public function length(): int
+    {
+        return $this->count();
+    }
+
+    /**
+     * @return Field|string
+     */
+    public function current()
+    {
+        return $this->fields[$this->iteratorCursor];
+    }
+
+    public function next(): void
+    {
+        ++$this->iteratorCursor;
+    }
+
+    public function key(): int
+    {
+        return $this->iteratorCursor;
+    }
+
+    public function valid(): bool
+    {
+        return isset($this->fields[$this->iteratorCursor]);
+    }
+
+    public function rewind(): void
+    {
+        // Ensure $this->fields is initialised
+        $this->fields = $this->getValue();
+
+        $this->iteratorCursor = 0;
+    }
+}

src/Entity/IterableFieldTraitPhp8.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bolt\Entity;
+
+trait IterableFieldTraitPhp8
+{
+    use IterableFieldTraitPhp7 {
+        IterableFieldTraitPhp7::current as private parentCurrent;
+    }
+
+    /**
+     * @return Field|string
+     * @noinspection PhpMixedReturnTypeCanBeReducedInspection
+     */
+    public function current(): mixed
+    {
+        return $this->parentCurrent();
+    }
+}