Throw exception instead of returning error array in PaymentRedirect

hakito · Jun 20, 2020 · 73159da · 73159da
1 parent e95d469
commit 73159da
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 9 deletions.
diff --git a/src/Controller/Component/EpsComponent.php b/src/Controller/Component/EpsComponent.php
@@ -12,6 +12,7 @@
 
 use at\externet\eps_bank_transfer;
 
+use EpsBankTransfer\Exceptions\EpsAnswerException;
 use EpsBankTransfer\Plugin;
 class EpsComponent extends Component
 {
@@ -101,8 +102,8 @@ public function GetBanksArray($invalidateCache = false, $config = 'default')
      * @throws \XmlValidationException when the returned BankResponseDetails does not validate against XSD
      * @throws \SocketException when communication with SO fails
      * @throws \UnexpectedValueException when using security suffix without security seed
-     * @return string BankResponseDetails
-     * @return array Error info array (ErrorCode, ErrorMsg) from the BankResponseDetails
+     * @throws \EpsBankTransfer\Exceptions\EpsAnswerException when BankResponseDetails contains an error
+     * @return returnvalue from Controller::redirect
      */
     public function PaymentRedirect($remittanceIdentifier, $TransactionOkUrl, $TransactionNokUrl, $bic = null, $expirationMinutes = null)
     {
@@ -154,10 +155,7 @@ public function PaymentRedirect($remittanceIdentifier, $TransactionOkUrl, $Trans
             $errorCode = '' . $errorDetails->ErrorCode;
             $errorMsg = '' . $errorDetails->ErrorMsg;
             Plugin::WriteLog("FAILED: " . $logPrefix . ' Error ' . $errorCode . ' ' . $errorMsg);
-            return array(
-                'ErrorCode' => $errorCode,
-                'ErrorMsg' => $errorMsg
-            );
+            throw new EpsAnswerException($errorCode, $errorMsg);
         }
 
         Plugin::WriteLog("SUCCESS: " . $logPrefix);
@@ -224,7 +222,7 @@ public function HandleConfirmationUrl($eRemittanceIdentifier, $rawPostStream = '
 
         $testMode = !empty($config['TestMode']);
         try {
-            Plugin::GetSoCommunicator()->HandleConfirmationUrl(
+            Plugin::GetSoCommunicator($testMode)->HandleConfirmationUrl(
                     $confirmationCallbackWrapper,
                     $vitalityCheckCallbackWrapper,
                     $rawPostStream,

diff --git a/src/Exceptions/EpsAnswerException.php b/src/Exceptions/EpsAnswerException.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace EpsBankTransfer\Exceptions;
+
+class EpsAnswerException extends \Exception
+{
+    public $ErrorCode;
+    public $ErrorMsg;
+
+    public function __construct($errorCode, $errorMsg)
+    {
+        parent::__construct($errorMsg);
+        $this->ErrorCode = $errorCode;
+        $this->ErrorMsg = $errorMsg;
+    }
+
+    public function ToArray()
+    {
+        return
+        [
+            'ErrorCode' => $this->ErrorCode,
+            'ErrorMsg' => $this->ErrorMsg
+        ];
+    }
+}
diff --git a/tests/TestCase/Controller/Component/EpsComponentTest.php b/tests/TestCase/Controller/Component/EpsComponentTest.php
@@ -202,9 +202,14 @@ public function testPaymentRedirectErrorResponse()
         Plugin::GetSoCommunicator()->expects($this->once())
                 ->method('SendTransferInitiatorDetails')
                 ->will($this->returnValue(eps_bank_transfer\BaseTest::GetEpsData('BankResponseDetails004.xml')));
-        $actual = $this->Eps->PaymentRedirect('1234567890ABCDEFG', null, null);
+        $exception = null;
+        try {
+            $this->Eps->PaymentRedirect('1234567890ABCDEFG', null, null);
+        } catch (\EpsBankTransfer\Exceptions\EpsAnswerException $th) {
+            $exception = $th;
+        }
         $expected = array('ErrorCode' => '004', 'ErrorMsg' => 'merchant not found!');
-        $this->assertEquals($expected, $actual);
+        $this->assertEquals($expected, $exception->ToArray());
     }
 
     public function testPaymentRedirectSuccess()