Added base AbstractIncomingRequest

Author: vuongxuongminh

src/Message/AbstractIncomingRequest.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * @link https://github.com/phpviet/omnipay-momo
+ * @copyright (c) PHP Viet
+ * @license [MIT](http://www.opensource.org/licenses/MIT)
+ */
+
+namespace Omnipay\MoMo\Message;
+
+use Omnipay\Common\Message\AbstractRequest;
+
+/**
+ * @author Vuong Minh <[email protected]>
+ * @since 1.0.0
+ */
+abstract class AbstractIncomingRequest extends AbstractRequest
+{
+    use Concerns\IncomingRequestParameters;
+
+    /**
+     * {@inheritdoc}
+     * @throws \Omnipay\Common\Exception\InvalidRequestException
+     */
+    public function getData(): array
+    {
+        $this->validate(array_keys($parameters = $this->getParameters()));
+
+        return $parameters;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function initialize(array $parameters = []): self
+    {
+        $this->parameters->replace($this->getIncomingParameters());
+
+        return $this;
+    }
+}

src/Message/AllInOne/AbstractIncomingRequest.php

@@ -7,34 +7,13 @@
 
 namespace Omnipay\MoMo\Message\AllInOne;
 
-use Omnipay\Common\Message\AbstractRequest;
+use Omnipay\MoMo\Message\AbstractIncomingRequest as BaseAbstractIncomingRequest;
 
 /**
  * @author Vuong Minh <[email protected]>
  * @since 1.0.0
  */
-abstract class AbstractIncomingRequest extends AbstractRequest
+abstract class AbstractIncomingRequest extends BaseAbstractIncomingRequest
 {
-    use Concerns\IncomingRequestParameters;
-
-    /**
-     * {@inheritdoc}
-     * @throws \Omnipay\Common\Exception\InvalidRequestException
-     */
-    public function getData(): array
-    {
-        $this->validate(array_keys($parameters = $this->getParameters()));
-
-        return $parameters;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function initialize(array $parameters = []): self
-    {
-        $this->parameters->replace($this->getIncomingParameters());
-
-        return $this;
-    }
+    use Concerns\RequestParameters;
 }

src/Message/AllInOne/Concerns/IncomingRequestParameters.php renamed to src/Message/Concerns/IncomingRequestParameters.php

@@ -5,7 +5,7 @@
  * @license [MIT](http://www.opensource.org/licenses/MIT)
  */
 
-namespace Omnipay\MoMo\Message\AllInOne\Concerns;
+namespace Omnipay\MoMo\Message\Concerns;
 
 use Symfony\Component\HttpFoundation\ParameterBag;
 
@@ -15,8 +15,6 @@
  */
 trait IncomingRequestParameters
 {
-    use RequestParameters;
-
     /**
      * {@inheritdoc}
      */