Rename Stripe cardToken parameter to token

Author: amacneil

src/Omnipay/Common/Message/AbstractRequest.php

@@ -141,14 +141,14 @@ public function setCard($value)
         return $this->setParameter('card', $value);
     }
 
-    public function getCardToken()
+    public function getToken()
     {
-        return $this->getParameter('cardToken');
+        return $this->getParameter('token');
     }
 
-    public function setCardToken($value)
+    public function setToken($value)
     {
-        return $this->setParameter('cardToken', $value);
+        return $this->setParameter('token', $value);
     }
 
     public function getCardReference()

src/Omnipay/Stripe/Message/AbstractRequest.php

@@ -28,6 +28,22 @@ public function setApiKey($value)
         return $this->setParameter('apiKey', $value);
     }
 
+    /**
+     * @deprecated
+     */
+    public function getCardToken()
+    {
+        return $this->getParameter('token');
+    }
+
+    /**
+     * @deprecated
+     */
+    public function setCardToken($value)
+    {
+        return $this->setParameter('token', $value);
+    }
+
     abstract public function getEndpoint();
 
     public function getHttpMethod()

src/Omnipay/Stripe/Message/AuthorizeRequest.php

@@ -28,12 +28,12 @@ public function getData()
 
         if ($this->getCardReference()) {
             $data['customer'] = $this->getCardReference();
-        } elseif ($this->getCardToken()) {
-            $data['card'] = $this->getCardToken();
+        } elseif ($this->getToken()) {
+            $data['card'] = $this->getToken();
         } elseif ($this->getCard()) {
             $data['card'] = $this->getCardData();
         } else {
-            // one of cardReference, cardToken, or card is required
+            // one of cardReference, token, or card is required
             $this->validate('card');
         }
 

src/Omnipay/Stripe/Message/CreateCardRequest.php

@@ -21,13 +21,13 @@ public function getData()
         $data = array();
         $data['description'] = $this->getDescription();
 
-        if ($this->getCardToken()) {
-            $data['card'] = $this->getCardToken();
+        if ($this->getToken()) {
+            $data['card'] = $this->getToken();
         } elseif ($this->getCard()) {
             $data['card'] = $this->getCardData();
             $data['email'] = $this->getCard()->getEmail();
         } else {
-            // one of cardToken, or card is required
+            // one of token or card is required
             $this->validate('card');
         }
 

src/Omnipay/Stripe/Message/UpdateCardRequest.php

@@ -21,8 +21,8 @@ public function getData()
         $data = array();
         $data['description'] = $this->getDescription();
 
-        if ($this->getCardToken()) {
-            $data['card'] = $this->getCardToken();
+        if ($this->getToken()) {
+            $data['card'] = $this->getToken();
         } elseif ($this->getCard()) {
             $data['card'] = $this->getCardData();
             $data['email'] = $this->getCard()->getEmail();

tests/Omnipay/Common/Message/AbstractRequestTest.php

@@ -47,10 +47,10 @@ public function testSetCardWithArray()
         $this->assertSame('1234', $card->getNumber());
     }
 
-    public function testCardToken()
+    public function testToken()
     {
-        $this->assertSame($this->request, $this->request->setCardToken('12345'));
-        $this->assertSame('12345', $this->request->getCardToken());
+        $this->assertSame($this->request, $this->request->setToken('12345'));
+        $this->assertSame('12345', $this->request->getToken());
     }
 
     public function testCardReference()

tests/Omnipay/Stripe/Message/AuthorizeRequestTest.php

@@ -51,9 +51,9 @@ public function testDataWithCardReference()
         $this->assertSame('xyz', $data['customer']);
     }
 
-    public function testDataWithCardToken()
+    public function testDataWithToken()
     {
-        $this->request->setCardToken('xyz');
+        $this->request->setToken('xyz');
         $data = $this->request->getData();
 
         $this->assertSame('xyz', $data['card']);

tests/Omnipay/Stripe/Message/CreateCardRequestTest.php

@@ -36,9 +36,9 @@ public function testCard()
         $this->request->getData();
     }
 
-    public function testDataWithCardToken()
+    public function testDataWithToken()
     {
-        $this->request->setCardToken('xyz');
+        $this->request->setToken('xyz');
         $data = $this->request->getData();
 
         $this->assertSame('xyz', $data['card']);

tests/Omnipay/Stripe/Message/UpdateCardRequestTest.php

@@ -26,9 +26,9 @@ public function testEndpoint()
         $this->assertSame('https://api.stripe.com/v1/customers/cus_1MZSEtqSghKx99', $this->request->getEndpoint());
     }
 
-    public function testDataWithCardToken()
+    public function testDataWithToken()
     {
-        $this->request->setCardToken('xyz');
+        $this->request->setToken('xyz');
         $data = $this->request->getData();
 
         $this->assertSame('xyz', $data['card']);