Make ODS reader return Row object

src/Spout/Reader/Common/Entity/Cell.php

@@ -35,10 +35,15 @@ class Cell
      */
     const TYPE_BOOLEAN = 4;
 
+    /**
+     * Date cell type
+     */
+    const TYPE_DATE = 5;
+
     /**
      * Error cell type
      */
-    const TYPE_ERROR = 5;
+    const TYPE_ERROR = 6;
 
     /**
      * The value of this cell
@@ -85,6 +90,14 @@ class Cell
         return $this->type;
     }
 
+    /**
+     * @param int $type
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+    }
+
     /**
      * Get the current value type
      *
@@ -99,9 +112,12 @@ class Cell
         if (CellTypeHelper::isEmpty($value)) {
             return self::TYPE_EMPTY;
         }
-        if (CellTypeHelper::isNumeric($this->getValue())) {
+        if (CellTypeHelper::isNumeric($value)) {
             return self::TYPE_NUMERIC;
         }
+        if (CellTypeHelper::isDateTimeOrDateInterval($value)) {
+            return self::TYPE_DATE;
+        }
         if (CellTypeHelper::isNonEmptyString($value)) {
             return self::TYPE_STRING;
         }

src/Spout/Reader/Common/Entity/Row.php

@@ -71,7 +71,7 @@ class Row
     public function toArray()
     {
         return array_map(function (Cell $cell) {
-            return $cell->getValue();
+            return !$cell->isError() ? $cell->getValue() : null;
         }, $this->cells);
     }
 }