TEXT Function Ignores Time in DateTimeStamp (PHPOffice#3411)

Fix PHPOffice#3409. Calculate both the date and time portions when a date/time format is supplied for the TEXT function.
oleibman · Mar 2, 2023 · 66221bf · 66221bf
1 parent bef3a00
commit 66221bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/PhpSpreadsheet/Calculation/TextData/Format.php b/src/PhpSpreadsheet/Calculation/TextData/Format.php
@@ -129,7 +129,7 @@ public static function TEXTFORMAT($value, $format)
         $format = Helpers::extractString($format);
 
         if (!is_numeric($value) && Date::isDateTimeFormatCode($format)) {
-            $value = DateTimeExcel\DateValue::fromString($value);
+            $value = DateTimeExcel\DateValue::fromString($value) + DateTimeExcel\TimeValue::fromString($value);
         }
 
         return (string) NumberFormat::toFormattedString($value, $format);

diff --git a/tests/data/Calculation/TextData/TEXT.php b/tests/data/Calculation/TextData/TEXT.php
@@ -61,6 +61,16 @@
         '1-Jan-2012',
         'yyyy-mm-dd',
     ],
+    'time (issue 3409)' => [
+        '09:01:00',
+        '09:01',
+        'HH:MM:SS',
+    ],
+    'datetime' => [
+        '15-Feb-2014 04:17:00 PM',
+        '2014-02-15 16:17',
+        'dd-mmm-yyyy HH:MM:SS AM/PM',
+    ],
     [
         '1 3/4',
         1.75,