allow two digit representation of a year in year validator

Author: DarkaOnLine

src/ExpirationDateValidator.php

@@ -24,10 +24,28 @@ class ExpirationDateValidator
      */
     public function __construct(string $year, string $month)
     {
-        $this->year = trim($year);
+        $this->setYear($year);
         $this->month = trim($month);
     }
 
+    /**
+     * @param $year
+     *
+     * @return $this
+     */
+    protected function setYear($year)
+    {
+        $year = trim($year);
+
+        if (strlen($year) == 2) {
+            $year = substr(date('Y'), 0, 2) . $year;
+        }
+
+        $this->year = $year;
+
+        return $this;
+    }
+
     /**
      * @param string $year
      * @param string $month
@@ -62,8 +80,10 @@ protected function month()
      */
     protected function isValidYear()
     {
+        $test = '/^'.substr(date('Y'), 0, 2).'\d\d$/';
+
         return $this->year != ''
-            && preg_match('/^20\d\d$/', $this->year);
+            && preg_match($test, $this->year);
     }
 
     /**

tests/Unit/CardExpirationTest.php

@@ -124,8 +124,21 @@ public function it_can_be_called_directly()
         $this->assertFalse(ExpirationDateValidator::validate(date('y'), ''));
         $this->assertFalse(ExpirationDateValidator::validate(' ', ' '));
         $this->assertTrue(ExpirationDateValidator::validate(date('Y'), date('m')));
+        $this->assertTrue(ExpirationDateValidator::validate(date('y'), date('m')));
     }
 
+    /** @test **/
+    public function it_validates_two_digits_year_format()
+    {
+        $validator = Validator::make(
+            ['expiration_year' => date('y')],
+            ['expiration_year' => ['required', new CardExpirationYear(date('m'))]]
+        );
+
+        $this->assertTrue($validator->passes());
+    }
+
+
     /**
      * @param string $year
      *