Merge pull request #189 from maxmind/revert-187-greg/fix-json-serialize-return-type

Revert "Update jsonSerialize return type. Closes #185"

Author: ugexe

CHANGELOG.md

@@ -1,13 +1,6 @@
 CHANGELOG
 =========
 
-2.13.0
--------------------
-
-* The return types on the `jsonSerialize` implementations have been remove
-  to that they do not conflict with `JsonSerializable::jsonSerialize` on PHP
-  8+. Reported by Gokul Hegde. GitHub #185.
-
 2.12.2 (2021-11-30)
 -------------------
 

src/Model/AbstractModel.php

@@ -61,13 +61,7 @@ public function __isset(string $attr): bool
         return $attr !== 'instance' && isset($this->{$attr});
     }
 
-    /**
-     * @return mixed data that can be serialized by json_encode
-     */
-    // We don't specify a return type here as PHP 8 has "mixed" as the return
-    // type for "JsonSerializable::jsonSerialize", but PHP 7 doesn't support
-    // "mixed".
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->raw;
     }

src/Record/AbstractRecord.php

@@ -60,13 +60,7 @@ private function validAttribute(string $attr): bool
         return \in_array($attr, $this->validAttributes, true);
     }
 
-    /**
-     * @return mixed data that can be serialized by json_encode
-     */
-    // We don't specify a return type here as PHP 8 has "mixed" as the return
-    // type for "JsonSerializable::jsonSerialize", but PHP 7 doesn't support
-    // "mixed".
-    public function jsonSerialize()
+    public function jsonSerialize(): ?array
     {
         return $this->record;
     }