diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php index 2e5a1ea2550..aaddaa7ce89 100644 --- 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 index 220ec819388..d3919683542 100644 --- 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 index 76561ece7f7..bb3ed52bb62 100644 --- a/composer.lock +++ b/composer.lock @@ -3372,16 +3372,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.21", + "version": "1.10.22", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5" + "reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", - "reference": "b2a30186be2e4d97dce754ae4e65eb0ec2f04eb5", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/97d694dfd4ceb57bcce4e3b38548f13ea62e4287", + "reference": "97d694dfd4ceb57bcce4e3b38548f13ea62e4287", "shasum": "" }, "require": { @@ -3430,7 +3430,7 @@ "type": "tidelift" } ], - "time": "2023-06-21T20:07:58+00:00" + "time": "2023-06-30T20:04:11+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon index 538f183df0d..1acbbf15087 100644 --- 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