fix

Author: recca0120

README.md

@@ -1,19 +1,20 @@
-# Omnipay: :gateway
+# Omnipay: Gomypay
 
 **Gomypay gateway for the Omnipay PHP payment processing library**
 
-[![Latest Version on Packagist](https://img.shields.io/packagist/v/omnipay-taiwan/omnipay-:gateway.svg?style=flat-square)](https://packagist.org/packages/omnipay-taiwan/omnipay-:gateway)
+[![Latest Version on Packagist](https://img.shields.io/packagist/v/omnipay-taiwan/omnipay-gomypay.svg?style=flat-square)](https://packagist.org/packages/omnipay-taiwan/omnipay-gomypay)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://img.shields.io/travis/omnipay-taiwan/omnipay-:gateway/master.svg?style=flat-square)](https://travis-ci.org/omnipay-taiwan/omnipay-:gateway)
-[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/omnipay-taiwan/omnipay-:gateway.svg?style=flat-square)](https://scrutinizer-ci.com/g/omnipay-taiwan/omnipay-:gateway/code-structure)
-[![Quality Score](https://img.shields.io/scrutinizer/g/omnipay-taiwan/omnipay-:gateway.svg?style=flat-square)](https://scrutinizer-ci.com/g/omnipay-taiwan/omnipay-:gateway)
-[![Total Downloads](https://img.shields.io/packagist/dt/omnipay-taiwan/omnipay-:gateway.svg?style=flat-square)](https://packagist.org/packages/omnipay-taiwan/omnipay-:gateway)
-
+[![Build Status](https://img.shields.io/travis/omnipay-taiwan/omnipay-gomypay/master.svg?style=flat-square)](https://travis-ci.org/omnipay-taiwan/omnipay-gomypay)
+[![Coverage Status](https://img.shields.io/scrutinizer/coverage/g/omnipay-taiwan/omnipay-gomypay.svg?style=flat-square)](https://scrutinizer-ci.com/g/omnipay-taiwan/omnipay-gomypay/code-structure)
+[![Quality Score](https://img.shields.io/scrutinizer/g/omnipay-taiwan/omnipay-gomypay.svg?style=flat-square)](https://scrutinizer-ci.com/g/omnipay-taiwan/omnipay-gomypay)
+[![Total Downloads](https://img.shields.io/packagist/dt/omnipay-taiwan/omnipay-gomypay.svg?style=flat-square)](https://packagist.org/packages/omnipay-taiwan/omnipay-gomypay)
 
 [Omnipay](https://github.com/thephpleague/omnipay) is a framework agnostic, multi-gateway payment
-processing library for PHP 5.3+. This package implements :gateway support for Omnipay.
+processing library for PHP 5.3+. This package implements Gomypay support for Omnipay.
 
-**Note:** Replace `omnipay-taiwan`, `recca0120`, `recca0120), [CHANGELOG.md](CHANGELOG.md), [CONTRIBUTING.md](CONTRIBUTING.md), [LICENSE.md](LICENSE.md) and [composer.json](composer.json) files, then delete this line.
+**Note:** Replace `omnipay-taiwan`, `recca0120`, `
+recca0120), [CHANGELOG.md](CHANGELOG.md), [CONTRIBUTING.md](CONTRIBUTING.md), [LICENSE.md](LICENSE.md)
+and [composer.json](composer.json) files, then delete this line.
 
 This is where your description should go. Try and limit it to a paragraph or two, and maybe throw in a mention of what
 PSRs you support to avoid any confusion with users and contributors.
@@ -23,14 +24,14 @@ PSRs you support to avoid any confusion with users and contributors.
 Instal the gateway using require. Require the `league/omnipay` base package and this gateway.
 
 ``` bash
-$ composer require league/omnipay omnipay-taiwan/omnipay-:gateway
+$ composer require league/omnipay omnipay-taiwan/omnipay-gomypay
 ```
 
 ## Usage
 
 The following gateways are provided by this package:
 
- * :gateway
+* Gomypay
 
 For general usage instructions, please see the main [Omnipay](https://github.com/thephpleague/omnipay) repository.
 
@@ -44,7 +45,8 @@ If you want to keep up to date with release announcements, discuss ideas for the
 or ask more detailed questions, there is also a [mailing list](https://groups.google.com/forum/#!forum/omnipay) which
 you can subscribe to.
 
-If you believe you have found a bug, please report it using the [GitHub issue tracker](https://github.com/omnipay-taiwan/omnipay-:gateway/issues),
+If you believe you have found a bug, please report it using
+the [GitHub issue tracker](https://github.com/omnipay-taiwan/omnipay-gomypay/issues),
 or better yet, fork the library and submit a pull request.
 
 ## Change log

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',