Omnipay 3 and Three Step Redirect support

composer.json

@@ -26,14 +26,14 @@
         "psr-4": { "Omnipay\\NMI\\" : "src/" }
     },
     "require": {
-        "omnipay/common": "~2.0"
+        "omnipay/common": "^3"
     },
     "require-dev": {
-        "omnipay/tests": "~2.0"
+        "omnipay/tests": "^3"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "3.0.x-dev"
         }
     }
 }

src/DirectPostGateway.php

@@ -363,7 +363,7 @@ public function credit(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\CreateCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostCreateCardRequest
      */
     public function createCard(array $parameters = array())
     {
@@ -372,7 +372,7 @@ public function createCard(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\UpdateCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostUpdateCardRequest
      */
     public function updateCard(array $parameters = array())
     {
@@ -381,7 +381,7 @@ public function updateCard(array $parameters = array())
 
     /**
      * @param array $parameters
-     * @return \Omnipay\NMI\Message\DeleteCardRequest
+     * @return \Omnipay\NMI\Message\DirectPostDeleteCardRequest
      */
     public function deleteCard(array $parameters = array())
     {

src/Message/AbstractRequest.php

@@ -326,9 +326,14 @@ protected function getShippingData()
 
     public function sendData($data)
     {
-        $httpResponse = $this->httpClient->post($this->getEndpoint(), null, $data)->send();
+        $httpResponse = $this->httpClient->request(
+            'POST',
+            $this->getEndpoint(),
+            ['Content-Type' => 'application/x-www-form-urlencoded'],
+            http_build_query($data, '', '&')
+        );
 
-        return $this->response = new DirectPostResponse($this, $httpResponse->getBody());
+        return $this->response = new DirectPostResponse($this, $httpResponse->getBody()->getContents());
     }
 
     public function setEndpoint($value)
@@ -338,6 +343,6 @@ public function setEndpoint($value)
 
     public function getEndpoint()
     {
-        return $this->endpoint;
+        return $this->getParameter('endpoint') ?: $this->endpoint;
     }
 }

src/Message/DirectPostAuthRequest.php

@@ -8,13 +8,105 @@ class DirectPostAuthRequest extends AbstractRequest
 {
     protected $type = 'auth';
 
+    /**
+     * @return string
+     */
+    public function getMerchantDefinedField_1()
+    {
+        return $this->getParameter('merchant_defined_field_1');
+    }
+
+    /**
+     * Sets the first merchant defined field.
+     *
+     * @param string
+     * @return AbstractRequest Provides a fluent interface
+     */
+    public function setMerchantDefinedField_1($value)
+    {
+        return $this->setParameter('merchant_defined_field_1', $value);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMerchantDefinedField_2()
+    {
+        return $this->getParameter('merchant_defined_field_2');
+    }
+
+    /**
+     * Sets the second merchant defined field.
+     *
+     * @param string
+     * @return AbstractRequest Provides a fluent interface
+     */
+    public function setMerchantDefinedField_2($value)
+    {
+        return $this->setParameter('merchant_defined_field_2', $value);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMerchantDefinedField_3()
+    {
+        return $this->getParameter('merchant_defined_field_3');
+    }
+
+    /**
+     * Sets the third merchant defined field.
+     *
+     * @param string
+     * @return AbstractRequest Provides a fluent interface
+     */
+    public function setMerchantDefinedField_3($value)
+    {
+        return $this->setParameter('merchant_defined_field_3', $value);
+    }
+
+    /**
+     * @return string
+     */
+    public function getMerchantDefinedField_4()
+    {
+        return $this->getParameter('merchant_defined_field_4');
+    }
+
+    /**
+     * Sets the fourth merchant defined field.
+     *
+     * @param string
+     * @return AbstractRequest Provides a fluent interface
+     */
+    public function setMerchantDefinedField_4($value)
+    {
+        return $this->setParameter('merchant_defined_field_4', $value);
+    }
+
     public function getData()
     {
         $this->validate('amount');
 
         $data = $this->getBaseData();
         $data['amount'] = $this->getAmount();
 
+        if ($this->getMerchantDefinedField_1()) {
+            $data['merchant_defined_field_1'] = $this->getMerchantDefinedField_1();
+        }
+
+        if ($this->getMerchantDefinedField_2()) {
+            $data['merchant_defined_field_2'] = $this->getMerchantDefinedField_2();
+        }
+
+        if ($this->getMerchantDefinedField_3()) {
+            $data['merchant_defined_field_3'] = $this->getMerchantDefinedField_3();
+        }
+
+        if ($this->getMerchantDefinedField_4()) {
+            $data['merchant_defined_field_4'] = $this->getMerchantDefinedField_4();
+        }
+
         if ($this->getCardReference()) {
             $data['customer_vault_id'] = $this->getCardReference();