Add/update CreditCard methods for consistency. Update tests

Author: Peter

src/Omnipay/Common/CreditCard.php

@@ -149,34 +149,39 @@ public function validate()
 
     public function getFirstName()
     {
-        return $this->getParameter('firstName');
+        return $this->getBillingFirstName();
     }
 
     public function setFirstName($value)
     {
-        return $this->setParameter('firstName', $value);
+        $this->setBillingFirstName($value);
+        $this->setShippingFirstName($value);
+
+        return $this;
     }
 
     public function getLastName()
     {
-        return $this->getParameter('lastName');
+        return $this->getBillingLastName();
     }
 
     public function setLastName($value)
     {
-        return $this->setParameter('lastName', $value);
+        $this->setBillingLastName($value);
+        $this->setShippingLastName($value);
+
+        return $this;
     }
 
     public function getName()
     {
-        return trim($this->getFirstName().' '.$this->getLastName());
+        return $this->getBillingName();
     }
 
     public function setName($value)
     {
-        $names = explode(' ', $value, 2);
-        $this->setParameter('firstName', $names[0]);
-        $this->setParameter('lastName', isset($names[1]) ? $names[1] : null);
+        $this->setBillingName($value);
+        $this->setShippingName($value);
 
         return $this;
     }
@@ -288,6 +293,40 @@ public function setIssueNumber($value)
         return $this->setParameter('issueNumber', $value);
     }
 
+    public function getBillingName()
+    {
+        return trim($this->getBillingFirstName() . ' ' . $this->getBillingLastName());
+    }
+
+    public function setBillingName($value)
+    {
+        $names = explode(' ', $value, 2);
+        $this->setBillingFirstName($names[0]);
+        $this->setBillingLastName(isset($names[1]) ? $names[1] : null);
+
+        return $this;
+    }
+
+    public function getBillingFirstName()
+    {
+        return $this->getParameter('billingFirstName');
+    }
+
+    public function setBillingFirstName($value)
+    {
+        return $this->setParameter('billingFirstName', $value);
+    }
+
+    public function getBillingLastName()
+    {
+        return $this->getParameter('billingLastName');
+    }
+
+    public function setBillingLastName($value)
+    {
+        return $this->setParameter('billingLastName', $value);
+    }
+
     public function getBillingAddress1()
     {
         return $this->getParameter('billingAddress1');
@@ -358,6 +397,20 @@ public function setBillingPhone($value)
         return $this->setParameter('billingPhone', $value);
     }
 
+    public function getShippingName()
+    {
+        return trim($this->getShippingFirstName() . ' ' . $this->getShippingLastName());
+    }
+
+    public function setShippingName($value)
+    {
+        $names = explode(' ', $value, 2);
+        $this->setShippingFirstName($names[0]);
+        $this->setShippingLastName(isset($names[1]) ? $names[1] : null);
+
+        return $this;
+    }
+
     public function getShippingFirstName()
     {
         return $this->getParameter('shippingFirstName');

tests/Omnipay/Common/CreditCardTest.php

@@ -49,8 +49,8 @@ public function testGetParamters()
         ));
 
         $parameters = $card->getParameters();
-        $this->assertSame('Example', $parameters['firstName']);
-        $this->assertSame('Customer', $parameters['lastName']);
+        $this->assertSame('Example', $parameters['billingFirstName']);
+        $this->assertSame('Customer', $parameters['billingLastName']);
         $this->assertSame('1234', $parameters['number']);
         $this->assertSame(6, $parameters['expiryMonth']);
         $this->assertSame(2016, $parameters['expiryYear']);
@@ -260,6 +260,13 @@ public function testStartYearTwoDigits()
         $this->assertSame(2012, $this->card->getStartYear());
     }
 
+    public function testStartDate()
+    {
+        $this->card->setStartMonth('11');
+        $this->card->setStartYear('2012');
+        $this->assertEquals('112012', $this->card->getStartDate('mY'));
+    }
+
     public function testCvv()
     {
         $this->card->setCvv('456');
@@ -272,6 +279,17 @@ public function testIssueNumber()
         $this->assertSame('12', $this->card->getIssueNumber());
     }
 
+    public function testBillingName()
+    {
+        $this->card->setBillingFirstName('Bob');
+        $this->card->setBillingLastName('Smith');
+        $this->assertEquals('Bob Smith', $this->card->getBillingName());
+
+        $this->card->setBillingName('John Foo');
+        $this->assertEquals('John', $this->card->getBillingFirstName());
+        $this->assertEquals('Foo', $this->card->getBillingLastName());
+    }
+
     public function testBillingAddress1()
     {
         $this->card->setBillingAddress1('31 Spooner St');
@@ -321,16 +339,27 @@ public function testBillingPhone()
         $this->assertSame('12345', $this->card->getPhone());
     }
 
+    public function testShippingName()
+    {
+        $this->card->setShippingFirstName('Bob');
+        $this->card->setShippingLastName('Smith');
+        $this->assertEquals('Bob Smith', $this->card->getShippingName());
+
+        $this->card->setShippingName('John Foo');
+        $this->assertEquals('John', $this->card->getShippingFirstName());
+        $this->assertEquals('Foo', $this->card->getShippingLastName());
+    }
+
     public function testShippingFirstName()
     {
-        $this->card->setShippingFirstName('James Bond');
-        $this->assertEquals('James Bond', $this->card->getShippingFirstName());
+        $this->card->setShippingFirstName('James');
+        $this->assertEquals('James', $this->card->getShippingFirstName());
     }
 
     public function testShippingLastName()
     {
-        $this->card->setShippingLastName('Doctor No');
-        $this->assertEquals('Doctor No', $this->card->getShippingLastName());
+        $this->card->setShippingLastName('Doctor');
+        $this->assertEquals('Doctor', $this->card->getShippingLastName());
     }
 
     public function testShippingCompany()
@@ -437,6 +466,12 @@ public function testPhone()
         $this->assertEquals('12345', $this->card->getShippingPhone());
     }
 
+    public function testCompany()
+    {
+        $this->card->setCompany('FooBar');
+        $this->assertEquals('FooBar', $this->card->getCompany());
+    }
+
     public function testEmail()
     {
         $this->card->setEmail('[email protected]');