Merge branch 'main' into zend-measure

# Conflicts:
#	composer.lock

Author: sreichel

.phpstan.dist.baseline.neon

@@ -162,12 +162,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Review/Grid/Filter/Type.php
 
-		-
-			rawMessage: 'Call to method getIsOldCustomer() on an unknown class Mage_Adminhtml_Model_Quote.'
-			identifier: class.notFound
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php
-
 		-
 			rawMessage: 'Call to an undefined method Mage_Shipping_Model_Carrier_Abstract::isGirthAllowed().'
 			identifier: method.notFound
@@ -2172,12 +2166,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
 
-		-
-			rawMessage: 'Call to an undefined method Mage_Eav_Model_Resource_Entity_Attribute_Group::deleteGroups().'
-			identifier: method.notFound
-			count: 1
-			path: app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php
-
 		-
 			rawMessage: 'Call to an undefined method Mage_Eav_Model_Entity_Collection_Abstract::getStoreId().'
 			identifier: method.notFound
@@ -2346,12 +2334,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Index/Model/Lock.php
 
-		-
-			rawMessage: 'Call to function is_array() with '''' will always evaluate to false.'
-			identifier: function.impossibleType
-			count: 1
-			path: app/code/core/Mage/Index/Model/Resource/Event.php
-
 		-
 			rawMessage: 'Parameter #1 $adapter of method Varien_Db_Adapter_Interface::setCacheAdapter() expects Zend_Cache_Backend_Interface, Zend_Cache_Core given.'
 			identifier: argument.type
@@ -2394,12 +2376,6 @@ parameters:
 			count: 2
 			path: app/code/core/Mage/Log/Model/Resource/Log.php
 
-		-
-			rawMessage: 'Call to function is_null() with bool will always evaluate to false.'
-			identifier: function.impossibleType
-			count: 1
-			path: app/code/core/Mage/Newsletter/Model/Subscriber.php
-
 		-
 			rawMessage: 'Call to function is_null() with Mage_Newsletter_Model_Queue will always evaluate to false.'
 			identifier: function.impossibleType

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Newsletter.php

@@ -41,10 +41,6 @@ public function getHeaderCssClass()
      */
     protected function _toHtml()
     {
-        if (!Mage::getSingleton('adminhtml/quote')->getIsOldCustomer()) {
-            return parent::_toHtml();
-        }
-
         return '';
     }
 }

app/code/core/Mage/Eav/Model/Entity/Attribute/Group.php

@@ -41,14 +41,4 @@ public function itemExists()
     {
         return $this->_getResource()->itemExists($this);
     }
-
-    /**
-     * Delete groups
-     *
-     * @return $this
-     */
-    public function deleteGroups()
-    {
-        return $this->_getResource()->deleteGroups($this);
-    }
 }

app/code/core/Mage/Index/Model/Resource/Event.php

@@ -99,7 +99,7 @@ public function updateProcessEvents($process, $status = Mage_Index_Model_Process
             $whereCondition = ['process_id = ?' => $process->getId()];
         } elseif (is_array($process) && !empty($process)) {
             $whereCondition = ['process_id IN (?)' => $process];
-        } elseif (!is_array($whereCondition)) {
+        } elseif (!empty($process)) {
             $whereCondition = ['process_id = ?' => $process];
         }
 

app/code/core/Mage/Install/etc/install.xml

@@ -75,8 +75,10 @@
                     <openssl/>
                     <mcrypt/>
                 </mcrypt>
+                <mysqli/>
                 <pdo/>
                 <pdo_mysql/>
+                <posix/>
                 <simplexml/>
                 <soap/>
                 <spl/>

app/code/core/Mage/Newsletter/Model/Subscriber.php

@@ -469,7 +469,7 @@ public function subscribeCustomer($customer)
 
         $this->save();
         $sendSubscription = $customer->getData('sendSubscription') || $sendInformationEmail;
-        if (is_null($sendSubscription) xor $sendSubscription) {
+        if ($sendSubscription) {
             if ($this->getIsStatusChanged() && $status == self::STATUS_UNSUBSCRIBED) {
                 $this->sendUnsubscriptionEmail();
             } elseif ($this->getIsStatusChanged() && $status == self::STATUS_SUBSCRIBED) {

composer.json

@@ -20,11 +20,13 @@
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-mbstring": "*",
+        "ext-mysqli": "*",
         "ext-pdo": "*",
         "ext-pdo_mysql": "*",
         "ext-posix": "*",
         "ext-simplexml": "*",
         "ext-soap": "*",
+        "ext-spl": "*",
         "ext-zlib": "*",
         "composer-runtime-api": "^2",
         "colinmollenhour/cache-backend-redis": "^1.14",