Merge remote-tracking branch 'origin/AC-12025' into Hammer_248beta1_Scope03072024

Author: glo71317

app/code/Magento/Customer/Block/Widget/Dob.php

@@ -23,9 +23,9 @@ class Dob extends AbstractWidget
     /**
      * Constants for borders of date-type customer attributes
      */
-    const MIN_DATE_RANGE_KEY = 'date_range_min';
+    public const MIN_DATE_RANGE_KEY = 'date_range_min';
 
-    const MAX_DATE_RANGE_KEY = 'date_range_max';
+    public const MAX_DATE_RANGE_KEY = 'date_range_max';
 
     /**
      * @var array
@@ -303,6 +303,7 @@ public function getHtmlExtraParams()
     public function getDateFormat()
     {
         $dateFormat = $this->setTwoDayPlaces($this->_localeDate->getDateFormatWithLongYear());
+        $dateFormat = $this->setTwoMonthPlaces($dateFormat);
         /** Escape RTL characters which are present in some locales and corrupt formatting */
         $escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
 
@@ -440,4 +441,19 @@ private function setTwoDayPlaces(string $format): string
             $format
         );
     }
+
+    /**
+     * Set 2 places for month value in format string
+     *
+     * @param string $format
+     * @return string
+     */
+    private function setTwoMonthPlaces(string $format): string
+    {
+        return preg_replace(
+            '/(?<!M)M(?!M)/',
+            'MM',
+            $format
+        );
+    }
 }

app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php

@@ -52,7 +52,7 @@ class DobTest extends TestCase
     private const YEAR = '2014';
 
     // Value of date('Y', strtotime(self::DATE))
-    private const DATE_FORMAT = 'M/dd/y';
+    private const DATE_FORMAT = 'MM/dd/y';
 
     /** Constants used by Dob::setDateInput($code, $html) */
     private const DAY_HTML =

dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/validation.test.js

@@ -16,7 +16,7 @@ define([
 
         dataProvider = [
             {
-                format: 'M/d/Y',
+                format: 'MM/d/Y',
                 date: '09/2/18',
                 expects: true
             },