fixing errors and warnings for php 8.1

- substr(): Passing null to parameter #1 ($string) of type string is deprecated - strtolower(): Passing null to parameter #1 ($string) of type string is deprecated - strlen(): Passing null to parameter #1 ($string) of type string is deprecated - trim(): Passing null to parameter #1 ($string) of type string is deprecated - str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated - strstr(): Passing null to parameter #1 ($haystack) of type string is deprecated - http_build_query(): Passing null to parameter #2 ($numeric_prefix) of type string is deprecated - current(): Calling current() on an object is deprecated - preg_match(): Passing null to parameter #2 ($subject) of type string is deprecated
zf1s · Nov 29, 2022 · dbe52f7 · dbe52f7
1 parent 0de1e3b
commit dbe52f7
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/packages/zend-barcode/library/Zend/Barcode/Object/ObjectAbstract.php b/packages/zend-barcode/library/Zend/Barcode/Object/ObjectAbstract.php
@@ -616,7 +616,7 @@ public function setText($value)
      */
     public function getText()
     {
-        $text = $this->_text;
+        $text = (string) $this->_text;
         if ($this->_withChecksum) {
             $text .= $this->getChecksum($this->_text);
         }
@@ -986,7 +986,7 @@ public function checkParams()
     protected function _checkText($value = null)
     {
         if ($value === null) {
-            $value = $this->_text;
+            $value = (string) $this->_text;
         }
         if (!strlen($value)) {
             // require_once 'Zend/Barcode/Object/Exception.php';

diff --git a/packages/zend-codegenerator/library/Zend/CodeGenerator/Php/File.php b/packages/zend-codegenerator/library/Zend/CodeGenerator/Php/File.php
@@ -351,7 +351,7 @@ public function setBody($body)
      */
     public function getBody()
     {
-        return $this->_body;
+        return is_string($this->_body) ? $this->_body : '';
     }
 
     /**

diff --git a/packages/zend-controller/library/Zend/Controller/Dispatcher/Abstract.php b/packages/zend-controller/library/Zend/Controller/Dispatcher/Abstract.php
@@ -231,7 +231,7 @@ protected function _formatName($unformatted, $isAction = false)
     {
         // preserve directories
         if (!$isAction) {
-            $segments = explode($this->getPathDelimiter(), $unformatted);
+            $segments = explode($this->getPathDelimiter(), (string) $unformatted);
         } else {
             $segments = (array) $unformatted;
         }

diff --git a/packages/zend-controller/library/Zend/Controller/Request/Http.php b/packages/zend-controller/library/Zend/Controller/Request/Http.php
@@ -503,7 +503,7 @@ public function setBaseUrl($baseUrl = null)
             }
 
             // Does the baseUrl have anything in common with the request_uri?
-            $requestUri = $this->getRequestUri();
+            $requestUri = (string) $this->getRequestUri();
 
             if (0 === strpos($requestUri, $baseUrl)) {
                 // full $baseUrl matches

diff --git a/packages/zend-controller/library/Zend/Controller/Router/Rewrite.php b/packages/zend-controller/library/Zend/Controller/Router/Rewrite.php
@@ -488,7 +488,7 @@ public function assemble($userParams, $name = null, $reset = false, $encode = tr
         $url   = $route->assemble($params, $reset, $encode);
 
         if (!preg_match('|^[a-z]+://|', $url)) {
-            $url = rtrim($this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url;
+            $url = rtrim((string) $this->getFrontController()->getBaseUrl(), self::URI_DELIMITER) . self::URI_DELIMITER . $url;
         }
 
         return $url;

diff --git a/packages/zend-controller/library/Zend/Controller/Router/Route.php b/packages/zend-controller/library/Zend/Controller/Router/Route.php
@@ -272,11 +272,11 @@ public function match($path, $partial = false)
                 // Translate value if required
                 $part = $this->_parts[$pos];
                 if ($this->_isTranslated
-                    && (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@'
+                    && ($part !== null && substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@'
                         && $name === null)
                     || $name !== null && in_array($name, $this->_translatable)
                 ) {
-                    if (substr($part, 0, 1) === '@') {
+                    if ($part !== null && substr($part, 0, 1) === '@') {
                         $part = substr($part, 1);
                     }
 
@@ -285,7 +285,7 @@ public function match($path, $partial = false)
                     }
                 }
 
-                if (substr($part, 0, 2) === '@@') {
+                if ($part !== null && substr($part, 0, 2) === '@@') {
                     $part = substr($part, 1);
                 }
 

diff --git a/packages/zend-date/library/Zend/Date.php b/packages/zend-date/library/Zend/Date.php
@@ -3004,7 +3004,7 @@ private function _date($calc, $date, $format, $locale)
                     }
 
                     $parsed = Zend_Locale_Format::getDate($date, array('date_format' => $format, 'locale' => $locale, 'format_type' => 'iso'));
-                    if ((strpos(strtoupper($format), 'YY') !== false) and (strpos(strtoupper($format), 'YYYY') === false)) {
+                    if (is_string($format) && (strpos(strtoupper($format), 'YY') !== false) and (strpos(strtoupper($format), 'YYYY') === false)) {
                         $parsed['year'] = self::getFullYear($parsed['year']);
                     }
                 } catch (Zend_Locale_Exception $e) {

diff --git a/packages/zend-form/library/Zend/Form.php b/packages/zend-form/library/Zend/Form.php
@@ -911,7 +911,7 @@ public function getId()
         $id = $this->getFullyQualifiedName();
 
         // Bail early if no array notation detected
-        if (!strstr($id, '[')) {
+        if ($id === null || !strstr($id, '[')) {
             return $id;
         }
 

diff --git a/packages/zend-form/library/Zend/Form/Decorator/Description.php b/packages/zend-form/library/Zend/Form/Decorator/Description.php
@@ -159,7 +159,7 @@ public function render($content)
         }
 
         $description = $element->getDescription();
-        $description = trim($description);
+        $description = is_string($description) ? trim($description) : '';
 
         if (!empty($description) && (null !== ($translator = $element->getTranslator()))) {
             $description = $translator->translate($description);

diff --git a/packages/zend-form/library/Zend/Form/Decorator/Label.php b/packages/zend-form/library/Zend/Form/Decorator/Label.php
@@ -302,7 +302,7 @@ public function getLabel()
         }
 
         $label = $element->getLabel();
-        $label = trim($label);
+        $label = is_string($label) ? trim($label) : '';
 
         if (empty($label)) {
             return '';

diff --git a/packages/zend-http/library/Zend/Http/Client.php b/packages/zend-http/library/Zend/Http/Client.php
@@ -1038,7 +1038,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);
                 }

diff --git a/packages/zend-http/library/Zend/Http/Response.php b/packages/zend-http/library/Zend/Http/Response.php
@@ -260,7 +260,7 @@ public function getBody()
         $body = '';
 
         // Decode the body if it was transfer-encoded
-        switch (strtolower($this->getHeader('transfer-encoding'))) {
+        switch (strtolower((string) $this->getHeader('transfer-encoding'))) {
 
             // Handle chunked body
             case 'chunked':
@@ -275,7 +275,7 @@ public function getBody()
         }
 
         // Decode any content-encoding (gzip or deflate) if needed
-        switch (strtolower($this->getHeader('content-encoding'))) {
+        switch (strtolower((string) $this->getHeader('content-encoding'))) {
 
             // Handle gzip encoding
             case 'gzip':

diff --git a/packages/zend-locale/library/Zend/Locale/Data.php b/packages/zend-locale/library/Zend/Locale/Data.php
@@ -333,14 +333,14 @@ public static function getList($locale, $path, $value = false)
             $val = implode('_' , $value);
         }
 
-        $val = urlencode($val);
+        $val = urlencode((string) $val);
         $id  = self::_filterCacheId('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);
         }
 
         $temp = array();
-        switch(strtolower($path)) {
+        switch(strtolower((string) $path)) {
             case 'language':
                 $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language', 'type');
                 break;
@@ -982,13 +982,13 @@ public static function getContent($locale, $path, $value = false)
         if (is_array($value)) {
             $val = implode('_' , $value);
         }
-        $val = urlencode($val);
+        $val = urlencode((string) $val);
         $id  = self::_filterCacheId('Zend_LocaleC_' . $locale . '_' . $path . '_' . $val);
         if (!self::$_cacheDisabled && ($result = self::$_cache->load($id))) {
             return unserialize($result);
         }
 
-        switch(strtolower($path)) {
+        switch(strtolower((string) $path)) {
             case 'language':
                 $temp = self::_getFile($locale, '/ldml/localeDisplayNames/languages/language[@type=\'' . $value . '\']', 'type');
                 break;

diff --git a/packages/zend-translate/library/Zend/Translate/Adapter.php b/packages/zend-translate/library/Zend/Translate/Adapter.php
@@ -831,7 +831,7 @@ public function plural($singular, $plural, $number, $locale = null)
      */
     protected function _log($message, $locale) {
         if ($this->_options['logUntranslated']) {
-            $message = str_replace('%message%', $message, $this->_options['logMessage']);
+            $message = str_replace('%message%', (string) $message, $this->_options['logMessage']);
             $message = str_replace('%locale%', $locale, $message);
             if ($this->_options['log']) {
                 $this->_options['log']->log($message, $this->_options['logPriority']);

diff --git a/tests/Zend/CodeGenerator/Php/ClassTest.php b/tests/Zend/CodeGenerator/Php/ClassTest.php
@@ -85,7 +85,7 @@ public function testPropertyAccessors()
 
         $properties = $codeGenClass->getProperties();
         $this->assertEquals(count($properties), 2);
-        $this->isInstanceOf(current($properties), 'Zend_CodeGenerator_Php_Property');
+        $this->isInstanceOf($properties->getIterator()->current(), 'Zend_CodeGenerator_Php_Property');
 
         $property = $codeGenClass->getProperty('propTwo');
         $this->isInstanceOf($property, 'Zend_CodeGenerator_Php_Property');
@@ -124,7 +124,7 @@ public function testMethodAccessors()
 
         $methods = $codeGenClass->getMethods();
         $this->assertEquals(count($methods), 2);
-        $this->isInstanceOf(current($methods), 'Zend_CodeGenerator_Php_Method');
+        $this->isInstanceOf($methods->getIterator()->current(), 'Zend_CodeGenerator_Php_Method');
 
         $method = $codeGenClass->getMethod('methodOne');
         $this->isInstanceOf($method, 'Zend_CodeGenerator_Php_Method');
-Original file line number
+Diff line change
@@ Expand Up / @@ -351,7 +351,7 @@ public function setBody($body) @@
          */
         public function getBody()
         {
-            return $this->_body;
+            return is_string($this->_body) ? $this->_body : '';
         }
         /**
@@ Expand Down @@