ExpirationDateValidator

Author: DarkaOnLine

README.md

@@ -97,7 +97,13 @@ $request->validate(
 ```
 #### Directly
 ```php
-LVR\CreditCard\Cards\Card::isValidExpirationDate(
+LVR\CreditCard\Cards\ExpirationDateValidator(
+    $expiration_year,
+    $expiration_month
+)->isValid();
+
+// Or static
+LVR\CreditCard\Cards\ExpirationDateValidator::validate(
     $expiration_year,
     $expiration_month
 );

composer.json

@@ -7,7 +7,8 @@
         "illuminate/translation": "^5.5"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "~2.6",
+        "php": ">=7.0.0",
+        "friendsofphp/php-cs-fixer": "2.5.*",
         "phpunit/phpunit": "6.2.*",
         "orchestra/testbench": "^3.5"
     },

composer.lock

@@ -2,8 +2,7 @@
 
 namespace LVR\CreditCard;
 
-use Illuminate\Support\Carbon;
-use LVR\CreditCard\Cards\Card;
+use Carbon\Carbon;
 use Illuminate\Contracts\Validation\Rule;
 
 class CardExpirationDate implements Rule
@@ -44,7 +43,8 @@ public function passes($attribute, $value)
         try {
             $date = Carbon::createFromFormat($this->format, $value);
 
-            return Card::isValidExpirationDate($date->year, $date->month);
+            return (new ExpirationDateValidator($date->year, $date->month))
+                ->isValid();
         } catch (\InvalidArgumentException $ex) {
             $this->message = static::MSG_CARD_EXPIRATION_DATE_FORMAT_INVALID;
 

src/CardExpirationDate.php

@@ -2,7 +2,6 @@
 
 namespace LVR\CreditCard;
 
-use LVR\CreditCard\Cards\Card;
 use Illuminate\Contracts\Validation\Rule;
 
 class CardExpirationMonth implements Rule
@@ -36,7 +35,12 @@ public function __construct(string $year)
      */
     public function passes($attribute, $value)
     {
-        return Card::isValidExpirationDate($this->year, $value);
+        try {
+            return (new ExpirationDateValidator($this->year, $value))
+                ->isValid();
+        } catch (\Exception $e) {
+            return false;
+        };
     }
 
     /**

src/CardExpirationMonth.php

@@ -2,7 +2,6 @@
 
 namespace LVR\CreditCard;
 
-use LVR\CreditCard\Cards\Card;
 use Illuminate\Contracts\Validation\Rule;
 
 class CardExpirationYear implements Rule
@@ -36,7 +35,12 @@ public function __construct(string $month)
      */
     public function passes($attribute, $value)
     {
-        return Card::isValidExpirationDate($value, $this->month);
+        try {
+            return (new ExpirationDateValidator($value, $this->month))
+                ->isValid();
+        } catch (\Exception $e) {
+            return false;
+        };
     }
 
     /**

src/CardExpirationYear.php

@@ -158,36 +158,6 @@ public static function isValidCvcLength($cvc, array $available_lengths = [3, 4])
             && in_array(strlen($cvc), $available_lengths, true);
     }
 
-    /**
-     * @param string $year
-     * @param string $month
-     *
-     * @return bool
-     */
-    public static function isValidExpirationDate(string $year, string $month)
-    {
-        if ($year == '' || $month == '') {
-            return false;
-        }
-
-        $month = str_pad($month, 2, '0', STR_PAD_LEFT);
-
-        if (! preg_match('/^20\d\d$/', $year)) {
-            return false;
-        }
-
-        if (! preg_match('/^(0[1-9]|1[0-2])$/', $month)) {
-            return false;
-        }
-
-        // past date
-        if ($year < date('Y') || $year == date('Y') && $month < date('m')) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * @throws \LVR\CreditCard\Exceptions\CreditCardException
      */

src/Cards/Card.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace LVR\CreditCard\Exceptions;
+
+class CreditCardExpirationDateException extends CreditCardException
+{
+}

src/Exceptions/CreditCardExpirationDateException.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace LVR\CreditCard;
+
+use Carbon\Carbon;
+use LVR\CreditCard\Exceptions\CreditCardExpirationDateException;
+
+class ExpirationDateValidator
+{
+    /**
+     * @var string
+     */
+    protected $year;
+
+    /**
+     * @var string
+     */
+    protected $month;
+
+    /**
+     * ExpirationDateValidator constructor.
+     *
+     * @param string $year
+     * @param string $month
+     *
+     * @throws \LVR\CreditCard\Exceptions\CreditCardExpirationDateException
+     */
+    public function __construct(string $year, string $month)
+    {
+        if ($year == '' || $month == '') {
+            throw new CreditCardExpirationDateException;
+        }
+
+        $this->year = $year;
+        $this->month = str_pad($month, 2, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * @param string $year
+     * @param string $month
+     *
+     * @return mixed
+     */
+    public static function validate(string $year, string $month)
+    {
+        return (new static($year, $month))->isValid();
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid()
+    {
+        return $this->isValidYear()
+            && $this->isValidMonth()
+            && $this->isFeatureDate();
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isValidYear()
+    {
+        return (bool) preg_match('/^20\d\d$/', $this->year);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isValidMonth()
+    {
+        return (bool) preg_match('/^(0[1-9]|1[0-2])$/', $this->month);
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isFeatureDate()
+    {
+        return Carbon::now()->startOfDay()->lte(
+            Carbon::createFromFormat('Y-m', $this->year.'-'.$this->month)->endOfDay()
+        );
+    }
+}

src/ExpirationDateValidator.php

@@ -3,6 +3,8 @@
 namespace LVR\CreditCard\Tests\Unit;
 
 use LVR\CreditCard\Cards\Card;
+use LVR\CreditCard\Exceptions\CreditCardExpirationDateException;
+use LVR\CreditCard\ExpirationDateValidator;
 use LVR\CreditCard\Tests\TestCase;
 use LVR\CreditCard\CardExpirationDate;
 use LVR\CreditCard\CardExpirationYear;
@@ -118,12 +120,31 @@ public function it_checks_expiration_date()
     /** @test **/
     public function it_can_be_called_directly()
     {
-        $this->assertTrue(Card::isValidExpirationDate(date('Y'), date('m')));
-        $this->assertFalse(Card::isValidExpirationDate('', ''));
-        $this->assertFalse(Card::isValidExpirationDate('', date('m')));
-        $this->assertFalse(Card::isValidExpirationDate(date('Y'), ''));
+        $this->assertTrue(ExpirationDateValidator::validate(date('Y'), date('m')));
     }
 
+    /** @test **/
+    public function it_throws_exception_if_year_is_empty()
+    {
+        $this->expectException(CreditCardExpirationDateException::class);
+        $this->assertFalse(ExpirationDateValidator::validate('', date('m')));
+    }
+
+    /** @test **/
+    public function it_throws_exception_if_month_is_empty()
+    {
+        $this->expectException(CreditCardExpirationDateException::class);
+        $this->assertFalse(ExpirationDateValidator::validate(date('y'), ''));
+    }
+
+    /** @test **/
+    public function it_throws_exception_if_year_and_month_is_empty()
+    {
+        $this->expectException(CreditCardExpirationDateException::class);
+        $this->assertFalse(ExpirationDateValidator::validate('', ''));
+    }
+
+
     /**
      * @param string $year
      *