Add credit card billingCountry

Author: amacneil

src/Omnipay/Common/CreditCard.php

@@ -327,6 +327,16 @@ public function setBillingLastName($value)
         return $this->setParameter('billingLastName', $value);
     }
 
+    public function getBillingCompany()
+    {
+        return $this->getParameter('billingCompany');
+    }
+
+    public function setBillingCompany($value)
+    {
+        return $this->setParameter('billingCompany', $value);
+    }
+
     public function getBillingAddress1()
     {
         return $this->getParameter('billingAddress1');
@@ -604,12 +614,15 @@ public function setPhone($value)
 
     public function getCompany()
     {
-        return $this->getParameter('company');
+        return $this->getParameter('billingCompany');
     }
 
     public function setCompany($value)
     {
-        return $this->setParameter('company', $value);
+        $this->setParameter('billingCompany', $value);
+        $this->setParameter('shippingCompany', $value);
+
+        return $this;
     }
 
     public function getEmail()

tests/Omnipay/Common/CreditCardTest.php

@@ -236,6 +236,13 @@ public function testExpiryYearTwoDigits()
         $this->assertSame(2012, $this->card->getExpiryYear());
     }
 
+    public function testExpiryDate()
+    {
+        $this->assertSame($this->card, $this->card->setExpiryMonth('09'));
+        $this->assertSame($this->card, $this->card->setExpiryYear('2012'));
+        $this->assertSame('092012', $this->card->getExpiryDate('mY'));
+    }
+
     public function testStartMonth()
     {
         $this->card->setStartMonth(9);
@@ -279,6 +286,20 @@ public function testIssueNumber()
         $this->assertSame('12', $this->card->getIssueNumber());
     }
 
+    public function testBillingFirstName()
+    {
+        $this->card->setBillingFirstName('Bob');
+        $this->assertEquals('Bob', $this->card->getBillingFirstName());
+        $this->assertEquals('Bob', $this->card->getFirstName());
+    }
+
+    public function testBillingLastName()
+    {
+        $this->card->setBillingLastName('Smith');
+        $this->assertEquals('Smith', $this->card->getBillingLastName());
+        $this->assertEquals('Smith', $this->card->getLastName());
+    }
+
     public function testBillingName()
     {
         $this->card->setBillingFirstName('Bob');
@@ -290,6 +311,13 @@ public function testBillingName()
         $this->assertEquals('Foo', $this->card->getBillingLastName());
     }
 
+    public function testBillingCompany()
+    {
+        $this->card->setBillingCompany('SuperSoft');
+        $this->assertEquals('SuperSoft', $this->card->getBillingCompany());
+        $this->assertEquals('SuperSoft', $this->card->getCompany());
+    }
+
     public function testBillingAddress1()
     {
         $this->card->setBillingAddress1('31 Spooner St');
@@ -339,17 +367,6 @@ 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');
@@ -362,6 +379,17 @@ public function testShippingLastName()
         $this->assertEquals('Doctor', $this->card->getShippingLastName());
     }
 
+    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 testShippingCompany()
     {
         $this->card->setShippingCompany('SuperSoft');
@@ -410,6 +438,14 @@ public function testShippingPhone()
         $this->assertEquals('12345', $this->card->getShippingPhone());
     }
 
+    public function testCompany()
+    {
+        $this->card->setCompany('FooBar');
+        $this->assertEquals('FooBar', $this->card->getCompany());
+        $this->assertEquals('FooBar', $this->card->getBillingCompany());
+        $this->assertEquals('FooBar', $this->card->getShippingCompany());
+    }
+
     public function testAddress1()
     {
         $this->card->setAddress1('31 Spooner St');
@@ -466,12 +502,6 @@ 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]');