Ensure that DateAndTime and Date are not null before using them

Author: MarioBlazek

bundle/FieldHandler/Custom/DateAndTimeFieldHandler.php

@@ -14,7 +14,7 @@ class DateAndTimeFieldHandler implements CustomLegacyFieldHandlerInterface
      */
     public function supports(Value $value)
     {
-        return $value instanceof DateAndTimeValue;
+        return $value instanceof DateAndTimeValue && $value->value !== null;
     }
 
     /**
@@ -32,4 +32,4 @@ public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition)
     {
         return new LegacyData($fieldDefinition->id, 0, $value->value->getTimestamp(),'');
     }
-}
+}

bundle/FieldHandler/Custom/DateFieldHandler.php

@@ -14,7 +14,7 @@ class DateFieldHandler implements CustomLegacyFieldHandlerInterface
      */
     public function supports(Value $value)
     {
-        return $value instanceof DateValue;
+        return $value instanceof DateValue && $value->date !== null;
     }
 
     /**
@@ -32,4 +32,4 @@ public function getLegacyValue(Value $value, FieldDefinition $fieldDefinition)
     {
         return new LegacyData($fieldDefinition->id, 0, $value->date->getTimestamp(), '');
     }
-}
+}