tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.9' into 4

Browse Source
This commit is contained in:
Steve Boyd 2021-10-19 11:14:19 +13:00
commit 3a852bed36
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Forms/CompositeValidator.php
View File

@ -95,24 +95,9 @@ class CompositeValidator extends Validator
return $this->result; return $this->result;
} }
$data = $this->form->getData();
foreach ($this->getValidators() as $validator) { foreach ($this->getValidators() as $validator) {
// Reset the validation results for this Validator // validate() will return a ValidationResult, and we will combine this with the result we already have
$validator->resetResult(); $this->getResult()->combineAnd($validator->validate());
// This Validator has been disabled, so skip it
if (!$validator->getEnabled()) {
continue;
}
// Run validation, and exit early if it's valid
if ($validator->php($data)) {
continue;
}
// Validation result was invalid. Combine our ValidationResult messages
$this->getResult()->combineAnd($validator->getResult());
} }
return $this->result; return $this->result;