Minor refactoring, and additional unit tests (including exceptions) for Cell's setValueExplicit() method

Author: MarkBaker

src/PhpSpreadsheet/Cell/Cell.php

@@ -2,13 +2,11 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
-use DateTime;
 use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Functions;
 use PhpOffice\PhpSpreadsheet\Collection\Cells;
 use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
-use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDate;
 use PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting\CellStyleAssessor;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Style\Style;
@@ -213,7 +211,8 @@ protected function formulaAttributes(bool $isArrayFormula, ?string $arrayFormula
     }
 
     /**
-     * Set the value for a cell, with the explicit data type passed to the method (bypassing any use of the value binder).
+     * Set the value for a cell,
+     *     with the explicit data type passed to the method (bypassing any use of the value binders).
      *
      * @param mixed $value Value
      * @param string $dataType Explicit data type, see DataType::TYPE_*
@@ -250,6 +249,7 @@ public function setValueExplicit($value, $dataType, bool $isArrayFormula = false
                     $dataType = DataType::TYPE_STRING;
                     if (in_array($value, Calculation::$excelConstants, true)) {
                         $value = array_search($value, Calculation::$excelConstants, true);
+                        $dataType = $value === null ? DataType::TYPE_NULL : DataType::TYPE_BOOL;
                     }
                     $value = (string) $value;
                     $this->formulaAttributes = [];
@@ -264,18 +264,7 @@ public function setValueExplicit($value, $dataType, bool $isArrayFormula = false
 
                 break;
             case DataType::TYPE_ISO_DATE:
-                if (!is_string($value)) {
-                    throw new Exception('Non-string supplied for datatype Date');
-                }
-                $date = new DateTime($value);
-                $newValue = SharedDate::PHPToExcel($date);
-                if ($newValue === false) {
-                    throw new Exception("Invalid string $value supplied for datatype Date");
-                }
-                if (preg_match('/^\\d\\d:\\d\\d:\\d\\d/', $value) == 1) {
-                    $newValue = fmod($newValue, 1.0);
-                }
-                $this->value = $newValue;
+                $this->value = DataType::checkIsoDate($value);
                 $dataType = DataType::TYPE_NUMERIC;
 
                 break;

src/PhpSpreadsheet/Cell/DataType.php

@@ -2,7 +2,10 @@
 
 namespace PhpOffice\PhpSpreadsheet\Cell;
 
+use DateTime;
+use PhpOffice\PhpSpreadsheet\Exception;
 use PhpOffice\PhpSpreadsheet\RichText\RichText;
+use PhpOffice\PhpSpreadsheet\Shared\Date as SharedDate;
 use PhpOffice\PhpSpreadsheet\Shared\StringHelper;
 
 class DataType
@@ -83,4 +86,33 @@ public static function checkErrorCode($value)
 
         return $value;
     }
+
+    /**
+     * @param mixed $value
+     *
+     * @return float|int
+     */
+    public static function checkIsoDate($value)
+    {
+        if (!is_string($value)) {
+            throw new Exception('Non-string supplied for datatype Date');
+        }
+
+        try {
+            $date = new DateTime($value);
+            $newValue = SharedDate::PHPToExcel($date);
+        } catch (\Exception $e) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        if ($newValue === false) {
+            throw new Exception("Invalid string $value supplied for datatype Date");
+        }
+
+        if (preg_match('/^\\d\\d:\\d\\d:\\d\\d/', $value) == 1) {
+            $newValue = fmod($newValue, 1.0);
+        }
+
+        return $newValue;
+    }
 }

tests/data/Cell/SetValueExplicit.php

@@ -38,6 +38,16 @@
         true,
         DataType::TYPE_NUMERIC,
     ],
+    [
+        '=SUM(A1:A10)',
+        '=SUM(A1:A10)',
+        DataType::TYPE_FORMULA,
+    ],
+    [
+        44596.5627893519,
+        '2022-02-04 13:30:25',
+        DataType::TYPE_ISO_DATE,
+    ],
     [
         '#DIV/0!',
         '#DIV/0!',

tests/data/Cell/SetValueExplicitException.php

@@ -7,4 +7,20 @@
         'XYZ',
         DataType::TYPE_NUMERIC,
     ],
+    [
+        44596,
+        DataType::TYPE_ISO_DATE,
+    ],
+    [
+        false,
+        DataType::TYPE_ISO_DATE,
+    ],
+    [
+        'ABCD-EF-GH II:JJ:KK',
+        DataType::TYPE_ISO_DATE,
+    ],
+    [
+        1234,
+        'INVALID DATATYPE',
+    ],
 ];