From c13901c9bf708d3ad33418bb4348efd4dbd741a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gin=C3=A9?= <dgine>
Date: Tue, 25 Feb 2025 14:55:14 +0100
Subject: [PATCH 1/2] #[\ReturnTypeWillChange] added return type on attributes

---
 .phpunit.result.cache                 |  1 +
 src/Constraint/Properties.php         |  2 +-
 src/MagicMapTrait.php                 | 20 ++++++++++----------
 src/Structure/ClassStructureTrait.php |  2 +-
 src/Structure/ObjectItemTrait.php     |  2 +-
 src/Wrapper.php                       |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 .phpunit.result.cache

diff --git a/.phpunit.result.cache b/.phpunit.result.cache
new file mode 100644
index 0000000..2de2a6d
--- /dev/null
+++ b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":[],"times":[]}
\ No newline at end of file
diff --git a/src/Constraint/Properties.php b/src/Constraint/Properties.php
index f0d393f..ca07b30 100644
--- a/src/Constraint/Properties.php
+++ b/src/Constraint/Properties.php
@@ -165,7 +165,7 @@ public function isEmpty()
     }
 
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $result = $this->toArray();
 
diff --git a/src/MagicMapTrait.php b/src/MagicMapTrait.php
index d6a433f..9fbc801 100644
--- a/src/MagicMapTrait.php
+++ b/src/MagicMapTrait.php
@@ -28,13 +28,13 @@ public function &__get($name)
     }
 
     #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return array_key_exists($offset, $this->__arrayOfData);
     }
 
     #[\ReturnTypeWillChange]
-    public function &offsetGet($offset)
+    public function &offsetGet($offset): mixed
     {
         if (isset($this->__arrayOfData[$offset])) {
             return $this->__arrayOfData[$offset];
@@ -45,13 +45,13 @@ public function &offsetGet($offset)
     }
 
     #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $this->__set($offset, $value);
     }
 
     #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->__arrayOfData[$offset]);
     }
@@ -62,7 +62,7 @@ public function &toArray()
     }
 
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return (object)$this->__arrayOfData;
     }
@@ -78,7 +78,7 @@ public function jsonSerialize()
      * @since 5.0.0
      */
     #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): mixed
     {
         return $this->iterator->current();
     }
@@ -90,7 +90,7 @@ public function current()
      * @since 5.0.0
      */
     #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         $this->iterator->next();
     }
@@ -102,7 +102,7 @@ public function next()
      * @since 5.0.0
      */
     #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): mixed
     {
         return $this->iterator->key();
     }
@@ -115,7 +115,7 @@ public function key()
      * @since 5.0.0
      */
     #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         return $this->iterator->valid();
     }
@@ -127,7 +127,7 @@ public function valid()
      * @since 5.0.0
      */
     #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->iterator = new \ArrayIterator($this->__arrayOfData);
     }
diff --git a/src/Structure/ClassStructureTrait.php b/src/Structure/ClassStructureTrait.php
index 393e65b..173c608 100644
--- a/src/Structure/ClassStructureTrait.php
+++ b/src/Structure/ClassStructureTrait.php
@@ -96,7 +96,7 @@ public static function create()
      * @return \stdClass
      */
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $result = new \stdClass();
         $schema = static::schema();
diff --git a/src/Structure/ObjectItemTrait.php b/src/Structure/ObjectItemTrait.php
index 54ec030..640a995 100644
--- a/src/Structure/ObjectItemTrait.php
+++ b/src/Structure/ObjectItemTrait.php
@@ -104,7 +104,7 @@ public function getPatternPropertyNames($pattern)
     }
 
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         if ($this->__nestedObjects) {
             $result = $this->__arrayOfData;
diff --git a/src/Wrapper.php b/src/Wrapper.php
index 421ec12..6bfeeec 100644
--- a/src/Wrapper.php
+++ b/src/Wrapper.php
@@ -215,7 +215,7 @@ public function exportSchema()
     }
 
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->schema->jsonSerialize();
     }

From 0496de7bab50a83a8c3f6128c984d130987b0048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Gin=C3=A9?= <dgine>
Date: Tue, 25 Feb 2025 15:01:14 +0100
Subject: [PATCH 2/2] Remove .phpunit.result.cache file

---
 .phpunit.result.cache | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .phpunit.result.cache

diff --git a/.phpunit.result.cache b/.phpunit.result.cache
deleted file mode 100644
index 2de2a6d..0000000
--- a/.phpunit.result.cache
+++ /dev/null
@@ -1 +0,0 @@
-{"version":1,"defects":[],"times":[]}
\ No newline at end of file