Merge pull request #19 from VictorGarcia/patch-1

Fix expire date validation so it allows cards expiring in the current ye...
tonydspaniard · Apr 8, 2014 · 02f7097 · 02f7097
2 parents 25ccdff + ea5f198
commit 02f7097
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/validators/ECCValidator/ECCValidator.php b/validators/ECCValidator/ECCValidator.php
@@ -109,13 +109,15 @@ public function validateNumber($creditCardNumber){
 	 */
 	public function validateDate($creditCardExpiredMonth, $creditCardExpiredYear){
 
-		$currentYear = intval(date('Y'));
+		$currentYear  = intval(date('Y'));
+		$currentMonth = intval(date('m'));
 
 		if(is_scalar($creditCardExpiredMonth)) $creditCardExpiredMonth = intval($creditCardExpiredMonth);
 		if(is_scalar($creditCardExpiredYear)) $creditCardExpiredYear = intval($creditCardExpiredYear);
 
-		return 	is_integer($creditCardExpiredMonth) && $creditCardExpiredMonth >= 1 && $creditCardExpiredMonth <= 12 && 
+		return is_integer($creditCardExpiredMonth) && is_integer($creditCardExpiredYear) && $creditCardExpiredMonth <= 12
-				is_integer( $creditCardExpiredYear ) && $creditCardExpiredYear > $currentYear && $creditCardExpiredYear < $currentYear+10;
+        && ($creditCardExpiredMonth >= 1  && $creditCardExpiredYear > $currentYear
+        && $creditCardExpiredYear < $currentYear + 10) || ($creditCardExpiredYear == $currentYear && $creditCardExpiredMonth >= $currentMonth);
 	}
 	/**
 	 * 
@@ -206,4 +208,4 @@ protected function checkType(){
     	return false;
 
     }
-}
+}