Merge pull request #3 from magento-trigger/php8.1-compatibility-fixes

Fixes for PHP 8.1 compatibility

Author: fascinosum

library/Zend/Db/Adapter/Abstract.php

@@ -875,11 +875,12 @@ public function quote($value, $type = null)
             return implode(', ', $value);
         }
 
+        $value = $value ?? '';
         if ($type !== null && array_key_exists($type = strtoupper($type), $this->_numericDataTypes)) {
             $quotedValue = '0';
             switch ($this->_numericDataTypes[$type]) {
                 case Zend_Db::INT_TYPE: // 32-bit integer
-                    $quotedValue = (string) intval($value);
+                    $quotedValue = (string) ((int) $value);
                     break;
                 case Zend_Db::BIGINT_TYPE: // 64-bit integer
                     // ANSI SQL-style hex literals (e.g. x'[\dA-F]+')

library/Zend/Db/Select.php

@@ -819,7 +819,7 @@ protected function _join($type, $name, $cond, $cols, $schema = null)
         }
 
         // Schema from table name overrides schema argument
-        if (!is_object($tableName) && false !== strpos($tableName, '.')) {
+        if ($tableName && !is_object($tableName) && (strpos($tableName, '.') !== false)) {
             list($schema, $tableName) = explode('.', $tableName);
         }
 

library/Zend/Db/Statement.php

@@ -64,35 +64,35 @@ abstract class Zend_Db_Statement implements Zend_Db_Statement_Interface
      *
      * @var array
      */
-    protected $_attribute = array();
+    protected $_attribute = [];
 
     /**
      * Column result bindings.
      *
      * @var array
      */
-    protected $_bindColumn = array();
+    protected $_bindColumn = [];
 
     /**
      * Query parameter bindings; covers bindParam() and bindValue().
      *
      * @var array
      */
-    protected $_bindParam = array();
+    protected $_bindParam = [];
 
     /**
      * SQL string split into an array at placeholders.
      *
      * @var array
      */
-    protected $_sqlSplit = array();
+    protected $_sqlSplit = [];
 
     /**
      * Parameter placeholders in the SQL string by position in the split array.
      *
      * @var array
      */
-    protected $_sqlParam = array();
+    protected $_sqlParam = [];
 
     /**
      * @var Zend_Db_Profiler_Query
@@ -134,14 +134,19 @@ protected function _prepare($sql)
      */
     protected function _parseParameters($sql)
     {
-        $sql = $this->_stripQuoted($sql);
-
-        // split into text and params
-        $this->_sqlSplit = preg_split('/(\?|\:[a-zA-Z0-9_]+)/',
-            $sql, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+        $this->_sqlSplit = [];
+        if ($sql !== null) {
+            $sql = $this->_stripQuoted($sql);
+            $this->_sqlSplit = preg_split(
+                '/(\?|\:[a-zA-Z0-9_]+)/',
+                $sql,
+                -1,
+                PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY
+            );
+        }
 
         // map params
-        $this->_sqlParam = array();
+        $this->_sqlParam = [];
         foreach ($this->_sqlSplit as $key => $val) {
             if ($val == '?') {
                 if ($this->_adapter->supportsParameters('positional') === false) {
@@ -164,7 +169,7 @@ protected function _parseParameters($sql)
         }
 
         // set up for binding
-        $this->_bindParam = array();
+        $this->_bindParam = [];
     }
 
     /**
@@ -176,7 +181,6 @@ protected function _parseParameters($sql)
      */
     protected function _stripQuoted($sql)
     {
-
         // get the character for value quoting
         // this should be '
         $q = $this->_adapter->quote('a');

library/Zend/Db/Statement/Pdo.php

@@ -251,7 +251,7 @@ public function fetch($style = null, $cursor = null, $offset = null)
             $style = $this->_fetchMode;
         }
         try {
-            return $this->_stmt->fetch($style, $cursor, $offset);
+            return $this->_stmt->fetch($style, $cursor ?? PDO::FETCH_ORI_NEXT, $offset ?? 0);
         } catch (PDOException $e) {
             #require_once 'Zend/Db/Statement/Exception.php';
             throw new Zend_Db_Statement_Exception($e->getMessage(), $e->getCode(), $e);
@@ -263,6 +263,7 @@ public function fetch($style = null, $cursor = null, $offset = null)
      *
      * @return IteratorIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return new IteratorIterator($this->_stmt);

library/Zend/Http/Client.php

@@ -1041,7 +1041,7 @@ public function request($method = null)
                    if (! empty($query)) {
                        $query .= '&';
                    }
-                $query .= http_build_query($this->paramsGet, null, '&');
+                $query .= http_build_query($this->paramsGet, '', '&');
                 if ($this->config['rfc3986_strict']) {
                     $query = str_replace('+', '%20', $query);
                 }

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 !== null) ? 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 !== null) ? 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/Locale/Data.php

@@ -982,7 +982,7 @@ public static function getContent($locale, $path, $value = false)
         if (is_array($value)) {
             $val = implode('_' , $value);
         }
-        $val = urlencode($val);
+        $val = ($val !== null) ? urlencode($val) : '';
         $id  = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);

library/Zend/Oauth/Http/Utility.php

@@ -210,8 +210,7 @@ public function generateTimestamp()
      */
     public static function urlEncode($value)
     {
-        $encoded = rawurlencode($value);
-        $encoded = str_replace('%7E', '~', $encoded);
-        return $encoded;
+        return ($value !== null) ?
+            str_replace('%7E', '~', rawurlencode($value)) : '';
     }
 }

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);
     }
-
 }

library/Zend/Validate/File/Extension.php

@@ -121,9 +121,7 @@ public function setCase($case)
      */
     public function getExtension()
     {
-        $extension = explode(',', $this->_extension);
-
-        return $extension;
+        return explode(',', $this->_extension);
     }
 
     /**
@@ -134,7 +132,7 @@ public function getExtension()
      */
     public function setExtension($extension)
     {
-        $this->_extension = null;
+        $this->_extension = '';
         $this->addExtension($extension);
         return $this;
     }