diff --git a/application/Espo/Core/FieldValidation/FieldValidationManager.php b/application/Espo/Core/FieldValidation/FieldValidationManager.php index 5725539043..1aace2ce19 100644 --- a/application/Espo/Core/FieldValidation/FieldValidationManager.php +++ b/application/Espo/Core/FieldValidation/FieldValidationManager.php @@ -138,11 +138,12 @@ class FieldValidationManager */ private function getMandatoryValidationList(string $entityType, string $field): array { + /** @var ?string $fieldType */ $fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type'); return $this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'mandatoryValidationList']) ?? - $this->metadata->get(['fields', $fieldType, 'mandatoryValidationList']) ?? []; + $this->metadata->get(['fields', $fieldType ?? '', 'mandatoryValidationList']) ?? []; } /** @@ -150,11 +151,12 @@ class FieldValidationManager */ private function getValidationList(string $entityType, string $field): array { + /** @var ?string $fieldType */ $fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type'); return $this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'validationList']) ?? - $this->metadata->get(['fields', $fieldType, 'validationList']) ?? []; + $this->metadata->get(['fields', $fieldType ?? '', 'validationList']) ?? []; } /** diff --git a/application/Espo/Core/FieldValidation/ValidatorFactory.php b/application/Espo/Core/FieldValidation/ValidatorFactory.php index 6f13bb85ae..fde43dea9f 100644 --- a/application/Espo/Core/FieldValidation/ValidatorFactory.php +++ b/application/Espo/Core/FieldValidation/ValidatorFactory.php @@ -69,11 +69,12 @@ class ValidatorFactory */ private function getClassName(string $entityType, string $field, string $type): ?string { + /** @var ?string $fieldType */ $fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type'); return $this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'validatorClassNameMap', $type]) ?? - $this->metadata->get(['fields', $fieldType, 'validatorClassNameMap', $type]); + $this->metadata->get(['fields', $fieldType ?? '', 'validatorClassNameMap', $type]); } /**