Bump phpstan/phpstan from 1.10.21 to 1.10.22 (OpenMage#3359)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
empiricompany · Jul 4, 2023 · 6892dee · 6892dee
1 parent 1b032ac
commit 6892dee
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -559,7 +559,7 @@ protected function _registerPaymentRefund()
             ->setTransactionId($this->getRequestData('txn_id'))
             ->setParentTransactionId($this->getRequestData('parent_txn_id'))
             ->setIsTransactionClosed($isRefundFinal)
-            ->registerRefundNotification(-1 * $this->getRequestData('mc_gross'));
+            ->registerRefundNotification(-1 * (float)$this->getRequestData('mc_gross'));
         $this->_order->addStatusHistoryComment($comment, false);
         $this->_order->save();
 

diff --git a/app/code/core/Mage/Rule/Model/Abstract.php b/app/code/core/Mage/Rule/Model/Abstract.php
@@ -319,10 +319,7 @@ protected function _convertFlatToRecursive(array $data)
                     $path = explode('--', $id);
                     $node =& $arr;
                     for ($i = 0, $l = count($path); $i < $l; $i++) {
-                        if (!isset($node[$key][$path[$i]])) {
-                            $node[$key][$path[$i]] = [];
-                        }
-                        $node =& $node[$key][$path[$i]];
+                        $node =& $node[$key][$path[$i]] ?? [];
                     }
                     foreach ($data as $k => $v) {
                         $node[$k] = $v;

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -3670,11 +3670,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Rss/Helper/Data.php
 
-		-
-			message: "#^Offset 'actions'\\|'conditions' on array\\{\\} in isset\\(\\) does not exist\\.$#"
-			count: 1
-			path: app/code/core/Mage/Rule/Model/Abstract.php
-
 		-
 			message: "#^Property Mage_Rule_Model_Abstract\\:\\:\\$_conditions \\(Mage_Rule_Model_Condition_Combine\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1