Allow disabling lenient IntlDateFormatter parsing

Author: othercorey

src/I18n/DateFormatTrait.php

@@ -42,6 +42,15 @@ trait DateFormatTrait
      */
     protected static $defaultLocale;
 
+    /**
+     * Whether the IntlDateFormatter is set to lenient for parsing.
+     *
+     * Defaults to null which uses IntlDateFormatter default (true).
+     *
+     * @var bool|null
+     */
+    protected static $lenientParse;
+
     /**
      * In-memory cache of date formatters
      *
@@ -69,14 +78,39 @@ public static function getDefaultLocale(): ?string
     /**
      * Sets the default locale.
      *
-     * @param string|null $locale The default locale string to be used or null.
+     * Set to null to use IntlDateFormatter default.
+     *
+     * @param string|null $locale The default locale string to be used.
      * @return void
      */
     public static function setDefaultLocale(?string $locale = null): void
     {
         static::$defaultLocale = $locale;
     }
 
+    /**
+     * Gets whether i18n parsing is set to lenient.
+     *
+     * Returns null when the default for IntlDateFormatter is used.
+     *
+     * @return bool|null
+     */
+    public static function getLenientParse(): ?bool
+    {
+        return static::$lenientParse;
+    }
+
+    /**
+     * Sets whether i18n parsing is lenient.
+     *
+     * @param bool|null $lenient Whether IntlDateFormatter is set to lenient
+     * @return void
+     */
+    public static function setLenientParse(?bool $lenient = null): void
+    {
+        static::$lenientParse = $lenient;
+    }
+
     /**
      * Returns a nicely formatted date string for this object.
      *
@@ -335,6 +369,10 @@ public static function parseDateTime(string $time, $format = null, $tz = null)
             null,
             $pattern ?? ''
         );
+        if (static::$lenientParse !== null) {
+            $formatter->setLenient(static::$lenientParse);
+        }
+
         $time = $formatter->parse($time);
         if ($time !== false) {
             $dateTime = new DateTime('@' . $time);

tests/TestCase/I18n/DateTest.php

@@ -53,7 +53,9 @@ public function tearDown(): void
     {
         parent::tearDown();
         Date::setDefaultLocale($this->locale);
+        Date::setLenientParse(null);
         FrozenDate::setDefaultLocale($this->locale);
+        FrozenDate::setLenientParse(null);
         date_default_timezone_set('UTC');
     }
 
@@ -216,6 +218,25 @@ public function testParseDateTime($class)
         $this->assertSame('2015-10-13 00:00:00', $date->format('Y-m-d H:i:s'));
     }
 
+    /**
+     * Tests disabling leniency when parsing locale format.
+     *
+     * @dataProvider classNameProvider
+     * @return void
+     */
+    public function testLenientParseDate($class)
+    {
+        $class::setDefaultLocale('pt_BR');
+
+        $class::setLenientParse(false);
+        $date = $class::parseDate('04/21/2013');
+        $this->assertSame(null, $date);
+
+        $class::setLenientParse(true);
+        $date = $class::parseDate('04/21/2013');
+        $this->assertSame('2014-09-04', $date->format('Y-m-d'));
+    }
+
     /**
      * provider for timeAgoInWords() tests
      *

tests/TestCase/I18n/TimeTest.php

@@ -54,10 +54,12 @@ public function tearDown(): void
         Time::setDefaultLocale($this->locale);
         Time::resetToStringFormat();
         Time::setJsonEncodeFormat("yyyy-MM-dd'T'HH':'mm':'ssxxx");
+        Time::setLenientParse(null);
 
         FrozenTime::setDefaultLocale($this->locale);
         FrozenTime::resetToStringFormat();
         FrozenTime::setJsonEncodeFormat("yyyy-MM-dd'T'HH':'mm':'ssxxx");
+        FrozenTime::setLenientParse(null);
 
         date_default_timezone_set('UTC');
         I18n::setLocale(I18n::DEFAULT_LOCALE);
@@ -916,6 +918,25 @@ public function testParseTime($class)
         $this->assertNull($time);
     }
 
+    /**
+     * Tests disabling leniency when parsing locale format.
+     *
+     * @dataProvider classNameProvider
+     * @return void
+     */
+    public function testLenientParseDate($class)
+    {
+        $class::setDefaultLocale('pt_BR');
+
+        $class::setLenientParse(false);
+        $time = $class::parseDate('04/21/2013');
+        $this->assertSame(null, $time);
+
+        $class::setLenientParse(true);
+        $time = $class::parseDate('04/21/2013');
+        $this->assertSame('2014-09-04', $time->format('Y-m-d'));
+    }
+
     /**
      * Tests that timeAgoInWords when using a russian locale does not break things
      *