ACP2E-4311: Error loading some locale

Author: soklymeach

app/code/Magento/Customer/Plugin/ValidateDobOnSave.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Locale\ResolverInterface;
 
 class ValidateDobOnSave
 {
@@ -27,16 +28,24 @@ class ValidateDobOnSave
      */
     private $json;
 
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
     /**
      * @param EavConfig $eavConfig
      * @param JsonSerializer $json
+     * @param ResolverInterface $localeResolver
      */
     public function __construct(
         EavConfig $eavConfig,
-        JsonSerializer $json
+        JsonSerializer $json,
+        ResolverInterface $localeResolver
     ) {
         $this->eavConfig = $eavConfig;
         $this->json = $json;
+        $this->localeResolver = $localeResolver;
     }
 
     /**
@@ -67,8 +76,9 @@ public function aroundSave(
         }
 
         if ($dobDate) {
+            $normalizedDob = $dobDate->format(DateTime::DATE_PHP_FORMAT);
+            $customer->setDob($normalizedDob);
             $attr = $this->eavConfig->getAttribute('customer', 'dob');
-
             $rules = $attr->getData('validate_rules');
             if (is_string($rules) && $rules !== '') {
                 try {
@@ -127,9 +137,21 @@ private function parseDate($value): ?\DateTimeImmutable
             $seconds = ($intVal >= 10000000000) ? intdiv($intVal, 1000) : $intVal;
             return (new \DateTimeImmutable('@' . $seconds))->setTimezone(new \DateTimeZone('UTC'));
         }
+        $stringValue = (string)$value;
+        $locale = $this->localeResolver->getLocale();
+        $formatter = new \IntlDateFormatter(
+            $locale,
+            \IntlDateFormatter::SHORT,
+            \IntlDateFormatter::NONE
+        );
+        $formatter->setPattern(DateTime::DATE_INTERNAL_FORMAT);
+        $timestamp = $formatter->parse($stringValue);
+        if ($timestamp !== false) {
+            return new \DateTimeImmutable('@' . $timestamp);
+        }
 
         try {
-            return new \DateTimeImmutable((string)$value);
+            return new \DateTimeImmutable($stringValue);
         } catch (\Exception $e) {
             return null;
         }

app/code/Magento/Customer/Test/Unit/Plugin/ValidateDobOnSaveTest.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Locale\ResolverInterface;
 
 /**
  * Unit test for validate date of birth plugin
@@ -42,10 +43,13 @@ protected function setUp(): void
         $this->eavConfig = $this->createMock(EavConfig::class);
         $this->json = $this->createMock(JsonSerializer::class);
         $this->repo = $this->createMock(CustomerRepositoryInterface::class);
+        $localeResolver = $this->createMock(ResolverInterface::class);
+        $localeResolver->method('getLocale')->willReturn('en_US');
 
         $this->plugin = new ValidateDobOnSave(
             $this->eavConfig,
-            $this->json
+            $this->json,
+            $localeResolver
         );
     }
 
@@ -322,6 +326,21 @@ public function testDobZeroEpochInvalidThrows(): void
         $this->assertFalse($called);
     }
 
+    public function testDobIsNormalized(): void
+    {
+        $dob = '2005-12-01';
+        $customer = $this->createMock(CustomerInterface::class);
+        $customer->method('getDob')->willReturn($dob);
+        $customer->expects($this->once())
+            ->method('setDob')
+            ->with('2005-12-01');
+        $this->mockAttributeRulesArray(['date_range_min' => '1980-01-01', 'date_range_max' => '2010-12-31']);
+        $called = false;
+        $proceed = $this->proceedPlugin($called, $customer);
+        $this->plugin->aroundSave($this->repo, $proceed, $customer);
+        $this->assertTrue($called);
+    }
+
     /**
      * Create a proceed closure that marks $called and returns either the given $result or the original $customer.
      *