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

fix handling of validation groups

Browse source
This commit is contained in:
Robin Krahnen 2024-09-04 15:57:55 +02:00
parent da4f409a8d
commit cf710783d9
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/Validation/Validator/ConditionalValidator.php
View file

@ -143,7 +143,7 @@ class ConditionalValidator extends AbstractValidator
*/ */
protected function handleValidationGroups(array &$validatorConfig): void protected function handleValidationGroups(array &$validatorConfig): void
{ {
if ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') { if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
$validatorConfig['options']['validationGroups'] = $this->options['validationGroups']; $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
} elseif (isset($validatorConfig['options']['validationGroups'])) { } elseif (isset($validatorConfig['options']['validationGroups'])) {
unset($validatorConfig['options']['validationGroups']); unset($validatorConfig['options']['validationGroups']);

2
Classes/Validation/Validator/PropertiesValidator.php
View file

@ -110,7 +110,7 @@ class PropertiesValidator extends AbstractValidator
*/ */
protected function handleValidationGroups(array &$validatorConfig): void protected function handleValidationGroups(array &$validatorConfig): void
{ {
if ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') { if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
$validatorConfig['options']['validationGroups'] = $this->options['validationGroups']; $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
} elseif (isset($validatorConfig['options']['validationGroups'])) { } elseif (isset($validatorConfig['options']['validationGroups'])) {
unset($validatorConfig['options']['validationGroups']); unset($validatorConfig['options']['validationGroups']);

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

@ -150,7 +150,7 @@ class SettingsValidator extends AbstractValidator
*/ */
protected function handleValidationGroups(array &$validatorConfig): void protected function handleValidationGroups(array &$validatorConfig): void
{ {
if ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') { if (\in_array($validatorConfig['validator'], ['DigiComp.SettingValidator:Settings', 'DigiComp.SettingValidator:Conditional', 'DigiComp.SettingValidator:Properties', 'Neos.Flow:Collection'])) {
$validatorConfig['options']['validationGroups'] = $this->options['validationGroups']; $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
} elseif (isset($validatorConfig['options']['validationGroups'])) { } elseif (isset($validatorConfig['options']['validationGroups'])) {
unset($validatorConfig['options']['validationGroups']); unset($validatorConfig['options']['validationGroups']);