relax some date parser patterns

xabbuh · xabbuh · commit 7d0793a94430 · 2019-07-23T15:19:40.000+02:00
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
@@ -33,7 +33,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function getReverseMatchingRegExp($length)
     {
-        return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';
+        return 1 === $length ? '\d{1,2}' : '\d{1,'.$length.'}';
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/MonthTransformer.php
@@ -104,7 +104,7 @@ public function getReverseMatchingRegExp($length)
                 $regExp = '[JFMASOND]';
                 break;
             default:
-                $regExp = '\d{'.$length.'}';
+                $regExp = '\d{1,'.$length.'}';
                 break;
         }
 
diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/YearTransformer.php
@@ -37,7 +37,7 @@ public function format(\DateTime $dateTime, $length)
      */
     public function getReverseMatchingRegExp($length)
     {
-        return 2 === $length ? '\d{2}' : '\d{4}';
+        return 2 === $length ? '\d{2}' : '\d{1,4}';
     }
 
     /**
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
@@ -618,6 +618,7 @@ public function parseMonthProvider()
     {
         return [
             ['y-M-d', '1970-1-1', 0],
+            ['y-MM-d', '1970-1-1', 0],
             ['y-MMM-d', '1970-Jan-1', 0],
             ['y-MMMM-d', '1970-January-1', 0],
         ];
@@ -636,6 +637,7 @@ public function parseDayProvider()
     {
         return [
             ['y-M-d', '1970-1-1', 0],
+            ['y-M-dd', '1970-1-1', 0],
             ['y-M-dd', '1970-1-01', 0],
             ['y-M-ddd', '1970-1-001', 0],
         ];
diff --git a/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php b/src/Symfony/Component/Intl/Tests/DateFormatter/IntlDateFormatterTest.php
@@ -183,6 +183,17 @@ public function parseQuarterProvider()
         return $this->notImplemented(parent::parseQuarterProvider());
     }
 
+    public function testParseThreeDigitsYears()
+    {
+        if (PHP_INT_SIZE < 8) {
+            $this->markTestSkipped('Parsing three digits years requires a 64bit PHP.');
+        }
+
+        $formatter = $this->getDefaultDateFormatter('yyyy-M-d');
+        $this->assertSame(-32157648000, $formatter->parse('950-12-19'));
+        $this->assertIsIntlSuccess($formatter, 'U_ZERO_ERROR', IntlGlobals::U_ZERO_ERROR);
+    }
+
     protected function getDateFormatter($locale, $datetype, $timetype, $timezone = null, $calendar = IntlDateFormatter::GREGORIAN, $pattern = null)
     {
         return new IntlDateFormatter($locale, $datetype, $timetype, $timezone, $calendar, $pattern);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function format(\DateTime $dateTime, $length)`
`33`	`33`	`*/`
`34`	`34`	`public function getReverseMatchingRegExp($length)`
`35`	`35`	`{`
`36`		`- return 1 === $length ? '\d{1,2}' : '\d{'.$length.'}';`
	`36`	`+ return 1 === $length ? '\d{1,2}' : '\d{1,'.$length.'}';`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function getReverseMatchingRegExp($length)`
`104`	`104`	`$regExp = '[JFMASOND]';`
`105`	`105`	`break;`
`106`	`106`	`default:`
`107`		`- $regExp = '\d{'.$length.'}';`
	`107`	`+ $regExp = '\d{1,'.$length.'}';`
`108`	`108`	`break;`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function format(\DateTime $dateTime, $length)`
`37`	`37`	`*/`
`38`	`38`	`public function getReverseMatchingRegExp($length)`
`39`	`39`	`{`
`40`		`- return 2 === $length ? '\d{2}' : '\d{4}';`
	`40`	`+ return 2 === $length ? '\d{2}' : '\d{1,4}';`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`