fix

Author: recca0120

src/Message/CompletePurchaseRequest.php

@@ -2,6 +2,7 @@
 
 namespace Omnipay\Payware\Message;
 
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Payware\Traits\HasMerchant;
 
@@ -29,12 +30,12 @@ public function sendData($data)
     /**
      * @return array
      *
-     * @throws InvalidResponseException
+     * @throws InvalidRequestException
      */
     private function checkMacValue($data)
     {
-        if (! hash_equals($this->httpRequest->request->get('CheckMacValue', ''), $this->makeHash($data))) {
-            throw new InvalidResponseException();
+        if (! hash_equals($this->makeHash($data), $this->httpRequest->request->get('CheckMacValue', ''))) {
+            throw new InvalidRequestException('Incorrect CheckMacValue');
         }
 
         return $data;

tests/Message/AcceptNotificationRequestTest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\Payware\Tests\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\NotificationInterface;
 use Omnipay\Payware\Message\AcceptNotificationRequest;
 use Omnipay\Tests\TestCase;
@@ -55,8 +55,8 @@ public function testSend($result)
 
     public function testInvalidCheckMacValue()
     {
-        $this->expectException(InvalidResponseException::class);
-        $this->expectExceptionMessage('Invalid response from payment gateway');
+        $this->expectException(InvalidRequestException::class);
+        $this->expectExceptionMessage('Incorrect CheckMacValue');
 
         $options = [
             'MerchantId' => '1',

tests/Message/CompletePurchaseRequestTest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\Payware\Tests\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Payware\Message\CompletePurchaseRequest;
 use Omnipay\Tests\TestCase;
 
@@ -54,8 +54,8 @@ public function testSend($options)
 
     public function testInvalidCheckMacValue()
     {
-        $this->expectException(InvalidResponseException::class);
-        $this->expectExceptionMessage('Invalid response from payment gateway');
+        $this->expectException(InvalidRequestException::class);
+        $this->expectExceptionMessage('Incorrect CheckMacValue');
 
         $data = [
             'MerchantId' => '1',