1.7.5: mage2pro/core#311

Author: dmitrii-fediuk

Handler.php

@@ -2,7 +2,7 @@
 namespace Dfe\TwoCheckout;
 use Dfe\TwoCheckout\Handler\DefaultT;
 use Dfe\TwoCheckout\Settings as S;
-use Exception as E;
+use \Throwable as Th; # 2023-08-02 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
 /**
  * @see \Dfe\TwoCheckout\Handler\DefaultT
  * @see \Dfe\TwoCheckout\Handler\RefundIssued
@@ -40,7 +40,6 @@ final protected function type():string {return $this['message_type'];}
 	 * 2016-03-25
 	 * @param array(string => mixed) $request
 	 * @return mixed
-	 * @throws E
 	 */
 	final static function p(array $request) {/** @var mixed $r */
 		try {
@@ -81,15 +80,16 @@ final static function p(array $request) {/** @var mixed $r */
 			$i = df_new(df_con(__CLASS__, $suffix, DefaultT::class), $request); /** @var Handler $i */
 			$r = $i->eligible() ? $i->process() : 'The event is not for our store.';
 		}
-		catch (E $e) {
+		# 2023-08-02 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
+		catch (Th $th) {
 			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' => $request]);
+			df_sentry(__CLASS__, $th, ['request' => $request]);
 			if (df_my_local()) {
-				throw $e; # 2016-03-27 Удобно видеть стек на экране.
+				throw $th; # 2016-03-27 Удобно видеть стек на экране.
 			}
-			$r = __($e->getMessage());
+			$r = __($th->getMessage());
 		}
 		return $r;
 	}

Method.php

@@ -3,10 +3,9 @@
 use Df\Payment\Token;
 use Dfe\TwoCheckout\Block\Info as InfoBlock;
 use Magento\Framework\Exception\LocalizedException as LE;
-use Magento\Sales\Model\Order as O;
 use Magento\Sales\Model\Order\Creditmemo as CM;
-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
 # 2016-05-17
 /** @method Settings s() */
 final class Method extends \Df\Payment\Method {
@@ -459,7 +458,8 @@ protected function iiaKeys():array {return [Token::KEY];}
 	private function api(\Closure $f) {
 		try {$this->s()->init(); return $f();}
 		catch (Exception $e) {throw $e;}
-		catch (\Exception $e) {throw df_lx($e);}
+		# 2023-08-02 "Treat `\Throwable` similar to `\Exception`": https://github.com/mage2pro/core/issues/311
+		catch (Th $th) {throw df_lx($th);}
 	}
 
 	/**

composer.json

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