Fixed PHPStan errors after upgrading to 2.1.39 (#554)

Author: fballiano

.phpstan.dist.baseline.neon

@@ -9888,18 +9888,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
 
-		-
-			rawMessage: 'Strict comparison using !== between array<string, mixed> and null will always evaluate to true.'
-			identifier: notIdentical.alwaysTrue
-			count: 2
-			path: app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
-
-		-
-			rawMessage: Unreachable statement - code above always terminates.
-			identifier: deadCode.unreachable
-			count: 1
-			path: app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php
-
 		-
 			rawMessage: 'Parameter #1 $value of method Mage_Sales_Model_Quote_Address::setCollectShippingRates() expects int, true given.'
 			identifier: argument.type
@@ -9912,18 +9900,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php
 
-		-
-			rawMessage: 'Strict comparison using !== between array<string, mixed> and null will always evaluate to true.'
-			identifier: notIdentical.alwaysTrue
-			count: 1
-			path: app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php
-
-		-
-			rawMessage: Unreachable statement - code above always terminates.
-			identifier: deadCode.unreachable
-			count: 1
-			path: app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php
-
 		-
 			rawMessage: 'Method Mage_Checkout_Model_Observer::loadCustomerQuote() has no return type specified.'
 			identifier: missingType.return
@@ -12228,18 +12204,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Customer/Model/Customer/Api/V2.php
 
-		-
-			rawMessage: 'Strict comparison using !== between array<string, mixed> and null will always evaluate to true.'
-			identifier: notIdentical.alwaysTrue
-			count: 1
-			path: app/code/core/Mage/Customer/Model/Customer/Api/V2.php
-
-		-
-			rawMessage: Unreachable statement - code above always terminates.
-			identifier: deadCode.unreachable
-			count: 1
-			path: app/code/core/Mage/Customer/Model/Customer/Api/V2.php
-
 		-
 			rawMessage: Property Mage_Customer_Model_Group::$_taxClassIds has no type specified.
 			identifier: missingType.property

app/code/core/Mage/Adminhtml/Block/System/Email/Template/Grid/Filter/Type.php

@@ -13,7 +13,7 @@
 class Mage_Adminhtml_Block_System_Email_Template_Grid_Filter_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Filter_Select
 {
     protected static $_types = [
-        null                                =>  null,
+        ''                                  =>  null,
         Mage_Core_Model_Template::TYPE_HTML => 'HTML',
         Mage_Core_Model_Template::TYPE_TEXT => 'Text',
     ];

app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php

@@ -160,7 +160,7 @@ public function getPostResources()
         if ($isAll) {
             $resources = [
                 Mage_Api2_Model_Acl_Global_Rule::RESOURCE_ALL => [
-                    null => $allow,
+                    '' => $allow,
                 ],
             ];
         } else {

app/code/core/Mage/Checkout/Model/Cart/Customer/Api/V2.php

@@ -21,10 +21,7 @@ class Mage_Checkout_Model_Cart_Customer_Api_V2 extends Mage_Checkout_Model_Cart_
     #[\Override]
     protected function _prepareCustomerData($data)
     {
-        if (($_data = get_object_vars($data)) !== null) {
-            return parent::_prepareCustomerData($_data);
-        }
-        return [];
+        return parent::_prepareCustomerData(get_object_vars($data));
     }
 
     /**
@@ -39,9 +36,7 @@ protected function _prepareCustomerAddressData($data)
         if (is_array($data)) {
             $dataAddresses = [];
             foreach ($data as $addressItem) {
-                if (($_addressItem = get_object_vars($addressItem)) !== null) {
-                    $dataAddresses[] = $_addressItem;
-                }
+                $dataAddresses[] = get_object_vars($addressItem);
             }
             return parent::_prepareCustomerAddressData($dataAddresses);
         }

app/code/core/Mage/Checkout/Model/Cart/Payment/Api/V2.php

@@ -19,10 +19,6 @@ class Mage_Checkout_Model_Cart_Payment_Api_V2 extends Mage_Checkout_Model_Cart_P
     #[\Override]
     protected function _preparePaymentData($data)
     {
-        if (($_data = get_object_vars($data)) !== null) {
-            return parent::_preparePaymentData($_data);
-        }
-
-        return [];
+        return parent::_preparePaymentData(get_object_vars($data));
     }
 }

app/code/core/Mage/Customer/Model/Customer/Api/V2.php

@@ -22,9 +22,6 @@ class Mage_Customer_Model_Customer_Api_V2 extends Mage_Customer_Model_Customer_A
     #[\Override]
     protected function _prepareData($data)
     {
-        if (($objectVars = get_object_vars($data)) !== null) {
-            return parent::_prepareData($objectVars);
-        }
-        return [];
+        return parent::_prepareData(get_object_vars($data));
     }
 }

app/code/core/Mage/ImportExport/Model/Resource/Import/Data.php

@@ -13,7 +13,7 @@
 class Mage_ImportExport_Model_Resource_Import_Data extends Mage_Core_Model_Resource_Db_Abstract implements IteratorAggregate
 {
     /**
-     * @var Iterator|null
+     * @var Iterator<int, array>|null
      */
     protected $_iterator = null;
 
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Retrieve an external iterator
      *
-     * @return Iterator
+     * @return Iterator<int, array>
      */
     #[\ReturnTypeWillChange]
     #[\Override]

app/code/core/Mage/Page/Block/Html/Breadcrumbs.php

@@ -45,7 +45,7 @@ public function __construct()
     /**
      * @param string $crumbName
      * @param array $crumbInfo
-     * @param string|bool $after
+     * @param string|false $after
      * @return $this
      */
     public function addCrumb($crumbName, $crumbInfo, $after = false)
@@ -65,7 +65,7 @@ public function addCrumb($crumbName, $crumbInfo, $after = false)
     /**
      * @param string $crumbName
      * @param array $crumbInfo
-     * @param bool $before
+     * @param string|false $before
      */
     public function addCrumbBefore($crumbName, $crumbInfo, $before = false)
     {

app/code/core/Mage/Payment/Model/Restriction/Rule/Condition/Product/Found.php

@@ -72,7 +72,7 @@ public function asXml($containerKey = 'conditions', $itemKey = 'condition')
     public function loadAttributeOptions()
     {
         $this->setAttributeOption([
-            null => Mage::helper('payment')->__('Please choose a condition to add.'),
+            '' => Mage::helper('payment')->__('Please choose a condition to add.'),
         ]);
         return $this;
     }