fix

Author: recca0120

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ '7.1','7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+        php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
 
     name: PHP ${{ matrix.php }}
 

composer.json

@@ -18,7 +18,6 @@
         "omnipay/common": "^3.0"
     },
     "require-dev": {
-        "roave/security-advisories": "dev-latest",
         "omnipay/tests": "^3.0|^4.0",
         "squizlabs/php_codesniffer": "^3"
     },

src/Message/CompletePurchaseRequest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\MyCash\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\AbstractRequest;
 use Omnipay\MyCash\Traits\HasMyCash;
 
@@ -13,18 +13,16 @@ class CompletePurchaseRequest extends AbstractRequest
     /**
      * @return array
      *
-     * @throws InvalidResponseException
+     * @throws InvalidRequestException
      */
     public function getData()
     {
         $data = $this->httpRequest->request->all();
-        $validate = $data['Validate'];
-
-        if ($this->makeHash($data) !== $validate) {
-            throw new InvalidResponseException('Incorrect hash');
+        if (! hash_equals($this->makeHash($data), $this->httpRequest->request->get('Validate', ''))) {
+            throw new InvalidRequestException('Incorrect hash');
         }
 
-        return $data;
+        return $this->httpRequest->request->all();
     }
 
     /**

src/Message/GetPaymentInfoRequest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\MyCash\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\AbstractRequest;
 use Omnipay\MyCash\Traits\HasMyCash;
 
@@ -13,14 +13,13 @@ class GetPaymentInfoRequest extends AbstractRequest
     /**
      * @return array
      *
-     * @throws InvalidResponseException
+     * @throws InvalidRequestException
      */
     public function getData()
     {
         $data = $this->httpRequest->request->all();
-
-        if (! hash_equals($this->httpRequest->request->get('Validate'), $this->makeHash($data))) {
-            throw new InvalidResponseException('Incorrect hash');
+        if (! hash_equals($this->makeHash($data), $this->httpRequest->request->get('Validate', ''))) {
+            throw new InvalidRequestException('Incorrect hash');
         }
 
         return $data;

tests/Message/AcceptNotificationRequestTest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\MyCash\Tests\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\NotificationInterface;
 use Omnipay\MyCash\Message\AcceptNotificationRequest;
 use Omnipay\MyCash\Message\CompletePurchaseRequest;
@@ -18,7 +18,7 @@ class AcceptNotificationRequestTest extends TestCase
 
     public function testValidateFails(): void
     {
-        $this->expectException(InvalidResponseException::class);
+        $this->expectException(InvalidRequestException::class);
 
         $options = [
             'RtnCode' => '1',

tests/Message/CompletePurchaseRequestTest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\MyCash\Tests\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\MyCash\Message\CompletePurchaseRequest;
 use Omnipay\Tests\TestCase;
 
@@ -16,7 +16,7 @@ class CompletePurchaseRequestTest extends TestCase
 
     public function testValidateFails(): void
     {
-        $this->expectException(InvalidResponseException::class);
+        $this->expectException(InvalidRequestException::class);
         $this->expectExceptionMessage('Incorrect hash');
 
         $options = [