From 6c0da4cdab7f7ead9d90ecef4ddd971406981994 Mon Sep 17 00:00:00 2001
From: Jon Goldberg <jon@megaphonetech.com>
Date: Thu, 3 Mar 2022 18:04:14 -0500
Subject: [PATCH] throw exception on error
---
CRM/Core/Payment/MJWTrait.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/CRM/Core/Payment/MJWTrait.php b/CRM/Core/Payment/MJWTrait.php
index b7e0808..8e6089b 100644
--- a/CRM/Core/Payment/MJWTrait.php
+++ b/CRM/Core/Payment/MJWTrait.php
@@ -349,14 +349,13 @@ trait CRM_Core_Payment_MJWTrait {
/**
* Handle an error and notify the user
- * @fixme We should not return the message here - we should throw an exception and catch in calling code
*
* @param string $errorCode
* @param string $errorMessage
* @param string $bounceURL
*
- * @return string $errorMessage
- * (or statusbounce if URL is specified)
+ * @throws \Civi\Payment\Exception\PaymentProcessorException
+ * (or statusbounce if URL is specified)
*/
private function handleError($errorCode = NULL, $errorMessage = NULL, $bounceURL = NULL) {
$errorCode = empty($errorCode) ? '' : $errorCode . ': ';
@@ -372,8 +371,7 @@ trait CRM_Core_Payment_MJWTrait {
if ($bounceURL) {
CRM_Core_Error::statusBounce($message, $bounceURL, $this->getPaymentTypeLabel());
}
- // @fixme throw exception instead of returning
- return $errorMessage;
+ throw new PaymentProcessorException($errorMessage, $errorCode);
}
/**
--
GitLab