diff --git a/Classes/Validation/Validator/ConditionalValidator.php b/Classes/Validation/Validator/ConditionalValidator.php index 53b49da..348cf85 100644 --- a/Classes/Validation/Validator/ConditionalValidator.php +++ b/Classes/Validation/Validator/ConditionalValidator.php @@ -143,7 +143,7 @@ class ConditionalValidator extends AbstractValidator */ 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']; } elseif (isset($validatorConfig['options']['validationGroups'])) { unset($validatorConfig['options']['validationGroups']); diff --git a/Classes/Validation/Validator/PropertiesValidator.php b/Classes/Validation/Validator/PropertiesValidator.php index 53964df..7fc8979 100644 --- a/Classes/Validation/Validator/PropertiesValidator.php +++ b/Classes/Validation/Validator/PropertiesValidator.php @@ -110,7 +110,7 @@ class PropertiesValidator extends AbstractValidator */ 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']; } elseif (isset($validatorConfig['options']['validationGroups'])) { unset($validatorConfig['options']['validationGroups']); diff --git a/Classes/Validation/Validator/SettingsValidator.php b/Classes/Validation/Validator/SettingsValidator.php index 5801bc4..d0646f5 100644 --- a/Classes/Validation/Validator/SettingsValidator.php +++ b/Classes/Validation/Validator/SettingsValidator.php @@ -150,7 +150,7 @@ class SettingsValidator extends AbstractValidator */ 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']; } elseif (isset($validatorConfig['options']['validationGroups'])) { unset($validatorConfig['options']['validationGroups']);