Moved init default values of request parameters to initalize method

Author: vuongxuongminh

src/Message/AllInOne/PurchaseRequest.php

@@ -20,6 +20,19 @@ class PurchaseRequest extends AbstractSignatureRequest
      */
     protected $responseClass = PurchaseResponse::class;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array $parameters = []): self
+    {
+        parent::initialize($parameters);
+        $this->setOrderInfo($this->getParameter('orderInfo') ?? '');
+        $this->setExtraData($this->getParameter('extraData') ?? '');
+        $this->setParameter('requestType', 'captureMoMoWallet');
+
+        return $this;
+    }
+
     /**
      * Trả về extra data gửi đến MoMo.
      *
@@ -62,19 +75,6 @@ public function setOrderInfo(string $info): self
         return $this->setParameter('orderInfo', $info);
     }
 
-    /**
-     * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
-     */
-    public function getData(): array
-    {
-        $this->setOrderInfo($this->getParameter('orderInfo') ?? '');
-        $this->setExtraData($this->getParameter('extraData') ?? '');
-        $this->setParameter('requestType', 'captureMoMoWallet');
-
-        return parent::getData();
-    }
-
     /**
      * {@inheritdoc}
      */

src/Message/AllInOne/QueryRefundRequest.php

@@ -22,13 +22,13 @@ class QueryRefundRequest extends AbstractSignatureRequest
 
     /**
      * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
-    public function getData(): array
+    public function initialize(array $parameters = []): self
     {
+        parent::initialize($parameters);
         $this->setParameter('requestType', 'refundStatus');
 
-        return parent::getData();
+        return $this;
     }
 
     /**

src/Message/AllInOne/QueryTransactionRequest.php

@@ -23,11 +23,12 @@ class QueryTransactionRequest extends AbstractSignatureRequest
     /**
      * {@inheritdoc}
      */
-    public function getData(): array
+    public function initialize(array $parameters = []): self
     {
+        parent::initialize($parameters);
         $this->setParameter('requestType', 'transactionStatus');
 
-        return parent::getData();
+        return $this;
     }
 
     /**

src/Message/AllInOne/RefundRequest.php

@@ -20,6 +20,17 @@ class RefundRequest extends AbstractSignatureRequest
      */
     protected $responseClass = RefundResponse::class;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array $parameters = []): self
+    {
+        parent::initialize($parameters);
+        $this->setParameter('requestType', 'refundMoMoWallet');
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -57,17 +68,6 @@ public function setTransId(string $id): self
         return $this->setParameter('transId', $id);
     }
 
-    /**
-     * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
-     */
-    public function getData(): array
-    {
-        $this->setParameter('requestType', 'refundMoMoWallet');
-
-        return parent::getData();
-    }
-
     /**
      * {@inheritdoc}
      */

src/Message/AppInApp/PurchaseRequest.php

@@ -18,12 +18,22 @@ class PurchaseRequest extends AbstractHashRequest
     /**
      * {@inheritdoc}
      */
-    public function getData(): array
+    public function initialize(array $parameters = []): self
     {
-        $this->validate('appData', 'customerNumber');
+        parent::initialize($parameters);
         $this->setParameter('payType', 3);
         $this->setParameter('version', 2);
 
+        return $this;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData(): array
+    {
+        $this->validate('appData', 'customerNumber');
+
         return parent::getData();
     }
 

src/Message/POS/PurchaseRequest.php

@@ -15,15 +15,25 @@
  */
 class PurchaseRequest extends AbstractHashRequest
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array $parameters = []): self
+    {
+        parent::initialize($parameters);
+        $this->setParameter('payType', 3);
+        $this->setParameter('version', 2);
+
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
     public function getData(): array
     {
         $this->validate('paymentCode');
-        $this->setParameter('payType', 3);
-        $this->setParameter('version', 2);
         $parameters = parent::getData();
         unset($parameters['paymentCode']);
 

src/Message/PayQueryStatusRequest.php

@@ -15,13 +15,13 @@ class PayQueryStatusRequest extends AbstractHashRequest
 {
     /**
      * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
      */
-    public function getData(): array
+    public function initialize(array $parameters = []): self
     {
+        parent::initialize($parameters);
         $this->setParameter('version', 2);
 
-        return parent::getData();
+        return $this;
     }
 
     /**

src/Message/PayQueryStatusResponse.php

@@ -32,7 +32,7 @@ public function getTransactionId(): ?string
     /**
      * {@inheritdoc}
      */
-    public function getTransactionReference()
+    public function getTransactionReference(): ?string
     {
         return $this->data['data']['transid'] ?? null;
     }

src/Message/PayRefundRequest.php

@@ -16,11 +16,12 @@ class PayRefundRequest extends AbstractHashRequest
     /**
      * {@inheritdoc}
      */
-    public function getData(): array
+    public function initialize(array $parameters = []): self
     {
+        parent::initialize($parameters);
         $this->setParameter('version', 2);
 
-        return parent::getData();
+        return $this;
     }
 
     /**

src/Message/PayRefundResponse.php

@@ -32,7 +32,7 @@ public function getTransactionId(): ?string
     /**
      * {@inheritdoc}
      */
-    public function getTransactionReference()
+    public function getTransactionReference(): ?string
     {
         return $this->data['transid'] ?? null;
     }