Merge branch '3.x-dev' into 4.x-dev

Author: richard67

src/DataObject.php

@@ -199,7 +199,8 @@ public function dump($depth = 3, ?\SplObjectStorage $dumped = null)
      * @see     IteratorAggregate::getIterator()
      * @since   1.0
      */
-    public function getIterator(): \ArrayIterator
+    #[\ReturnTypeWillChange]
+    public function getIterator()
     {
         $value = ArrayHelper::fromObject($this->dump(0));
 
@@ -209,11 +210,12 @@ public function getIterator(): \ArrayIterator
     /**
      * Gets the data properties in a form that can be serialised to JSON format.
      *
-     * @return  \stdClass
+     * @return  mixed
      *
      * @since   1.0
      */
-    public function jsonSerialize(): \stdClass
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize()
     {
         return $this->dump();
     }
@@ -307,7 +309,8 @@ protected function setProperty($property, $value)
      *
      * @since   1.0
      */
-    public function count(): int
+    #[\ReturnTypeWillChange]
+    public function count()
     {
         return \count($this->properties);
     }

src/DataSet.php

@@ -255,7 +255,8 @@ public function toArray($associative = true, ...$keys): array
      *
      * @since   1.0
      */
-    public function count(): int
+    #[\ReturnTypeWillChange]
+    public function count()
     {
         return \count($this->objects);
     }
@@ -267,7 +268,7 @@ public function count(): int
      *
      * @since   1.0
      */
-    public function clear(): DataSet
+    public function clear()
     {
         $this->objects = [];
         $this->rewind();
@@ -278,11 +279,12 @@ public function clear(): DataSet
     /**
      * Get the current data object in the set.
      *
-     * @return  DataObject|bool  The current object, or false if the array is empty or the pointer is beyond the end of the elements.
+     * @return  DataObject|false  The current object, or false if the array is empty or the pointer is beyond the end of the elements.
      *
      * @since   1.0
      */
-    public function current(): DataObject|bool
+    #[\ReturnTypeWillChange]
+    public function current()
     {
         return is_scalar($this->current) ? $this->objects[$this->current] : false;
     }
@@ -349,11 +351,12 @@ public function jsonSerialize(): array
     /**
      * Gets the key of the current object in the iterator.
      *
-     * @return  int|bool|null  The object key on success; false on failure.
+     * @return  integer|false  The object key on success; false on failure.
      *
      * @since   1.0
      */
-    public function key(): int|bool|null
+    #[\ReturnTypeWillChange]
+    public function key()
     {
         return $this->current;
     }
@@ -396,7 +399,8 @@ public function walk(callable $funcname): bool
      *
      * @since   1.0
      */
-    public function next(): void
+    #[\ReturnTypeWillChange]
+    public function next()
     {
         // Get the object offsets.
         $keys = $this->keys();
@@ -429,7 +433,8 @@ public function next(): void
      *
      * @since   1.0
      */
-    public function offsetExists($offset): bool
+    #[\ReturnTypeWillChange]
+    public function offsetExists($offset)
     {
         return isset($this->objects[$offset]);
     }
@@ -443,7 +448,8 @@ public function offsetExists($offset): bool
      *
      * @since   1.0
      */
-    public function offsetGet($offset): DataObject|null
+    #[\ReturnTypeWillChange]
+    public function offsetGet($offset)
     {
         return $this->objects[$offset] ?? null;
     }
@@ -459,7 +465,8 @@ public function offsetGet($offset): DataObject|null
      * @since   1.0
      * @throws  \InvalidArgumentException if an object is not an instance of DataObject.
      */
-    public function offsetSet($offset, $object): void
+    #[\ReturnTypeWillChange]
+    public function offsetSet($offset, $object)
     {
         if (!($object instanceof DataObject)) {
             throw new \InvalidArgumentException(
@@ -488,7 +495,8 @@ public function offsetSet($offset, $object): void
      *
      * @since   1.0
      */
-    public function offsetUnset($offset): void
+    #[\ReturnTypeWillChange]
+    public function offsetUnset($offset)
     {
         if (!isset($this[$offset])) {
             // Do nothing if the offset does not exist.
@@ -521,7 +529,8 @@ public function offsetUnset($offset): void
      *
      * @since   1.0
      */
-    public function rewind(): void
+    #[\ReturnTypeWillChange]
+    public function rewind()
     {
         // Set the current position to the first object.
         if (empty($this->objects)) {
@@ -539,7 +548,8 @@ public function rewind(): void
      *
      * @since   1.0
      */
-    public function valid(): bool
+    #[\ReturnTypeWillChange]
+    public function valid()
     {
         // Check the current position.
         if (!is_scalar($this->current) || !isset($this->objects[$this->current])) {