Merge branch 'ChristophWurst-fix/php8.1-tentative-return-type-horde'

horde · Oct 22, 2022 · d8f31a1 · d8f31a1
2 parents 0e1173f + 2ae7fd1
commit d8f31a1
Show file tree

Hide file tree

Showing 19 changed files with 80 additions and 5 deletions.
diff --git a/lib/Horde/Imap/Client/Base.php b/lib/Horde/Imap/Client/Base.php
@@ -232,7 +232,7 @@ abstract class Horde_Imap_Client_Base
      *            DEFAULT: 30 seconds
      * - username: (string) [REQUIRED] The username.
      * - authusername (string) The username used for SASL authentication.
-     * 	 If specified this is the user name whose password is used 
+     * 	 If specified this is the user name whose password is used
      * 	 (e.g. administrator).
      * 	 Only valid for RFC 2595/4616 - PLAIN SASL mechanism.
      * 	 DEFAULT: the same value provided in the username parameter.
@@ -346,6 +346,7 @@ public function __clone()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function update(SplSubject $subject)
     {
         if (($subject instanceof Horde_Imap_Client_Data_Capability) ||

diff --git a/lib/Horde/Imap/Client/Base/Alerts.php b/lib/Horde/Imap/Client/Base/Alerts.php
@@ -73,6 +73,7 @@ public function getLast()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function attach(SplObserver $observer)
     {
         $this->detach($observer);
@@ -81,6 +82,7 @@ public function attach(SplObserver $observer)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function detach(SplObserver $observer)
     {
         if (($key = array_search($observer, $this->_observers, true)) !== false) {
@@ -92,6 +94,7 @@ public function detach(SplObserver $observer)
      * Notification is triggered internally whenever the object's internal
      * data storage is altered.
      */
+    #[ReturnTypeWillChange]
     public function notify()
     {
         foreach ($this->_observers as $val) {

diff --git a/lib/Horde/Imap/Client/Data/Acl.php b/lib/Horde/Imap/Client/Data/Acl.php
@@ -100,20 +100,23 @@ protected function _normalize()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this[$offset];
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return in_array($offset, $this->_rights);
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         if ($value) {
@@ -133,13 +136,15 @@ public function offsetSet($offset, $value)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->_rights = array_values(array_diff($this->_rights, array($offset)));
     }
 
     /* IteratorAggregate method. */
 
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->_rights);

diff --git a/lib/Horde/Imap/Client/Data/AclRights.php b/lib/Horde/Imap/Client/Data/AclRights.php
@@ -94,13 +94,15 @@ protected function _normalize()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return (bool)$this[$offset];
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (isset($this->_optional[$offset])) {
@@ -116,6 +118,7 @@ public function offsetGet($offset)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->_optional[$offset] = $value;
@@ -124,6 +127,7 @@ public function offsetSet($offset, $value)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->_optional[$offset]);
@@ -140,6 +144,7 @@ public function offsetUnset($offset)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $val = current($this->_required);
@@ -150,6 +155,7 @@ public function current()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         $key = key($this->_required);
@@ -160,6 +166,7 @@ public function key()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         if (key($this->_required) === null) {
@@ -171,6 +178,7 @@ public function next()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->_required);
@@ -179,6 +187,7 @@ public function rewind()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return ((key($this->_required) !== null) ||

diff --git a/lib/Horde/Imap/Client/Data/Capability.php b/lib/Horde/Imap/Client/Data/Capability.php
@@ -169,6 +169,7 @@ public function toArray()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function attach(SplObserver $observer)
     {
         $this->detach($observer);
@@ -177,6 +178,7 @@ public function attach(SplObserver $observer)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function detach(SplObserver $observer)
     {
         if (($key = array_search($observer, $this->_observers, true)) !== false) {
@@ -188,6 +190,7 @@ public function detach(SplObserver $observer)
      * Notification is triggered internally whenever the object's internal
      * data storage is altered.
      */
+    #[ReturnTypeWillChange]
     public function notify()
     {
         foreach ($this->_observers as $val) {

diff --git a/lib/Horde/Imap/Client/Data/Fetch.php b/lib/Horde/Imap/Client/Data/Fetch.php
@@ -618,14 +618,19 @@ protected function _getHeaders($id, $format, $key)
 
                 case Horde_Imap_Client::FETCH_HEADERTEXT:
                 case Horde_Imap_Client::FETCH_MIMEHEADER:
-                    return Horde_Mime_Headers::parseHeaders($this->_data[$key][$id]);
+                    $hdrs = $this->_data[$key][$id];
+                    break;
                 }
             } else {
                 $hdrs = $this->_getHeaders($id, self::HEADER_STREAM, $key);
-                $parsed = Horde_Mime_Headers::parseHeaders($hdrs);
-                fclose($hdrs);
-                return $parsed;
             }
+
+            $parsed = Horde_Mime_Headers::parseHeaders($hdrs);
+			if (is_resource($hdrs)) {
+				// Close the temporary stream
+				fclose($hdrs);
+			}
+			return $parsed;
         }
 
         if (!isset($this->_data[$key][$id])) {

diff --git a/lib/Horde/Imap/Client/Data/Format/Filter/Quote.php b/lib/Horde/Imap/Client/Data/Format/Filter/Quote.php
@@ -31,6 +31,7 @@ class Horde_Imap_Client_Data_Format_Filter_Quote extends php_user_filter
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function onCreate()
     {
         $this->_prepend = false;
@@ -39,6 +40,7 @@ public function onCreate()
     /**
      * @see stream_filter_register()
      */
+    #[ReturnTypeWillChange]
     public function filter($in, $out, &$consumed, $closing)
     {
         if (!$this->_prepend) {

diff --git a/lib/Horde/Imap/Client/Data/Format/Filter/String.php b/lib/Horde/Imap/Client/Data/Format/Filter/String.php
@@ -33,6 +33,7 @@ class Horde_Imap_Client_Data_Format_Filter_String extends php_user_filter
     /**
      * @see stream_filter_register()
      */
+    #[ReturnTypeWillChange]
     public function onCreate()
     {
         $this->params->binary = false;
@@ -47,6 +48,7 @@ public function onCreate()
     /**
      * @see stream_filter_register()
      */
+    #[ReturnTypeWillChange]
     public function filter($in, $out, &$consumed, $closing)
     {
         $p = $this->params;

diff --git a/lib/Horde/Imap/Client/Data/Format/List.php b/lib/Horde/Imap/Client/Data/Format/List.php
@@ -88,6 +88,7 @@ public function __toString()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->_data);
@@ -98,6 +99,7 @@ public function count()
     /**
      * Iterator loops through the data elements contained in this list.
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return new ArrayIterator($this->_data);

diff --git a/lib/Horde/Imap/Client/Data/SearchCharset.php b/lib/Horde/Imap/Client/Data/SearchCharset.php
@@ -133,6 +133,7 @@ public function setValid($charset, $valid = true)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function attach(SplObserver $observer)
     {
         $this->detach($observer);
@@ -141,6 +142,7 @@ public function attach(SplObserver $observer)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function detach(SplObserver $observer)
     {
         if (($key = array_search($observer, $this->_observers, true)) !== false) {
@@ -152,6 +154,7 @@ public function detach(SplObserver $observer)
      * Notification is triggered internally whenever the object's internal
      * data storage is altered.
      */
+    #[ReturnTypeWillChange]
     public function notify()
     {
         foreach ($this->_observers as $val) {

diff --git a/lib/Horde/Imap/Client/Data/Thread.php b/lib/Horde/Imap/Client/Data/Thread.php
@@ -171,6 +171,7 @@ public function getThreads()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->_getAllIndices());

diff --git a/lib/Horde/Imap/Client/Fetch/Query.php b/lib/Horde/Imap/Client/Fetch/Query.php
@@ -302,13 +302,15 @@ public function hash()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->_data[$offset]);
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return isset($this->_data[$offset])
@@ -318,13 +320,15 @@ public function offsetGet($offset)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->_data[$offset] = $value;
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->_data[$offset]);
@@ -334,6 +338,7 @@ public function offsetUnset($offset)
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->_data);
@@ -343,6 +348,7 @@ public function count()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $opts = current($this->_data);
@@ -354,27 +360,31 @@ public function current()
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return key($this->_data);
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         next($this->_data);
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         reset($this->_data);
     }
 
     /**
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return !is_null($this->key());