Merge pull request #7500 from magento-trigger/AC-2563

Fix DateTimeFormatter for PHP8.1

Author: xmav

lib/internal/Magento/Framework/Stdlib/DateTime/DateTimeFormatter.php

@@ -62,13 +62,14 @@ public function formatObject($object, $format = null, $locale = null)
      */
     protected function doFormatObject($object, $format = null, $locale = null)
     {
-        $pattern = $dateFormat = $timeFormat = $calendar = null;
+        $pattern = $calendar = null;
 
         if (is_array($format)) {
             list($dateFormat, $timeFormat) = $format;
         } elseif (is_numeric($format)) {
             $dateFormat = $format;
-        } elseif (is_string($format) || null == $format) {
+            $timeFormat = \IntlDateFormatter::FULL;
+        } elseif (is_string($format) || null === $format) {
             $dateFormat = $timeFormat = \IntlDateFormatter::MEDIUM;
             $pattern = $format;
         } else {

lib/internal/Magento/Framework/Stdlib/Test/Unit/DateTime/DateTimeFormatterTest.php

@@ -139,4 +139,41 @@ public function testFormatObjectIfPassedWrongFormat()
         $reflectionProperty->setValue($dateTimeFormatter, $this->localeResolverMock);
         $dateTimeFormatter->formatObject(new \DateTime('2013-06-06 17:05:06 Europe/Dublin'), new \StdClass());
     }
+
+    /**
+     * @dataProvider formatObjectNumericFormatDataProvider
+     */
+    public function testFormatObjectNumericFormat($format, $expected)
+    {
+        /** @var DateTimeFormatter $dateTimeFormatter */
+        $dateTimeFormatter = $this->objectManager->getObject(
+            DateTimeFormatter::class,
+            [
+                'useIntlFormatObject' => false,
+            ]
+        );
+
+        $reflection = new \ReflectionClass(get_class($dateTimeFormatter));
+        $reflectionProperty = $reflection->getProperty('localeResolver');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($dateTimeFormatter, $this->localeResolverMock);
+        $result = $dateTimeFormatter->formatObject(
+            new \DateTime('2022-03-30 00:01:02 GMT'),
+            $format,
+            'en_US'
+        );
+        $this->assertEquals($expected, $result);
+    }
+
+    public function formatObjectNumericFormatDataProvider()
+    {
+        return [
+            [null, 'Mar 30, 2022, 12:01:02 AM'],
+            [\IntlDateFormatter::NONE, '12:01:02 AM Greenwich Mean Time'],
+            [\IntlDateFormatter::SHORT, '3/30/22, 12:01:02 AM Greenwich Mean Time'],
+            [\IntlDateFormatter::MEDIUM, 'Mar 30, 2022, 12:01:02 AM Greenwich Mean Time'],
+            [\IntlDateFormatter::LONG, 'March 30, 2022 at 12:01:02 AM Greenwich Mean Time'],
+            [\IntlDateFormatter::FULL, 'Wednesday, March 30, 2022 at 12:01:02 AM Greenwich Mean Time'],
+        ];
+    }
 }