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

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

src/Message/AcceptNotificationRequest.php

@@ -2,7 +2,10 @@
 
 namespace Omnipay\MyPay\Message;
 
-class AcceptNotificationRequest extends CompletePurchaseRequest
+use Omnipay\Common\Message\NotificationInterface;
+use Omnipay\Common\Message\ResponseInterface;
+
+class AcceptNotificationRequest extends CompletePurchaseRequest implements NotificationInterface
 {
     /**
      * @param array $data
@@ -12,4 +15,27 @@ 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

@@ -2,15 +2,17 @@
 
 namespace Omnipay\MyPay\Message;
 
-class AcceptNotificationResponse extends CompletePurchaseResponse
+use Omnipay\Common\Message\NotificationInterface;
+
+class AcceptNotificationResponse extends CompletePurchaseResponse implements NotificationInterface
 {
-    /**
-     * Response Message.
-     *
-     * @return null|string A response message from the payment gateway
-     */
-    public function getMessage()
+    public function getReply()
     {
         return $this->isSuccessful() ? '8888' : '';
     }
+
+    public function getTransactionStatus()
+    {
+        return $this->isSuccessful() ? self::STATUS_COMPLETED : self::STATUS_FAILED;
+    }
 }

src/Message/CompletePurchaseRequest.php

@@ -3,16 +3,14 @@
 namespace Omnipay\MyPay\Message;
 
 use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
-use Omnipay\Common\Message\NotificationInterface;
-use Omnipay\Common\Message\ResponseInterface;
 use Omnipay\MyPay\Traits\HasEcho;
 use Omnipay\MyPay\Traits\HasKey;
 use Omnipay\MyPay\Traits\HasOrderInfo;
 use Omnipay\MyPay\Traits\HasOrderResult;
 use Omnipay\MyPay\Traits\HasStore;
 use Omnipay\MyPay\Traits\HasUid;
 
-class CompletePurchaseRequest extends BaseAbstractRequest implements NotificationInterface
+class CompletePurchaseRequest extends BaseAbstractRequest
 {
     use HasStore;
     use HasKey;
@@ -294,22 +292,4 @@ 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 ResponseInterface
-     */
-    private function getNotification()
-    {
-        return ! $this->response ? $this->send() : $this->response;
-    }
 }

src/Message/CompletePurchaseResponse.php

@@ -3,9 +3,8 @@
 namespace Omnipay\MyPay\Message;
 
 use Omnipay\Common\Message\AbstractResponse;
-use Omnipay\Common\Message\NotificationInterface;
 
-class CompletePurchaseResponse extends AbstractResponse implements NotificationInterface
+class CompletePurchaseResponse extends AbstractResponse
 {
     /**
      * Is the response successful?
@@ -51,9 +50,4 @@ public function getTransactionReference()
     {
         return $this->data['uid'];
     }
-
-    public function getTransactionStatus()
-    {
-        return $this->isSuccessful() ? self::STATUS_COMPLETED : self::STATUS_FAILED;
-    }
 }

tests/GatewayTest.php

@@ -25,7 +25,7 @@ class GatewayTest extends GatewayTestCase
      */
     private $storeKey = 'Xd668CSjnXQLD26Hia8vapkOgGXAv68s';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -159,7 +159,8 @@ public function testAcceptNotification()
 
         $response = $this->gateway->acceptNotification($options);
 
-        self::assertEquals('8888', $response->getMessage());
+        self::assertEquals('付款完成', $response->getMessage());
+        self::assertEquals('8888', $response->getReply());
     }
 
     public function testFetchTransaction()

tests/Message/CompletePurchaseRequestTest.php

@@ -13,7 +13,7 @@ class CompletePurchaseRequestTest extends TestCase
      */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/FetchTransactionRequestTest.php

@@ -12,7 +12,7 @@ class FetchTransactionRequestTest extends TestCase
      */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Message/PurchaseRequestTest.php

@@ -16,7 +16,7 @@ class PurchaseRequestTest extends TestCase
      */
     private $request;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();