DateTimeHelper & ColumnDateTime: fixed handling of null values

contributte · May 27, 2019 · 6e52a5a · 6e52a5a
1 parent 37e42b4
commit 6e52a5a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Column/ColumnDateTime.php b/src/Column/ColumnDateTime.php
@@ -38,7 +38,7 @@ public function getColumnValue(Row $row): string
 				/**
 				 * Otherwise just return raw string
 				 */
-				return $value;
+				return (string) $value;
 			}
 		}
 

diff --git a/src/Utils/DateTimeHelper.php b/src/Utils/DateTimeHelper.php
@@ -67,7 +67,7 @@ public static function fromString($value, array $formats = []): \DateTime
 		}
 
 		foreach ($formats as $format) {
-			$date = \DateTime::createFromFormat($format, $value);
+			$date = \DateTime::createFromFormat($format, (string) $value);
 
 			if ($date === false) {
 				continue;
@@ -76,7 +76,7 @@ public static function fromString($value, array $formats = []): \DateTime
 			return $date;
 		}
 
-		$timestamp = strtotime($value);
+		$timestamp = strtotime((string) $value);
 
 		if ($timestamp !== false) {
 			$date = new \DateTime;
@@ -87,5 +87,4 @@ public static function fromString($value, array $formats = []): \DateTime
 
 		throw new DataGridDateTimeHelperException();
 	}
-
 }