Packages/DigiComp.SettingValidator
2
0
Fork 0
Code Pull requests Releases Activity

TASK: taming complexity

Browse source
This commit is contained in:
Ferdinand Kuhl 2017-06-03 14:11:13 +02:00
parent 4534099d3a
commit d83c009b28
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Classes/Validation/Validator/SettingsValidator.php
View file

@ -85,6 +85,41 @@ class SettingsValidator extends AbstractValidator
); );
} }
$config = $this->getConfigForName($name);
foreach ($config as $validatorConfig) {
$validator = $this->validatorResolver->createValidator(
$validatorConfig['validator'],
$validatorConfig['options']
);
if (! $validator) {
throw new InvalidValidationConfigurationException(
sprintf(
'Validator could not be resolved: "%s" Check your Validation.yaml',
$validatorConfig['validator']
),
1402326139
);
}
if (isset($validatorConfig['property'])) {
$this->result->forProperty($validatorConfig['property'])->merge(
$validator->validate(ObjectAccess::getPropertyPath($value, $validatorConfig['property']))
);
} else {
$this->result->merge($validator->validate($value));
}
}
}
/**
* @param $name
*
* @return array
*/
protected function getConfigForName($name): array
{
$config = []; $config = [];
if (isset($this->validations[$name]['self'])) { if (isset($this->validations[$name]['self'])) {
foreach ($this->validations[$name]['self'] as $validator => &$validation) { foreach ($this->validations[$name]['self'] as $validator => &$validation) {
@ -109,27 +144,6 @@ class SettingsValidator extends AbstractValidator
} }
} }
} }
return $config;
foreach ($config as $validatorConfig) {
$validator = $this->validatorResolver->createValidator(
$validatorConfig['validator'],
$validatorConfig['options']
);
if (! $validator) {
throw new InvalidValidationConfigurationException(
'Validator could not be resolved: ' . $validatorConfig['validator'] . '. Check your Validation.yaml',
1402326139
);
}
if (isset($validatorConfig['property'])) {
$this->result->forProperty($validatorConfig['property'])->merge(
$validator->validate(ObjectAccess::getPropertyPath($value, $validatorConfig['property']))
);
} else {
$this->result->merge($validator->validate($value));
}
}
} }
} }