Merge branch 'main' into next

Author: fballiano

app/code/core/Mage/Catalog/Helper/Product/Flat.php

@@ -164,6 +164,20 @@ public function isAddChildData()
         return (int) Mage::getConfig()->getNode(self::XML_NODE_ADD_CHILD_DATA);
     }
 
+    /**
+     * Enable Catalog Product Flat
+     *
+     * @param bool $save
+     */
+    public function enableFlatCollection($save = false)
+    {
+        if ($save) {
+            $this->_forceFlatStatusOld = $this->_forceFlatStatus;
+        }
+
+        $this->_forceFlatStatus = false;
+    }
+
     /**
      * Disable Catalog Product Flat
      *

app/code/core/Mage/Core/Model/Design/Package.php

@@ -56,7 +56,7 @@ class Mage_Core_Model_Design_Package
     /**
      * Package theme
      *
-     * @var string
+     * @var array
      */
     protected $_theme;
 
@@ -242,7 +242,7 @@ public function setTheme()
     {
         switch (func_num_args()) {
             case 1:
-                foreach (['layout', 'template', 'skin', 'locale'] as $type) {
+                foreach (['layout', 'template', 'skin', 'locale', 'default'] as $type) {
                     $this->_theme[$type] = func_get_arg(0);
                 }
                 break;

composer.lock

@@ -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) {

lib/Mage/HTTP/Client/Curl.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) {

lib/Mage/HTTP/Client/Socket.php

@@ -2125,16 +2125,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Design/Package.php
 
-		-
-			message: "#^Cannot assign offset 'layout'\\|'locale'\\|'skin'\\|'template' to string\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/Design/Package.php
-
-		-
-			message: "#^Cannot assign offset string to string\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/Design/Package.php
-
 		-
 			message: "#^Property Mage_Core_Model_Design_Package\\:\\:\\$_store \\(int\\|Mage_Core_Model_Store\\|string\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1

phpstan.dist.baseline.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