IBX-3289: Fixed validation exception on nulled but required fields (#33)

* IBX-3289: Fixed validation exception on nulled but required fields * fix: Null validator
ibexa · Aug 8, 2022 · 9b3747a · 9b3747a
1 parent 3962190
commit 9b3747a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/lib/Validator/Constraints/FieldValueValidator.php b/src/lib/Validator/Constraints/FieldValueValidator.php
@@ -34,15 +34,12 @@ public function validate($value, Constraint $constraint): void
         }
 
         $fieldValue = $this->getFieldValue($value);
-        if (!$fieldValue) {
-            return;
-        }
 
         $fieldTypeIdentifier = $this->getFieldTypeIdentifier($value);
         $fieldDefinition = $this->getFieldDefinition($value);
         $fieldType = $this->fieldTypeService->getFieldType($fieldTypeIdentifier);
 
-        if ($fieldDefinition->isRequired && $fieldType->isEmptyValue($fieldValue)) {
+        if ($fieldDefinition->isRequired && ($fieldValue === null || $fieldType->isEmptyValue($fieldValue))) {
             $validationErrors = [
                 new ValidationError(
                     "Value for required field definition '%identifier%' with language '%languageCode%' is empty",
@@ -51,8 +48,10 @@ public function validate($value, Constraint $constraint): void
                     'empty'
                 ),
             ];
-        } else {
+        } elseif ($fieldValue !== null) {
             $validationErrors = $fieldType->validateValue($fieldDefinition, $fieldValue);
+        } else {
+            $validationErrors = [];
         }
 
         $this->processValidationErrors($validationErrors);