fixed deprecate warnings with PHP8.1 (#10)

maintaina-com · Sep 19, 2023 · 57bfe1f · 57bfe1f
1 parent a2d4e6a
commit 57bfe1f
Show file tree

Hide file tree

Showing 17 changed files with 260 additions and 78 deletions.
diff --git a/lib/Compose/Attachment.php b/lib/Compose/Attachment.php
@@ -187,6 +187,11 @@ public function viewUrl()
     /**
      */
     public function serialize()
+    {
+        return array_shift($this->__serialize());
+    }
+
+    public function __serialize(): array
     {
         /* Don't store Mime_Part data. Can't use clone here ATM, since there
          * appears to be a PHP bug. Since this is an object specific to IMP
@@ -196,7 +201,9 @@ public function serialize()
         $this->_part->clearContents();
         $this->_isBuilt = false;
 
-        return $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
+        return
+        [
+            $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
             array(
                 $this->_composeCache,
                 $this->id,
@@ -207,13 +214,18 @@ public function serialize()
             ), array(
                 'compression' => false,
                 'phpob' => true
-            )
-        );
+            ))
+        ];
     }
 
     /**
      */
     public function unserialize($data)
+    {
+        $this->__unserialize([$data]);
+    }
+
+    public function __unserialize(array $data): void
     {
         list(
             $this->_composeCache,
@@ -222,7 +234,6 @@ public function unserialize($data)
             $this->_part,
             $this->related,
             $this->_uuid
-        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack($data);
+        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack(array_shift($data));
     }
-
 }
diff --git a/lib/Flag/Base.php b/lib/Flag/Base.php
@@ -203,12 +203,21 @@ public function serialize()
     {
         return $this->_bgcolor;
     }
-
+    public function __serialize(): array
+    {
+        return [
+            $this->_bgcolor
+        ];
+    } 
     /**
      */
     public function unserialize($data)
     {
         $this->_bgcolor = $data;
     }
 
+    public function __unserialize(array $data): void 
+    {
+        $this->_bgcolor = $data[0];
+    }
 }
diff --git a/lib/Flag/User.php b/lib/Flag/User.php
@@ -112,22 +112,33 @@ protected function _getLabel()
      */
     public function serialize()
     {
-        return json_encode(array(
-            parent::serialize(),
-            $this->_label,
-            $this->_imapflag
-        ));
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array 
+    {
+        return
+        [
+            json_encode(array(
+                parent::serialize(),
+                $this->_label,
+                $this->_imapflag
+            ))
+        ];
     }
 
     /**
      */
     public function unserialize($data)
     {
-        $data = json_decode($data, true);
+        $this->__unserialize([$data]);
+    }
+    public function __unserialize(array $data): void 
+    {
+        $data = json_decode($data[0], true);
 
         parent::unserialize($data[0]);
         $this->_label = $data[1];
         $this->_imapflag = $data[2];
-    }
 
+    }
 }
diff --git a/lib/Ftree/Account.php b/lib/Ftree/Account.php
@@ -84,12 +84,21 @@ public function serialize()
     {
         return $this->_id;
     }
-
+    public function __serialize(): array
+    {
+        return
+        [
+            $this->_id
+        ];
+    }
     /**
      */
     public function unserialize($data)
     {
         $this->_id = $data;
     }
-
+    public function __unserialize(array $data): void 
+    {
+        $this->_id = $data[0];
+    }
 }
diff --git a/lib/Ftree/Eltdiff.php b/lib/Ftree/Eltdiff.php
@@ -193,26 +193,37 @@ public function clear()
      */
     public function serialize()
     {
-        return $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
-            array(
-                $this->track,
-                $this->_changes
-            ),
-            array(
-                'compression' => false,
-                'phpob' => false
-            )
-        );
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array
+    {
+        return
+        [
+            $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
+                array(
+                    $this->track,
+                    $this->_changes
+                ),
+                array(
+                    'compression' => false,
+                    'phpob' => false
+                )
+            ) 
+        ];
     }
 
     /**
      */
     public function unserialize($data)
+    {
+        $this->__unserialize([$data]);
+    }
+    public function __unserialize(array $data): void 
     {
         list(
             $this->track,
             $this->_changes
-        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack($data);
+        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack(array_shift($data));
     }
 
 }
diff --git a/lib/Imap.php b/lib/Imap.php
@@ -943,28 +943,40 @@ public static function loadServerConfig($server = null)
      */
     public function serialize()
     {
-        return $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
-            array(
-                $this->_ob,
-                $this->_id,
-                $this->_config
-            ),
-            array(
-                'compression' => false,
-                'phpob' => true
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array
+    {
+        return
+        [
+            $GLOBALS['injector']->getInstance('Horde_Pack')->pack(
+                array(
+                    $this->_ob,
+                    $this->_id,
+                    $this->_config
+                ),
+                array(
+                    'compression' => false,
+                    'phpob' => true
+                )
             )
-        );
+        ];
     }
-
     /**
+     * @throws Horde_Pack_Exception
      */
     public function unserialize($data)
+    {
+        $this->__unserialize([$data]);
+    }
+
+    public function __unserialize(array $data): void
     {
         list(
             $this->_ob,
             $this->_id,
             $this->_config
-        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack($data);
+        ) = $GLOBALS['injector']->getInstance('Horde_Pack')->unpack(array_shift($data));
+
     }
-
 }
diff --git a/lib/Imap/Cache/Wrapper.php b/lib/Imap/Cache/Wrapper.php
@@ -125,14 +125,24 @@ public function __call($name, $arguments)
      */
     public function serialize()
     {
-        return json_encode($this->_params);
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array 
+    {
+        return
+        [
+            json_encode($this->_params)
+        ];
     }
 
     /**
      */
     public function unserialize($data)
     {
-        $this->_initOb(json_decode($data, true));
+        $this->__unserialize([$data]);
+    }
+    public function __unserialize(array $data): void 
+    {
+        $this->_initOb(json_decode($data[0], true));
     }
-
 }
diff --git a/lib/Imap/Config.php b/lib/Imap/Config.php
@@ -297,7 +297,7 @@ public function __get($name)
 
         case 'maildomain':
             /* Sanity checking - this should be null, not empty string. */
-            if (!strlen($out)) {
+            if (!is_null($out) && !strlen($out)) {
                 $out = null;
             }
             break;
@@ -376,31 +376,42 @@ public function __unset($name)
     /**
      */
     public function serialize()
+    {
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array 
     {
         global $injector, $session;
 
         if (!empty($this->_passwords)) {
             $session->set('imp', self::PASSWORDS_KEY, $this->_passwords, $session::ENCRYPT);
         }
 
-        return $injector->getInstance('Horde_Pack')->pack(
-            array_filter($this->_config),
-            array(
-                'compression' => false,
-                'phpob' => false
+        return
+        [
+            $injector->getInstance('Horde_Pack')->pack(
+                array_filter($this->_config),
+                array(
+                    'compression' => false,
+                    'phpob' => false
+                )
             )
-        );
-    }
+        ];
 
+    }
     /**
      */
     public function unserialize($data)
+    {
+        $this->__unserialize([$data]);
+    }
+    public function __unserialize(array $data): void 
     {
         global $injector, $session;
 
-        $this->_config = $injector->getInstance('Horde_Pack')->unpack($data);
+        $this->_config = $injector->getInstance('Horde_Pack')->unpack(array_shift($data));
 
         $this->_passwords = $session->get('imp', self::PASSWORDS_KEY, $session::TYPE_ARRAY);
-    }
 
+    }
 }
diff --git a/lib/Imap/Password.php b/lib/Imap/Password.php
@@ -64,6 +64,10 @@ public function getPassword()
     /**
      */
     public function serialize()
+    {
+        return array_shift($this->__serialize());
+    }
+    public function __serialize(): array 
     {
         global $session;
 
@@ -73,15 +77,21 @@ public function serialize()
 
         $session->set('imp', self::PASSWORD_KEY . '/' . $this->_id, $this->_password, $session::ENCRYPT);
 
-        return $this->_id;
+        return
+        [
+            $this->_id
+        ];        
     }
-
     /**
      * @throws RuntimeException
      */
     public function unserialize($data)
     {
-        $this->_id = $data;
+        $this->__unserialize([$data]);
+    }
+    public function __unserialize(array $data): void 
+    {
+        $this->_id = $data[0];
 
         $password = $GLOBALS['session']->get(
             'imp',
@@ -94,6 +104,6 @@ public function unserialize($data)
             );
         }
         $this->_password = $password;
-    }
 
+    }
 }