Fixed work with empty Date/Time values

Author: Vitexus

src/AbraFlexi/Date.php

@@ -25,18 +25,18 @@ class Date extends \DateTime {
     /**
      * AbraFlexi date to PHP DateTime conversion
      *
-     * @param string $flexidate 2017-05-26 or 2017-05-26Z or 2017-05-26+02:00
+     * @param string $flexidate 2017-05-26 or 2017-05-26Z or 2017-05-26+02:00 or "NOW"
      *
      * @return \DateTime | false
      */
     public function __construct(string $flexidate = 'NOW') {
-        $this->isNull = is_null($flexidate);
+        $this->isNull = empty($flexidate);
         $format = '';
         if (strstr($flexidate, '+')) {
             $format = RO::$DateFormat . 'O';
         } elseif (strstr($flexidate, 'Z')) {
             $format = RO::$DateFormat . 'Z';
-        } elseif ($flexidate != 'NOW') {
+        } elseif ( !empty ($flexidate) && ($flexidate != 'NOW')) {
             $format = RO::$DateFormat;
         }
         parent::__construct(empty($format) ? null : \DateTime::createFromFormat($format, $flexidate)->setTime(0, 0)->format(\DateTimeInterface::ATOM));

src/AbraFlexi/DateTime.php

@@ -16,20 +16,28 @@
  */
 class DateTime extends \DateTime {
 
+    /**
+     * Support for Null values
+     * @var bool
+     */
+    public bool $isNull = false;
+
     /**
      * AbraFlexi dateTime to PHP DateTime conversion
      *
      * @param string $flexidatetime 2017-09-26T10:00:53.755+02:00 or older 2017-05-19T00:00:00+02:00
      *
      * @return \DateTime | false
      */
-    public function __construct(string $flexidatetime) {
+    public function __construct(string $flexidatetime = 'NOW') {
+        $this->isNull = empty($flexidatetime);
+        $format = '';
         if (strchr($flexidatetime, '.')) { //NewFormat
             $format = RO::$DateTimeFormat;
-        } else { // Old format
+        } elseif ($flexidatetime != 'NOW') { // Old format
             $format = 'Y-m-d\TH:i:s+P';
         }
-        parent::__construct(\DateTime::createFromFormat($format, $flexidatetime)->format(\DateTimeInterface::ATOM));
+        parent::__construct(empty($format) ? null : \DateTime::createFromFormat($format, $flexidatetime)->format(\DateTimeInterface::ATOM));
     }
 
     /**
@@ -38,7 +46,7 @@ public function __construct(string $flexidatetime) {
      * @return string
      */
     public function __toString() {
-        return $this->format(RO::$DateTimeFormat);
+        return $this->isNull ? null : $this->format(RO::$DateTimeFormat);
     }
 
 }

src/AbraFlexi/RO.php

@@ -1036,10 +1036,10 @@ public function fixRecordTypes(array $record, $evidence = null) {
                             $record[$column] = floatval($value);
                             break;
                         case 'datetime':
-                            $record[$column] = empty($value) ? "" : new DateTime($value);
+                            $record[$column] = new DateTime($value);
                             break;
                         case 'date':
-                            $record[$column] = empty($value) ? "" : new Date($value);
+                            $record[$column] = new Date($value);
                             break;
                         case 'blob':
                             break;