From fc877c251013648e92043fc0d14fcee4331963de Mon Sep 17 00:00:00 2001 From: Alexander Minza Date: Tue, 19 Nov 2019 21:31:30 +0200 Subject: [PATCH] Fixed exception messages strings to properly identify source --- .../Completion/CompletionRequest.php | 16 ++++++++-------- src/VictoriaBank/Response.php | 6 +++--- src/VictoriaBank/Reversal/ReversalRequest.php | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/VictoriaBank/Completion/CompletionRequest.php b/src/VictoriaBank/Completion/CompletionRequest.php index 05616ec..c0aef2c 100755 --- a/src/VictoriaBank/Completion/CompletionRequest.php +++ b/src/VictoriaBank/Completion/CompletionRequest.php @@ -58,34 +58,34 @@ public function validateRequestParams() if (!isset($this->_requestFields[self::AMOUNT]) || strlen($this->_requestFields[self::AMOUNT]) < 1 || strlen( $this->_requestFields[self::AMOUNT] ) > 12) { - throw new Exception('Authorization request failed: invalid '.self::AMOUNT); + throw new Exception('Completion request failed: invalid '.self::AMOUNT); } if (!isset($this->_requestFields[self::CURRENCY]) || strlen($this->_requestFields[self::CURRENCY]) != 3) { - throw new Exception('Authorization request failed: invalid '.self::CURRENCY); + throw new Exception('Completion request failed: invalid '.self::CURRENCY); } if (!isset($this->_requestFields[self::ORDER]) || strlen($this->_requestFields[self::ORDER]) < 6 || strlen( $this->_requestFields[self::ORDER] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::ORDER); + throw new Exception('Completion request failed: invalid '.self::ORDER); } if (!isset($this->_requestFields[self::TERMINAL]) || strlen($this->_requestFields[self::TERMINAL]) != 8) { - throw new Exception('Authorization request failed: invalid '.self::TERMINAL); + throw new Exception('Completion request failed: invalid '.self::TERMINAL); } if (!isset($this->_requestFields[self::TIMESTAMP]) || strlen($this->_requestFields[self::TIMESTAMP]) != 14) { - throw new Exception('Authorization request failed: invalid '.self::TIMESTAMP); + throw new Exception('Completion request failed: invalid '.self::TIMESTAMP); } if (!isset($this->_requestFields[self::NONCE]) || strlen($this->_requestFields[self::NONCE]) < 20 || strlen( $this->_requestFields[self::NONCE] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::NONCE); + throw new Exception('Completion request failed: invalid '.self::NONCE); } if (!isset($this->_requestFields[self::RRN]) || strlen($this->_requestFields[self::RRN]) != 12) { - throw new Exception('Authorization request failed: invalid '.self::RRN); + throw new Exception('Completion request failed: invalid '.self::RRN); } if (!isset($this->_requestFields[self::INT_REF]) || strlen($this->_requestFields[self::INT_REF]) < 1 || strlen( $this->_requestFields[self::INT_REF] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::INT_REF); + throw new Exception('Completion request failed: invalid '.self::INT_REF); } return $this; diff --git a/src/VictoriaBank/Response.php b/src/VictoriaBank/Response.php index 979dab7..a2d868e 100755 --- a/src/VictoriaBank/Response.php +++ b/src/VictoriaBank/Response.php @@ -59,12 +59,12 @@ abstract class Response implements ResponseInterface */ public function __construct(array $responseData) { - #Make sure to set these static params prior to calling the request + #Make sure to set these static params prior to calling the response if (is_null(self::$bankPublicKeyPath)) { - throw new Exception('Could not instantiate the bank request - missing parameter bankPublicKeyPath'); + throw new Exception('Could not instantiate the bank response - missing parameter bankPublicKeyPath'); } if (is_null(self::$signaturePrefix)) { - throw new Exception('Could not instantiate the bank request - missing parameter signaturePrefix'); + throw new Exception('Could not instantiate the bank response - missing parameter signaturePrefix'); } if (empty($responseData)) { throw new Exception('Bank response error: Empty data received'); diff --git a/src/VictoriaBank/Reversal/ReversalRequest.php b/src/VictoriaBank/Reversal/ReversalRequest.php index 9255d4f..87a01ed 100755 --- a/src/VictoriaBank/Reversal/ReversalRequest.php +++ b/src/VictoriaBank/Reversal/ReversalRequest.php @@ -58,34 +58,34 @@ public function validateRequestParams() if (!isset($this->_requestFields[self::AMOUNT]) || strlen($this->_requestFields[self::AMOUNT]) < 1 || strlen( $this->_requestFields[self::AMOUNT] ) > 12) { - throw new Exception('Authorization request failed: invalid '.self::AMOUNT); + throw new Exception('Reversal request failed: invalid '.self::AMOUNT); } if (!isset($this->_requestFields[self::CURRENCY]) || strlen($this->_requestFields[self::CURRENCY]) != 3) { - throw new Exception('Authorization request failed: invalid '.self::CURRENCY); + throw new Exception('Reversal request failed: invalid '.self::CURRENCY); } if (!isset($this->_requestFields[self::ORDER]) || strlen($this->_requestFields[self::ORDER]) < 6 || strlen( $this->_requestFields[self::ORDER] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::ORDER); + throw new Exception('Reversal request failed: invalid '.self::ORDER); } if (!isset($this->_requestFields[self::TERMINAL]) || strlen($this->_requestFields[self::TERMINAL]) != 8) { - throw new Exception('Authorization request failed: invalid '.self::TERMINAL); + throw new Exception('Reversal request failed: invalid '.self::TERMINAL); } if (!isset($this->_requestFields[self::TIMESTAMP]) || strlen($this->_requestFields[self::TIMESTAMP]) != 14) { - throw new Exception('Authorization request failed: invalid '.self::TIMESTAMP); + throw new Exception('Reversal request failed: invalid '.self::TIMESTAMP); } if (!isset($this->_requestFields[self::NONCE]) || strlen($this->_requestFields[self::NONCE]) < 20 || strlen( $this->_requestFields[self::NONCE] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::NONCE); + throw new Exception('Reversal request failed: invalid '.self::NONCE); } if (!isset($this->_requestFields[self::RRN]) || strlen($this->_requestFields[self::RRN]) != 12) { - throw new Exception('Authorization request failed: invalid '.self::RRN); + throw new Exception('Reversal request failed: invalid '.self::RRN); } if (!isset($this->_requestFields[self::INT_REF]) || strlen($this->_requestFields[self::INT_REF]) < 1 || strlen( $this->_requestFields[self::INT_REF] ) > 32) { - throw new Exception('Authorization request failed: invalid '.self::INT_REF); + throw new Exception('Reversal request failed: invalid '.self::INT_REF); } return $this;