fix: deprecated nullish value as string on PHP8.1

M2-97 - Fixed some "Passing null to parameter of type string is deprecated" problems for PHP 8.1 compatibility (#27)
ratepay · May 6, 2022 · 77e6b3a · 77e6b3a
1 parent bb2d82d
commit 77e6b3a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Model/Request/SubModel/AbstractModel.php b/src/Model/Request/SubModel/AbstractModel.php
@@ -200,7 +200,7 @@ public function toArray()
                     }
                 } else {
                     if (key_exists('cdata', $fieldSettings)) {                                     // If value should be encapsulated inside CDATA tag
-                        if (function_exists('mb_detect_encoding') && !mb_detect_encoding($fieldSettings['value'], 'UTF-8', true)) { // Check only if php mdstring extension is loaded
+                        if (function_exists('mb_detect_encoding') && is_string($fieldSettings['value']) && !mb_detect_encoding($fieldSettings['value'], 'UTF-8', true)) { // Check only if php mdstring extension is loaded
                             throw new ModelException("Value of '" . $fieldName . "' has to be encoded in UTF-8");
                         }
                     }

diff --git a/src/Service/SimpleXmlExtended.php b/src/Service/SimpleXmlExtended.php
@@ -41,6 +41,10 @@ public function addCDataChild($sName, $sValue)
      */
     private function removeSpecialChars($str)
     {
+        if (!is_string($str)) {
+            return '';
+        }
+
         $search = ['–', '´', '‹', '›', '‘', '’', '‚', '“', '”', '„', '‟', '•', '‒', '―', '—', '™', '¼', '½', '¾'];
         $replace = ['-', "'", '<', '>', "'", "'", ',', '"', '"', '"', '"', '-', '-', '-', '-', 'TM', '1/4', '1/2', '3/4'];