From 7d0793a94430ae83e67dae8fdf310bde61d2ed73 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@sensiolabs.de>
Date: Tue, 23 Jul 2019 14:07:40 +0200
Subject: [PATCH] relax some date parser patterns

---
 .../Intl/DateFormatter/DateFormat/DayTransformer.php  |  2 +-
 .../DateFormatter/DateFormat/MonthTransformer.php     |  2 +-
 .../Intl/DateFormatter/DateFormat/YearTransformer.php |  2 +-
 .../DateFormatter/AbstractIntlDateFormatterTest.php   |  2 ++
 .../Tests/DateFormatter/IntlDateFormatterTest.php     | 11 +++++++++++
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php b/src/Symfony/Component/Intl/DateFormatter/DateFormat/DayTransformer.php
index c07855df1c8de..8e805baff8608 100644
--- 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
index 40ab1d67d7290..04be7858c241f 100644
--- 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
index 043e6f321c2f9..a892c664af59d 100644
--- 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
index a1ade6a42b55e..e472000974a6f 100644
--- 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
index 03c69d27c4930..29f8918be8b7f 100644
--- 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);