Fixes to launch Magento with PHP 8.1

Author: karyna-t

library/Zend/Db/Adapter/Abstract.php

@@ -928,7 +928,8 @@ public function quote($value, $type = null)
     public function quoteInto($text, $value, $type = null, $count = null)
     {
         if ($count === null) {
-            return str_replace('?', $this->quote($value, $type) ?? '', $text);
+            $quote = $this->quote($value, $type) ?? '""';
+            return str_replace('?', $quote, $text);
         } else {
             return implode($this->quote($value, $type), explode('?', $text, $count + 1));
         }

library/Zend/Db/Adapter/Pdo/Abstract.php

@@ -293,7 +293,7 @@ protected function _quote($value)
             return $value;
         }
         $this->_connect();
-        return $this->_connection->quote($value);
+        return $this->_connection->quote($value ?? '');
     }
 
     /**

library/Zend/Db/Statement/Pdo.php

@@ -263,6 +263,7 @@ public function fetch($style = null, $cursor = PDO::FETCH_ORI_NEXT, $offset = 0)
      *
      * @return IteratorIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new IteratorIterator($this->_stmt);

library/Zend/Http/Response.php

@@ -258,9 +258,10 @@ public function isRedirect()
     public function getBody()
     {
         $body = '';
+        $transferEncoding = $this->getHeader('transfer-encoding');
 
         // Decode the body if it was transfer-encoded
-        switch (strtolower($this->getHeader('transfer-encoding'))) {
+        switch ($transferEncoding ? strtolower($transferEncoding) : '') {
 
             // Handle chunked body
             case 'chunked':
@@ -274,8 +275,10 @@ public function getBody()
                 break;
         }
 
+        $contentEncoding = $this->getHeader('content-encoding');
+
         // Decode any content-encoding (gzip or deflate) if needed
-        switch (strtolower($this->getHeader('content-encoding'))) {
+        switch ($contentEncoding ? strtolower($contentEncoding) : '') {
 
             // Handle gzip encoding
             case 'gzip':
@@ -603,7 +606,7 @@ public static function decodeChunkedBody($body)
         // If mbstring overloads substr and strlen functions, we have to
         // override it's internal encoding
         if (function_exists('mb_internal_encoding') &&
-           ((int) ini_get('mbstring.func_overload')) & 2) {
+            ((int) ini_get('mbstring.func_overload')) & 2) {
 
             $mbIntEnc = mb_internal_encoding();
             mb_internal_encoding('ASCII');

library/Zend/Pdf/RecursivelyIteratableObjectsContainer.php

@@ -29,17 +29,85 @@
  */
 class Zend_Pdf_RecursivelyIteratableObjectsContainer implements RecursiveIterator, Countable
 {
-    protected $_objects = array();
+    protected $_objects = [];
 
-    public function __construct(array $objects) { $this->_objects = $objects; }
+    /**
+     * @param array $objects
+     */
+    public function __construct(array $objects)
+    {
+        $this->_objects = $objects;
+    }
 
-    public function current()      { return current($this->_objects);            }
-    public function key()          { return key($this->_objects);                }
-    public function next()         { return next($this->_objects);               }
-    public function rewind()       { return reset($this->_objects);              }
-    public function valid()        { return current($this->_objects) !== false;  }
-    public function getChildren()  { return current($this->_objects);            }
-    public function hasChildren()  { return count($this->_objects) > 0;          }
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function current()
+    {
+        return current($this->_objects);
+    }
 
-    public function count() { return count($this->_objects); }
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function key()
+    {
+        return key($this->_objects);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function next()
+    {
+        return next($this->_objects);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function rewind()
+    {
+        return reset($this->_objects);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function valid()
+    {
+        return current($this->_objects) !== false;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function getChildren()
+    {
+        return current($this->_objects);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function hasChildren()
+    {
+        return count($this->_objects) > 0;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    #[\ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->_objects);
+    }
 }

library/Zend/Registry.php

@@ -201,9 +201,9 @@ public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS)
      *
      * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($index)
     {
         return array_key_exists($index, $this);
     }
-
 }