From 2e55fe83a84cbe64b1dc72693c511945da26433d Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 3 Oct 2025 08:08:31 +0200 Subject: [PATCH 1/2] Fix cURL error description retrieval ### Fixed Issues (if relevant) - fixes OpenMage/magento-lts#4964 --- app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php index 827766f9bf6..2e3afebfe8d 100644 --- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php +++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php @@ -53,7 +53,7 @@ public function getAccessToken(string $clientId, string $clientSecret, string $c try { if ($responseData === false) { $code = curl_errno($ch); - $description = curl_strerror($ch); + $description = curl_strerror($code); $message = curl_error($ch); Mage::throwException("cURL Error: ($code) $description - \"$message\""); } From b9a83c84350fd7220a147247f6b454e3b574dd4d Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Fri, 3 Oct 2025 08:14:54 +0200 Subject: [PATCH 2/2] Remove outdated curl_strerror error message Removed obsolete error message for curl_strerror parameter type. --- .phpstan.dist.baseline.neon | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index d2ece40d7a0..bdcefa4f78a 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -5076,12 +5076,6 @@ parameters: count: 18 path: app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php - - - rawMessage: 'Parameter #1 $error_code of function curl_strerror expects int, (CurlHandle|false) given.' - identifier: argument.type - count: 1 - path: app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php - - rawMessage: 'Parameter #3 $value of function curl_setopt expects bool, int given.' identifier: argument.type