fix

Author: recca0120

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/AcceptNotificationRequest.php

@@ -3,7 +3,6 @@
 namespace Omnipay\Gomypay\Message;
 
 use Omnipay\Common\Exception\InvalidRequestException;
-use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Common\Message\NotificationInterface;
 use Omnipay\Gomypay\Traits\HasGomypay;
 
@@ -18,14 +17,12 @@ public function getData()
 
     /**
      * @throws InvalidRequestException
-     * @throws InvalidResponseException
      */
     public function sendData($data)
     {
         $data = array_merge(['Amount' => (int) $this->getAmount()], $data);
-
-        if (! hash_equals($this->makeHash($data), $data['str_check'])) {
-            throw new InvalidResponseException('Invalid hash');
+        if (! hash_equals($this->makeHash($data), $data['str_check'] ?: '')) {
+            throw new InvalidRequestException('Incorrect hash');
         }
 
         return $this->response = new AcceptNotificationResponse($this, $data);

src/Message/CompletePurchaseRequest.php

@@ -3,7 +3,6 @@
 namespace Omnipay\Gomypay\Message;
 
 use Omnipay\Common\Exception\InvalidRequestException;
-use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Gomypay\Traits\HasGomypay;
 
 class CompletePurchaseRequest extends AbstractRequest
@@ -17,18 +16,17 @@ public function getData()
 
     /**
      * @throws InvalidRequestException
-     * @throws InvalidResponseException
      */
     public function sendData($data)
     {
         $data = array_merge(['Amount' => (int) $this->getAmount()], $data);
 
         if (! array_key_exists('e_orderno', $data)) {
-            throw new InvalidResponseException($data['ret_msg']);
+            throw new InvalidRequestException($data['ret_msg']);
         }
 
-        if (! hash_equals($this->makeHash($data), $data['str_check'])) {
-            throw new InvalidResponseException('Invalid hash');
+        if (! hash_equals($this->makeHash($data), $data['str_check'] ?: '')) {
+            throw new InvalidRequestException('Invalid hash');
         }
 
         return $this->response = new CompletePurchaseResponse($this, $data);

src/Message/GetPaymentInfoRequest.php

@@ -3,7 +3,6 @@
 namespace Omnipay\Gomypay\Message;
 
 use Omnipay\Common\Exception\InvalidRequestException;
-use Omnipay\Common\Exception\InvalidResponseException;
 use Omnipay\Gomypay\Traits\HasGomypay;
 
 class GetPaymentInfoRequest extends AbstractRequest
@@ -17,14 +16,12 @@ public function getData()
 
     /**
      * @throws InvalidRequestException
-     * @throws InvalidResponseException
      */
     public function sendData($data)
     {
         $data = array_merge(['Amount' => (int) $this->getAmount()], $data);
-
-        if (! hash_equals($this->makeHash($data), $data['str_check'])) {
-            throw new InvalidResponseException('Invalid hash');
+        if (! hash_equals($this->makeHash($data), $data['str_check'] ?: '')) {
+            throw new InvalidRequestException('Invalid hash');
         }
 
         return $this->response = new GetPaymentInfoResponse($this, $data);

tests/Message/CompletePurchaseRequestTest.php

@@ -2,7 +2,7 @@
 
 namespace Omnipay\Gomypay\Tests\Message;
 
-use Omnipay\Common\Exception\InvalidResponseException;
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Gomypay\Message\CompletePurchaseRequest;
 use Omnipay\Tests\TestCase;
 
@@ -71,7 +71,7 @@ public function testGetUnionPayData()
 
     public function testInvalidResponse()
     {
-        $this->expectException(InvalidResponseException::class);
+        $this->expectException(InvalidRequestException::class);
         $this->expectExceptionMessage('此特店未啟用信用卡交易功能');
         $this->getHttpRequest()->query->replace([
             'result' => '0',