Fixed PHPStan error in Mage_HTTP_Client_Socket and Mage_HTTP_Client_C…

…url (OpenMage#3205)
empiricompany · May 15, 2023 · f12eb44 · f12eb44
1 parent 7055d19
commit f12eb44
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php
@@ -264,11 +264,11 @@ public function getCookies()
             if (!$c) {
                 continue;
             }
-            list($key, $val) = explode("=", $values[0]);
-            if (is_null($val)) {
+            list($key, $val) = array_pad(array_map('trim', explode('=', $values[0])), 2, null);
+            if (is_null($val) || !strlen($key)) {
                 continue;
             }
-            $out[trim($key)] = trim($val);
+            $out[$key] = $val;
         }
         return $out;
     }
@@ -290,11 +290,11 @@ public function getCookiesFull()
             if (!$c) {
                 continue;
             }
-            list($key, $val) = explode("=", $values[0]);
-            if (is_null($val)) {
+            list($key, $val) = array_pad(array_map('trim', explode('=', $values[0])), 2, null);
+            if (is_null($val) || !strlen($key)) {
                 continue;
             }
-            $out[trim($key)] = ['value' => trim($val)];
+            $out[$key] = ['value' => $val];
             array_shift($values);
             $c--;
             if (!$c) {

diff --git a/lib/Mage/HTTP/Client/Socket.php b/lib/Mage/HTTP/Client/Socket.php
@@ -303,11 +303,11 @@ public function getCookies()
             if (!$c) {
                 continue;
             }
-            list($key, $val) = explode("=", $values[0]);
-            if (is_null($val)) {
+            list($key, $val) = array_pad(array_map('trim', explode('=', $values[0])), 2, null);
+            if (is_null($val) || !strlen($key)) {
                 continue;
             }
-            $out[trim($key)] = trim($val);
+            $out[$key] = $val;
         }
         return $out;
     }
@@ -329,11 +329,11 @@ public function getCookiesFull()
             if (!$c) {
                 continue;
             }
-            list($key, $val) = explode("=", $values[0]);
-            if (is_null($val)) {
+            list($key, $val) = array_pad(array_map('trim', explode('=', $values[0])), 2, null);
+            if (is_null($val) || !strlen($key)) {
                 continue;
             }
-            $out[trim($key)] = ['value' => trim($val)];
+            $out[$key] = ['value' => $val];
             array_shift($values);
             $c--;
             if (!$c) {

diff --git a/phpstan.dist.issues.neon b/phpstan.dist.issues.neon
@@ -5,9 +5,3 @@ parameters:
     -
       message: "#Call to function is_null\\(\\) with bool will always evaluate to false.$#"
       path: app/code/core/Mage/Newsletter/Model/Subscriber.php
-    -
-      message: "#Call to function is_null\\(\\) with string will always evaluate to false.$#"
-      path: lib/Mage/HTTP/Client/Curl.php
-    -
-      message: "#Call to function is_null\\(\\) with string will always evaluate to false.$#"
-      path: lib/Mage/HTTP/Client/Socket.php