Merge branch 'ACP2E-347' of https://github.com/magento-l3/magento2ce into PR-2022-02-15-CE2

Author: vkolesny

dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php

@@ -50,38 +50,43 @@ public function testGetValue(array $data, string $expect): void
      */
     public function getValueDataProvider(): array
     {
-        $testTimestamp = strtotime('2014-05-18 12:08:16');
-        $date = new \DateTime('@' . $testTimestamp);
-        return [
-            [
+        $stringDates = ['2020-05-18 12:08:16', '1920-10-25 10:10:10', '2122-01-11 10:30:00'];
+        $testTimestamps = [strtotime($stringDates[0]), strtotime($stringDates[1]), strtotime($stringDates[2])];
+        $dates = [new \DateTime($stringDates[0]),  new \DateTime($stringDates[1]), new \DateTime($stringDates[2])];
+        $data = [];
+        foreach ($testTimestamps as $key => $testTimestamp) {
+            $data[$key] = [
                 [
-                    'date_format' => 'MM/d/yy',
-                    'time_format' => 'h:mm a',
-                    'value' => $testTimestamp,
+                    [
+                        'date_format' => 'MM/d/yy',
+                        'time_format' => 'h:mm a',
+                        'value' => $testTimestamp,
+                    ],
+                    $dates[$key]->format('m/j/y g:i A'),
                 ],
-                $date->format('m/j/y g:i A'),
-            ],
-            [
                 [
-                    'time_format' => 'h:mm a',
-                    'value' => $testTimestamp,
+                    [
+                        'time_format' => 'h:mm a',
+                        'value' => $testTimestamp,
+                    ],
+                    $dates[$key]->format('g:i A'),
                 ],
-                $date->format('g:i A'),
-            ],
-            [
                 [
-                    'date_format' => 'MM/d/yy',
-                    'value' => $testTimestamp,
+                    [
+                        'date_format' => 'MM/d/yy',
+                        'value' => $testTimestamp,
+                    ],
+                    $dates[$key]->format('m/j/y'),
                 ],
-                $date->format('m/j/y'),
-            ],
-            [
                 [
-                    'date_format' => 'd-MM-Y',
-                    'value' => $date->format('d-m-Y'),
+                    [
+                        'date_format' => 'd-MM-Y',
+                        'value' => $dates[$key]->format('d-m-Y'),
+                    ],
+                    $dates[$key]->format('d-m-Y'),
                 ],
-                $date->format('d-m-Y'),
-            ],
-        ];
+            ];
+        }
+        return array_merge($data[0], $data[1]);
     }
 }

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

@@ -67,18 +67,15 @@ private function isDate(string $value): bool
     }
 
     /**
+     * Initial scope of method was to limit timestamp on x64 systems to mimic x32 systems,
+     * but keeping the method for compatibility:
      * If script executes on x64 system, converts large numeric values to timestamp limit
      *
      * @param int $value
      * @return int
      */
     protected function _toTimestamp($value)
     {
-        $value = (int)$value;
-        if ($value > 3155760000) {
-            $value = 0;
-        }
-
         return $value;
     }
 
@@ -99,7 +96,7 @@ public function setValue($value)
             return $this;
         }
         try {
-            if (preg_match('/^[0-9]+$/', $value)) {
+            if (preg_match('/^[\-]{0,1}[0-9]+$/', $value)) {
                 $this->_value = (new \DateTime())->setTimestamp($this->_toTimestamp($value));
             } elseif (is_string($value) && $this->isDate($value)) {
                 $this->_value = new \DateTime($value, new \DateTimeZone($this->localeDate->getConfigTimezone()));
@@ -168,6 +165,7 @@ public function getElementHtml()
         $dateFormat = $this->getDateFormat() ?: $this->getFormat();
         $timeFormat = $this->getTimeFormat();
         if (empty($dateFormat)) {
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new \Exception(
                 'Output format is not specified. ' .
                 'Please specify "format" key in constructor, or set it using setFormat().'