viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

validation manager change: exit on first

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-11-16 17:42:09 +02:00
parent ce62ba719e
commit 70f15a7cbd
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
application/Espo/Core/FieldValidation/FieldValidationManager.php
View File

@@ -88,7 +88,7 @@ class FieldValidationManager
try {
return $this->processInternal($entity, $data, $params, false);
}
catch (ValidationError $e) {
catch (ValidationError) {
throw new LogicException();
}
}
@@ -252,8 +252,6 @@ class FieldValidationManager
$validationList = $this->getAllValidationList($entity->getEntityType(), $field, $params);
$failureList = [];
foreach ($validationList as $type) {
$result = $this->check($entity, $field, $type, $data);
@@ -263,20 +261,24 @@ class FieldValidationManager
$failure = new Failure($entity->getEntityType(), $field, $type);
$failureList[] = $failure;
if ($throw) {
throw ValidationError::create($failure);
}
return [$failure];
}
$additionalFailureList = $this->checkAdditional($entity, $field, new Data($data));
$failure = $this->checkAdditional($entity, $field, new Data($data));
if ($throw && $additionalFailureList !== []) {
throw ValidationError::create($additionalFailureList[0]);
if (!$failure) {
return [];
}
return array_merge($failureList, $additionalFailureList);
if ($throw) {
throw ValidationError::create($failure);
}
return [$failure];
}
/**
@@ -398,15 +400,10 @@ class FieldValidationManager
return $isSet;
}
/**
* @return Failure[]
*/
private function checkAdditional(Entity $entity, string $field, Data $data): array
private function checkAdditional(Entity $entity, string $field, Data $data): ?Failure
{
$validatorList = $this->validatorFactory->createAdditionalList($entity->getEntityType(), $field);
$failureList = [];
foreach ($validatorList as $validator) {
$itemFailure = $validator->validate($entity, $field, $data);
@@ -416,9 +413,9 @@ class FieldValidationManager
$type = lcfirst((new ReflectionClass($validator))->getShortName());
$failureList[] = new Failure($entity->getEntityType(), $field, $type);
return new Failure($entity->getEntityType(), $field, $type);
}
return $failureList;
return null;
}
}