Completed AIO test cases.

Author: vuongxuongminh

src/AppInAppGateway.php

@@ -7,6 +7,13 @@
 
 namespace Omnipay\MoMo;
 
-class AppInAppGateway
+use Omnipay\Common\AbstractGateway;
+
+/**
+ * @author Vuong Minh <[email protected]>
+ * @since 1.0.0
+ */
+class AppInAppGateway extends AbstractGateway
 {
+    use Concerns\Parameters;
 }

src/Concerns/PosParameters.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-momo
+ * @copyright (c) PHP Viet
+ * @license [MIT](http://www.opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\MoMo\Concerns;
+
+/**
+ * @author Vuong Minh <[email protected]>
+ * @since 1.0.0
+ */
+trait PosParameters
+{
+    use Parameters;
+
+    /**
+     * Thiết lập public key do MoMo cấp.
+     *
+     * @param  string  $key
+     */
+    public function setPublicKey($key): void
+    {
+        $this->setParameter('publicKey', $key);
+    }
+}

src/Message/AbstractRequest.php

@@ -16,4 +16,29 @@
 abstract class AbstractRequest extends BaseAbstractRequest
 {
     use Concerns\RequestEndpoint;
+    use Concerns\RequestSignature;
+
+    /**
+     * {@inheritdoc}
+     * @throws \Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function getData(): array
+    {
+        $parameters = $this->getParameters();
+        call_user_func_array([$this, 'validate'], $this->getSignatureParameters());
+        $parameters['signature'] = $this->generateSignature();
+        unset($parameters['secretKey'], $parameters['testMode']);
+
+        return $parameters;
+    }
+
+    /**
+     * Thiết lập request id của đơn hàng.
+     *
+     * @param  string  $id
+     */
+    public function setRequestId(string $id): void
+    {
+        $this->setParameter('requestId', $id);
+    }
 }

src/Message/AbstractResponse.php

@@ -7,6 +7,7 @@
 
 namespace Omnipay\MoMo\Message;
 
+use Omnipay\Common\Message\RequestInterface;
 use Omnipay\Common\Message\AbstractResponse as BaseAbstractResponse;
 
 /**
@@ -15,20 +16,32 @@
  */
 abstract class AbstractResponse extends BaseAbstractResponse
 {
+    use Concerns\ResponseProperties;
+    use Concerns\ResponseSignatureValidation;
+
     /**
-     * Phương thức hổ trợ tạo các thuộc tính của đối tượng từ dữ liệu gửi về từ MoMo.
+     * Khởi tạo đối tượng Response.
      *
-     * @param  string  $name
-     * @return null|string
+     * @param  \Omnipay\Common\Message\RequestInterface  $request
+     * @param $data
+     * @throws \Omnipay\Common\Exception\InvalidResponseException
      */
-    public function __get($name)
+    public function __construct(RequestInterface $request, $data)
     {
-        if (isset($this->data[$name])) {
-            return $this->data[$name];
-        } else {
-            trigger_error(sprintf('Undefined property: %s::%s', __CLASS__, '$'.$name), E_USER_NOTICE);
+        parent::__construct($request, $data);
 
-            return null;
+        if ('0' === $this->getCode()) {
+            $this->validateSignature();
         }
     }
+
+    /**
+     * Trả về trạng thái do MoMo phản hồi.
+     *
+     * @return bool
+     */
+    public function isSuccessful(): bool
+    {
+        return '0' === $this->getCode();
+    }
 }

src/Message/AllInOne/AbstractIncomingRequest.php

@@ -7,6 +7,8 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
+use Omnipay\MoMo\Concerns\AllInOneParameters;
+use Symfony\Component\HttpFoundation\ParameterBag;
 use Omnipay\MoMo\Message\AbstractIncomingRequest as BaseAbstractIncomingRequest;
 
 /**
@@ -15,7 +17,7 @@
  */
 abstract class AbstractIncomingRequest extends BaseAbstractIncomingRequest
 {
-    use Concerns\IncomingRequestParameters;
+    use AllInOneParameters;
 
     /**
      * {@inheritdoc}
@@ -25,4 +27,30 @@ public function sendData($data): IncomingResponse
     {
         return $this->response = new IncomingResponse($this, $data);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getIncomingParameters(): array
+    {
+        $data = [];
+        $params = [
+            'partnerCode', 'accessKey', 'requestId', 'amount', 'orderId', 'orderInfo', 'orderType', 'transId',
+            'message', 'localMessage', 'responseTime', 'errorCode', 'extraData', 'signature', 'payType',
+        ];
+        $bag = $this->getIncomingParametersBag();
+
+        foreach ($params as $param) {
+            $data[$param] = $bag->get($param);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Trả về request parameter bag.
+     *
+     * @return \Symfony\Component\HttpFoundation\ParameterBag
+     */
+    abstract protected function getIncomingParametersBag(): ParameterBag;
 }

src/Message/AllInOne/AbstractRequest.php

@@ -7,6 +7,7 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
+use Omnipay\MoMo\Concerns\AllInOneParameters;
 use Omnipay\MoMo\Message\AbstractRequest as BaseAbstractRequest;
 
 /**
@@ -15,28 +16,23 @@
  */
 abstract class AbstractRequest extends BaseAbstractRequest
 {
-    use Concerns\RequestSignature;
-    use Concerns\RequestParameters;
+    use AllInOneParameters;
 
     /**
      * Trả về lớp đối tượng phản hồi tương ứng của Request.
      *
      * @var string
      */
-    protected $responseClass = Response::class;
+    protected $responseClass;
 
     /**
-     * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
+     * Thiết lập id đơn hàng.
+     *
+     * @param  string  $id
      */
-    public function getData(): array
+    public function setOrderId(string $id): void
     {
-        $parameters = $this->getParameters();
-        unset($parameters['secretKey'], $parameters['testMode']);
-        $this->validate('partnerCode', 'accessKey', 'requestId', 'orderId', 'secretKey', 'requestType');
-        $parameters['signature'] = $this->generateSignature();
-
-        return $parameters;
+        $this->setParameter('orderId', $id);
     }
 
     /**

src/Message/AllInOne/Response.php renamed to src/Message/AllInOne/AbstractResponse.php

@@ -7,43 +7,14 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
-use Omnipay\MoMo\Message\AbstractResponse;
-use Omnipay\Common\Message\RequestInterface;
+use Omnipay\MoMo\Message\AbstractResponse as BaseAbstractResponse;
 
 /**
  * @author Vuong Minh <[email protected]>
  * @since 1.0.0
  */
-class Response extends AbstractResponse
+abstract class AbstractResponse extends BaseAbstractResponse
 {
-    use Concerns\ResponseSignatureValidation;
-
-    /**
-     * Khởi tạo đối tượng Response.
-     *
-     * @param  \Omnipay\Common\Message\RequestInterface  $request
-     * @param $data
-     * @throws \Omnipay\Common\Exception\InvalidResponseException
-     */
-    public function __construct(RequestInterface $request, $data)
-    {
-        parent::__construct($request, $data);
-
-        if ('0' === $this->getCode()) {
-            $this->validateSignature();
-        }
-    }
-
-    /**
-     * Trả về trạng thái do MoMo phản hồi.
-     *
-     * @return bool
-     */
-    public function isSuccessful(): bool
-    {
-        return '0' === $this->getCode();
-    }
-
     /**
      * Trả về thông báo từ MoMo.
      *