feat: get reply

Author: recca0120

.github/workflows/tests.yml

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

composer.json

@@ -40,12 +40,12 @@
         "omnipay/common": "~3.0"
     },
     "require-dev": {
-        "omnipay/tests": "~3.0",
-        "squizlabs/php_codesniffer": "~3.0"
+        "omnipay/tests": "~3.0|~4.0",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "3.1.x-dev"
         }
     },
     "prefer-stable": true

src/Message/AcceptNotificationRequest.php

@@ -2,14 +2,39 @@
 
 namespace Omnipay\Payware\Message;
 
-class AcceptNotificationRequest extends CompletePurchaseRequest
+use Omnipay\Common\Message\NotificationInterface;
+
+class AcceptNotificationRequest extends CompletePurchaseRequest implements NotificationInterface
 {
     /**
      * @param mixed $data
-     * @return CompletePurchaseResponse
+     * @return AcceptNotificationResponse
      */
     public function sendData($data)
     {
         return $this->response = new AcceptNotificationResponse($this, $data);
     }
+
+    public function getTransactionStatus()
+    {
+        return $this->getNotificationResponse()->getTransactionStatus();
+    }
+
+    public function getMessage()
+    {
+        return $this->getNotificationResponse()->getMessage();
+    }
+
+    public function getReply()
+    {
+        return $this->getNotificationResponse()->getReply();
+    }
+
+    /**
+     * @return AcceptNotificationResponse
+     */
+    private function getNotificationResponse()
+    {
+        return ! $this->response ? $this->send() : $this->response;
+    }
 }

src/Message/AcceptNotificationResponse.php

@@ -6,7 +6,7 @@
 
 class AcceptNotificationResponse extends CompletePurchaseResponse implements NotificationInterface
 {
-    public function getMessage()
+    public function getReply()
     {
         return $this->isSuccessful() ? 'OK' : 'FAIL';
     }

src/Message/CompletePurchaseRequest.php

@@ -4,14 +4,13 @@
 
 use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Exception\InvalidResponseException;
-use Omnipay\Common\Message\NotificationInterface;
 use Omnipay\Payware\Support\Helper;
 use Omnipay\Payware\Traits\HasBooking;
 use Omnipay\Payware\Traits\HasCreditCard;
 use Omnipay\Payware\Traits\HasCVS;
 use Omnipay\Payware\Traits\HasMerchant;
 
-class CompletePurchaseRequest extends AbstractRequest implements NotificationInterface
+class CompletePurchaseRequest extends AbstractRequest
 {
     use HasMerchant;
     use HasBooking;
@@ -154,24 +153,6 @@ public function sendData($data)
         return $this->response = new CompletePurchaseResponse($this, $data);
     }
 
-    public function getTransactionStatus()
-    {
-        return $this->getNotification()->getTransactionStatus();
-    }
-
-    public function getMessage()
-    {
-        return $this->getNotification()->getMessage();
-    }
-
-    /**
-     * @return NotificationInterface
-     */
-    private function getNotification()
-    {
-        return ! $this->response ? $this->send() : $this->response;
-    }
-
     /**
      * @return array
      * @throws InvalidResponseException

src/Message/ReceiveTransactionInfoResponse.php

@@ -23,7 +23,7 @@ public function isSuccessful()
      */
     public function getMessage()
     {
-        return 'OK';
+        return '';
     }
 
     /**
@@ -45,4 +45,9 @@ public function getTransactionId()
     {
         return $this->data['CustOrderNo'];
     }
+
+    public function getReply()
+    {
+        return 'OK';
+    }
 }

tests/GatewayTest.php

@@ -11,7 +11,7 @@
 
 class GatewayTest extends GatewayTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/AcceptNotificationRequestTest.php

@@ -51,7 +51,8 @@ public function testSend($result)
         self::assertEquals('6636797108956306177', $notification->getTransactionId());
         self::assertEquals('PW118120600018', $notification->getTransactionReference());
         self::assertEquals(NotificationInterface::STATUS_COMPLETED, $notification->getTransactionStatus());
-        self::assertEquals('OK', $notification->getMessage());
+        self::assertEquals('授權成功。', $notification->getMessage());
+        // self::assertEquals('OK', $notification->getReply());
     }
 
     public function testInvalidCheckMacValue()

tests/Message/ReceiveTransactionInfoRequestTest.php

@@ -48,11 +48,11 @@ public function testAtmNoGetData()
      */
     public function testAtmSend($results)
     {
-        list($response, $options) = $results;
+        [$response, $options] = $results;
 
         self::assertTrue($response->isSuccessful());
         self::assertEquals($options['AtmNo'], $response->getData()['AtmNo']);
-        self::assertEquals('OK', $response->getMessage());
+        self::assertEquals('OK', $response->getReply());
     }
 
     public function testPaymentNoGetData()
@@ -83,10 +83,10 @@ public function testPaymentNoGetData()
      */
     public function testPaymentNoSend($results)
     {
-        list($response, $options) = $results;
+        [$response, $options] = $results;
 
         self::assertTrue($response->isSuccessful());
         self::assertEquals($options['PaymentNo'], $response->getData()['PaymentNo']);
-        self::assertEquals('OK', $response->getMessage());
+        self::assertEquals('OK', $response->getReply());
     }
 }