Restore 4.x-dev changes after upmerge

Author: richard67

src/DataObject.php

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

src/DataSet.php

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