More Tweaks

Author: oleibman

src/PhpSpreadsheet/Shared/Date.php

@@ -172,10 +172,7 @@ public static function convertIsoDate(mixed $value): float|int
             throw new Exception("Invalid string $value supplied for datatype Date");
         }
 
-        $newValue = self::PHPToExcel($date);
-        if ($newValue === false) {
-            throw new Exception("Invalid string $value supplied for datatype Date");
-        }
+        $newValue = self::dateTimeToExcel($date);
 
         if (preg_match('/^\s*\d?\d:\d\d(:\d\d([.]\d+)?)?\s*(am|pm)?\s*$/i', $value) == 1) {
             $newValue = fmod($newValue, 1.0);

tests/PhpSpreadsheetTests/Shared/DateTest.php

@@ -204,6 +204,9 @@ public function testVarious(): void
 
         $date = Date::PHPToExcel('2020-01-01');
         self::assertEquals(43831.0, $date);
+        $phpDate = new DateTime('2020-01-02T00:00Z');
+        $date = Date::PHPToExcel($phpDate);
+        self::assertEquals(43832.0, $date);
 
         $spreadsheet = new Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();