expose another method paymentMethodToken instead of using usePaymentMethodToken

Author: bryglen

src/Message/AbstractRequest.php

@@ -269,14 +269,24 @@ public function setTaxExempt($value)
         return $this->setParameter('taxExempt', (bool) $value);
     }
 
-    public function getUsePaymentMethodToken()
+    public function getPaymentMethodToken()
     {
-        return $this->getParameter('usePaymentMethodToken');
+        return $this->getParameter('paymentMethodToken');
     }
 
-    public function setUsePaymentMethodToken($value)
+    public function setPaymentMethodToken($value)
     {
-        return $this->setParameter('usePaymentMethodToken', (bool)$value);
+        return $this->setParameter('paymentMethodToken', $value);
+    }
+
+    public function getPaymentMethodNonce()
+    {
+        return $this->getToken();
+    }
+
+    public function setPaymentMethodNonce($value)
+    {
+        return $this->setToken($value);
     }
 
     /**

src/Message/AuthorizeRequest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -12,7 +13,7 @@ class AuthorizeRequest extends AbstractRequest
 {
     public function getData()
     {
-        $this->validate('amount', 'token');
+        $this->validate('amount');
 
         $data = [
             'amount' => $this->getAmount(),
@@ -40,10 +41,13 @@ public function getData()
             'taxExempt' => $this->getTaxExempt(),
         ];
 
-        if ($this->getUsePaymentMethodToken() === true) {
-            $data['paymentMethodToken'] = $this->getToken();
-        } else {
+        // special validation
+        if ($this->getPaymentMethodToken()) {
+            $data['paymentMethodToken'] = $this->getPaymentMethodToken();
+        } elseif($this->getToken()) {
             $data['paymentMethodNonce'] = $this->getToken();
+        } else {
+            throw new InvalidRequestException("The token (payment nonce) or paymentMethodToken field should be set.");
         }
 
         // Remove null values

tests/Message/AuthorizeRequestTest.php

@@ -51,28 +51,48 @@ public function testGetData()
         $this->assertSame('production', \Braintree_Configuration::environment());
     }
 
-    public function testPaymentToken()
+    public function testPaymentMethodToken()
     {
         $this->request->initialize(
             array(
                 'amount' => '10.00',
-                'token' => 'abc123',
                 'transactionId' => '684',
                 'testMode' => false,
                 'taxExempt' => false,
                 'card' => [
                     'firstName' => 'Kayla',
                     'shippingCompany' => 'League',
                 ],
-                'usePaymentMethodToken' => true
+                'paymentMethodToken' => 'fake-token-123'
             )
         );
 
         $data = $this->request->getData();
-        $this->assertSame('abc123', $data['paymentMethodToken']);
+        $this->assertSame('fake-token-123', $data['paymentMethodToken']);
         $this->assertArrayNotHasKey('paymentMethodNonce', $data);
     }
 
+    public function testPaymentMethodNonce()
+    {
+        $this->request->initialize(
+            array(
+                'amount' => '10.00',
+                'transactionId' => '684',
+                'testMode' => false,
+                'taxExempt' => false,
+                'card' => [
+                    'firstName' => 'Kayla',
+                    'shippingCompany' => 'League',
+                ],
+                'paymentMethodNonce' => 'abc123'
+            )
+        );
+
+        $data = $this->request->getData();
+        $this->assertSame('abc123', $data['paymentMethodNonce']);
+        $this->assertArrayNotHasKey('paymentMethodToken', $data);
+    }
+
     public function testSandboxEnvironment()
     {
         $this->request->setTestMode(true);