Merge branch 'ACP2E-3561' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-02-11-2025

Author: chittima

lib/internal/Magento/Framework/Data/Form/Element/Date.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -121,7 +121,7 @@ public function getValue($format = null)
             return '';
         }
         if (null === $format) {
-            $format = $this->getDateFormat();
+            $format = $this->getDateFormat() ?: $this->getFormat();
             $format .= ($format && $this->getTimeFormat()) ? ' ' : '';
             $format .= $this->getTimeFormat() ? $this->getTimeFormat() : '';
         }

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/DateTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -125,4 +125,45 @@ protected function getFormMock($exactly)
 
         return $formMock;
     }
+
+    /**
+     * @dataProvider providerGetValue
+     * @param string|null $dateFormat
+     * @param string|null $format
+     * @param string|null $timeFormat
+     * @param string $expectedFormat
+     */
+    public function testGetValue(?string $dateFormat, ?string $format, ?string $timeFormat, string $expectedFormat)
+    {
+        $dateTime = new \DateTime('2025-10-13 10:36:00', new \DateTimeZone('America/Los_Angeles'));
+        $this->model->setValue($dateTime);
+        $this->model->setDateFormat($dateFormat);
+        $this->model->setFormat($format);
+        $this->model->setTimeFormat($timeFormat);
+
+        $this->localeDateMock->expects($this->once())
+            ->method('formatDateTime')
+            ->with(
+                $dateTime,
+                null,
+                null,
+                null,
+                $this->equalTo($dateTime->getTimezone()),
+                $this->equalTo($expectedFormat)
+            )
+            ->willReturn('2025-10-13 10:36:00');
+
+        $this->model->getValue();
+    }
+
+    public function providerGetValue()
+    {
+        return [
+            [null, 'yyyy-mm-dd', 'hh:mm:ss', 'yyyy-mm-dd hh:mm:ss'],
+            [null, 'yy-mm-dd', null, 'yy-mm-dd'],
+            ['yyyy-mm-dd', null, null, 'yyyy-mm-dd'],
+            ['yyyy-mm-dd', 'yy-mm-dd', 'hh:mm:ss', 'yyyy-mm-dd hh:mm:ss'],
+            ['yyyy-mm-dd', 'yy-mm-dd', null, 'yyyy-mm-dd']
+        ];
+    }
 }