Merge pull request #170 from artspeople/issue-169

Clarify exception message for credit cards

Author: delatbabel

src/Common/CreditCard.php

@@ -274,9 +274,15 @@ protected function setYearParameter($key, $value)
      */
     public function validate()
     {
-        foreach (array('number', 'expiryMonth', 'expiryYear') as $key) {
+        $requiredParameters = array(
+            'number' => 'credit card number',
+            'expiryMonth' => 'expiration month',
+            'expiryYear' => 'expiration year'
+        );
+
+        foreach ($requiredParameters as $key => $val) {
             if (!$this->getParameter($key)) {
-                throw new InvalidCreditCardException("The $key parameter is required");
+                throw new InvalidCreditCardException("The $val is required");
             }
         }
 

tests/Omnipay/Common/CreditCardTest.php

@@ -57,7 +57,7 @@ public function testValidateFixture()
 
     /**
      * @expectedException \Omnipay\Common\Exception\InvalidCreditCardException
-     * @expectedExceptionMessage The number parameter is required
+     * @expectedExceptionMessage The credit card number is required
      */
     public function testValidateNumberRequired()
     {
@@ -67,7 +67,7 @@ public function testValidateNumberRequired()
 
     /**
      * @expectedException \Omnipay\Common\Exception\InvalidCreditCardException
-     * @expectedExceptionMessage The expiryMonth parameter is required
+     * @expectedExceptionMessage The expiration month is required
      */
     public function testValidateExpiryMonthRequired()
     {
@@ -77,7 +77,7 @@ public function testValidateExpiryMonthRequired()
 
     /**
      * @expectedException \Omnipay\Common\Exception\InvalidCreditCardException
-     * @expectedExceptionMessage The expiryYear parameter is required
+     * @expectedExceptionMessage The expiration year is required
      */
     public function testValidateExpiryYearRequired()
     {