1.7.5: mage2pro/core#311

Author: dmitrii-fediuk

Handler.php

@@ -1,8 +1,8 @@
 <?php
 namespace Dfe\CheckoutCom;
 use Dfe\CheckoutCom\Handler\DefaultT;
-use Exception as E;
 use Magento\Framework\Phrase;
+use \Throwable as Th; # 2023-08-02 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
 /**
  * @see \Dfe\CheckoutCom\Handler\Charge
  * @see \Dfe\CheckoutCom\Handler\CustomerReturn
@@ -56,7 +56,6 @@ private function isInitiatedByMyself():bool {return in_array($this->type(), df_c
 	 * 2016-03-25
 	 * @param array(string => mixed) $req
 	 * @return Phrase|string
-	 * @throws E
 	 */
 	static function p(array $req) {/** @var Phrase|string $r */
 		try {
@@ -75,15 +74,15 @@ static function p(array $req) {/** @var Phrase|string $r */
 				)
 			; 
 		}
-		catch (E $e) {
+		catch (Th $t) {
 			df_500();
 			# 2023-07-25
 			# "Change the 3rd argument of `df_sentry` from `$context` to `$extra`": https://github.com/mage2pro/core/issues/249
-			df_sentry(__CLASS__, $e, ['request' => $req]);
+			df_sentry(__CLASS__, $t, ['request' => $req]);
 			if (df_my_local()) {
-				throw $e; # 2016-03-27 Show the stack trace on the screen
+				throw $t; # 2016-03-27 Show the stack trace on the screen
 			}
-			$r = __($e->getMessage());
+			$r = __($t->getMessage());
 		}
 		return $r;
 	}

Method.php

@@ -1,22 +1,21 @@
 <?php
 namespace Dfe\CheckoutCom;
-use com\checkout\ApiServices\Cards\ResponseModels\Card;
-use com\checkout\ApiServices\Charges\RequestModels\ChargeCapture;
-use com\checkout\ApiServices\Charges\RequestModels\ChargeRefund;
-use com\checkout\ApiServices\Charges\RequestModels\ChargeUpdate;
-use com\checkout\ApiServices\Charges\RequestModels\ChargeVoid;
-use com\checkout\ApiServices\Charges\ResponseModels\Charge as ChargeResponse;
-use com\checkout\helpers\ApiHttpClientCustomException as CE;
 use Df\Payment\PlaceOrderInternal as PO;
 use Df\Payment\Source\AC;
 use Df\Payment\Token;
 use Dfe\CheckoutCom\SDK\ChargeService;
 use Magento\Framework\DataObject as _DO;
 use Magento\Framework\Exception\LocalizedException as LE;
-use Magento\Payment\Model\Info as I;
 use Magento\Payment\Model\InfoInterface as II;
-use Magento\Sales\Model\Order\Payment as OP;
 use Magento\Sales\Model\Order\Payment\Transaction as T;
+use \Throwable as Th; # 2023-08-02 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
+use com\checkout\ApiServices\Cards\ResponseModels\Card;
+use com\checkout\ApiServices\Charges\RequestModels\ChargeCapture;
+use com\checkout\ApiServices\Charges\RequestModels\ChargeRefund;
+use com\checkout\ApiServices\Charges\RequestModels\ChargeUpdate;
+use com\checkout\ApiServices\Charges\RequestModels\ChargeVoid;
+use com\checkout\ApiServices\Charges\ResponseModels\Charge as ChargeResponse;
+use com\checkout\helpers\ApiHttpClientCustomException as CE;
 /** @method Settings s() */
 final class Method extends \Df\Payment\Method {
 	/**
@@ -543,12 +542,12 @@ private function isCaptureDesired():bool {return AC::c($this->s()->actionDesired
 	 * @return mixed
 	 * @throws \Exception
 	 */
-	private function leh(\Closure $f) {return df_try($f, function(\Exception $e):void {
-		if ($e instanceof CE) {
-			$e = new LE(__($e->getErrorMessage()), $e);
+	private function leh(\Closure $f) {return df_try($f, function(Th $th):void {
+		if ($th instanceof CE) {
+			$th = new LE(__($th->getErrorMessage()), $th);
 		}
-		df_sentry($this, $e);
-		throw df_lx($e);
+		df_sentry($this, $th);
+		throw df_lx($th);
 	});}
 
 	/**

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "mage2pro/checkout.com"
-	,"version": "1.7.4"
+	,"version": "1.7.5"
 	,"description": "Checkout.com integration with Magento 2"
 	,"type": "magento2-module"
 	,"homepage": "https://mage2.pro/c/extensions/checkout-com"