Merge remote-tracking branch 'upstream/master'

Author: Maksim Rafalko

src/Omnipay/Common/Message/AbstractRequest.php

@@ -134,21 +134,21 @@ public function getCard()
 
     public function setCard($value)
     {
-        if (!$value instanceof CreditCard) {
+        if ($value && !$value instanceof CreditCard) {
             $value = new CreditCard($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()

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()