Fixed null deprecation in UnserializeArray.php (#4394)

* Fixed issue #4352 null deprecation in UnserializeArray.php * Added @ to suppress warnings and notices * Suppress PHPMD ErrorControlOperator * Fix suppress PHPMD ErrorControlOperator * Update app/code/core/Mage/Core/Helper/UnserializeArray.php phpstan fix * Update app/code/core/Mage/Core/Helper/UnserializeArray.php Co-authored-by: Sven Reichel <github-sr@hotmail.com> * updated test result * sonar-1 --------- Co-authored-by: Sven Reichel <github-sr@hotmail.com>
OpenMage · Feb 2, 2025 · 31322c4 · 31322c4
1 parent e5feff0
commit 31322c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php
@@ -26,11 +26,13 @@ class Mage_Core_Helper_UnserializeArray
      * @param string $str
      * @return array
      * @throws Exception
+     * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
     public function unserialize($str)
     {
         try {
-            $result = unserialize($str, ['allowed_classes' => false]);
+            $str = is_null($str) ? '' : $str;
+            $result = @unserialize($str, ['allowed_classes' => false]);
             if ($result === false && $str !== serialize(false)) {
                 throw new Exception('Error unserializing data.');
             }

diff --git a/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php b/tests/unit/Mage/Core/Helper/UnserializeArrayTest.php
@@ -50,16 +50,18 @@ public function testUnserialize($expectedTesult, $string): void
 
     public function provideUnserialize(): Generator
     {
+        $errorMessage = 'Error unserializing data.';
+
         yield 'null' => [
-            'Error unserializing data.',
+            $errorMessage,
             null,
         ];
         yield 'empty string' => [
-            'Error unserializing data.',
+            $errorMessage,
             '',
         ];
         yield 'random string' => [
-            'unserialize(): Error at offset 0 of 3 bytes',
+            $errorMessage,
             'abc',
         ];
         yield 'valid' => [