Force pattern if locale not found

Author: bnymn

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

@@ -324,14 +324,18 @@ public function convertConfigTimeToUtc($date, $format = 'Y-m-d H:i:s')
      * @return string
      * @deprecated
      */
-    public function convertConfigTimeToUtcWithPattern($date, $format = 'Y-m-d H:i:s', $pattern = 'Y-M-dd HH:mm:ss')
+    public function convertConfigTimeToUtcWithPattern($date, $format = 'Y-m-d H:i:s', $pattern = null)
     {
         if (!($date instanceof \DateTimeInterface)) {
             if ($date instanceof \DateTimeImmutable) {
                 $date = new \DateTime($date->format('Y-m-d H:i:s'), new \DateTimeZone($this->getConfigTimezone()));
             } else {
+                $locale = $this->_localeResolver->getLocale();
+                if ($locale === null) {
+                    $pattern = 'Y-M-dd HH:mm:ss';
+                }
                 $formatter = new \IntlDateFormatter(
-                    $this->_localeResolver->getLocale(),
+                    $locale,
                     \IntlDateFormatter::MEDIUM,
                     \IntlDateFormatter::MEDIUM,
                     $this->getConfigTimezone(),

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

@@ -124,11 +124,15 @@ public function dateIncludeTimeDataProvider()
      * @param string $expectedResult
      * @dataProvider getConvertConfigTimeToUtcFixtures
      */
-    public function testConvertConfigTimeToUtc($date, $configuredTimezone, $expectedResult)
+    public function testConvertConfigTimeToUtc($date, $configuredTimezone, $configuredLocale, $expectedResult)
     {
+        $this->localeResolver
+            ->method('getLocale')
+            ->willReturn($configuredLocale);
+
         $this->scopeConfigWillReturnConfiguredTimezone($configuredTimezone);
 
-        $this->assertEquals($expectedResult, $this->getTimezone()->convertConfigTimeToUtc($date));
+        $this->assertEquals($expectedResult, $this->getTimezone()->convertConfigTimeToUtcWithPattern($date));
     }
 
     /**
@@ -141,16 +145,37 @@ public function getConvertConfigTimeToUtcFixtures()
             'string' => [
                 '2016-10-10 10:00:00',
                 'UTC',
+                null,
                 '2016-10-10 10:00:00'
             ],
+            'string-en_US' => [
+                'Sep 29, 2018, 6:07:38 PM',
+                'UTC',
+                'en_US',
+                '2018-09-29 18:07:38'
+            ],
+            'string-pt_BR' => [
+                '29 de set de 2018 18:07:38',
+                'UTC',
+                'pt_BR',
+                '2018-09-29 18:07:38'
+            ],
+            'string-tr_TR' => [
+                '29 Eyl 2018 18:07:38',
+                'UTC',
+                'tr_TR',
+                '2018-09-29 18:07:38'
+            ],
             'datetime' => [
                 new \DateTime('2016-10-10 10:00:00', new \DateTimeZone('UTC')),
                 'UTC',
+                null,
                 '2016-10-10 10:00:00'
             ],
             'datetimeimmutable' => [
                 new \DateTimeImmutable('2016-10-10 10:00:00', new \DateTimeZone('UTC')),
                 'UTC',
+                null,
                 '2016-10-10 10:00:00'
             ]
         ];