PHP 8.1 while maintaining PHP 7.2 & 7.3 compatibility (#61)

* PHP 8.1 while maintaining PHP 7.2 & 7.3 compatibility * remove duplicated code * cakephp/migrations >= 3.7.0
lorenzo · Dec 15, 2022 · 58f0c65 · 58f0c65
1 parent 8acc6ba
commit 58f0c65
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/config/Migrations/20171018185609_CreateAuditLogs.php b/config/Migrations/20171018185609_CreateAuditLogs.php
@@ -5,7 +5,7 @@ class CreateAuditLogs extends AbstractMigration
 {
     public $autoId = false;
 
-    public function up()
+    public function up(): void
     {
         $this->table('audit_logs')
             ->addColumn('id', 'integer', [
@@ -95,7 +95,7 @@ public function up()
             ->create();
     }
 
-    public function down()
+    public function down(): void
     {
         $this->dropTable('audit_logs');
     }

diff --git a/src/Event/BaseEvent.php b/src/Event/BaseEvent.php
@@ -79,7 +79,7 @@ abstract public function getEventType();
      *
      * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->basicSerialize() + [
             'original' => $this->original,

diff --git a/src/Event/SerializableEventTrait.php b/src/Event/SerializableEventTrait.php
@@ -14,7 +14,7 @@ trait SerializableEventTrait
      */
     public function serialize()
     {
-        return serialize(get_object_vars($this));
+        return $this->__serialize();
     }
 
     /**
@@ -24,6 +24,27 @@ public function serialize()
      * @return void
      */
     public function unserialize($data)
+    {
+        $this->__unserialize($data);
+    }
+
+    /**
+     * Returns the string representation of this object.
+     *
+     * @return string
+     */
+    public function __serialize()
+    {
+        return serialize(get_object_vars($this));
+    }
+
+    /**
+     * Takes the string representation of this object so it can be reconstructed.
+     *
+     * @param string $data serialized string
+     * @return void
+     */
+    public function __unserialize($data)
     {
         $vars = unserialize($data);
         foreach ($vars as $var => $value) {
@@ -34,9 +55,9 @@ public function unserialize($data)
     /**
      * Returns an array with the basic variables that should be json serialized.
      *
-     * @return void
+     * @return array
      */
-    protected function basicSerialize()
+    protected function basicSerialize(): mixed
     {
         return [
             'type' => $this->getEventType(),