From cf710783d9dc2fbf014336053adb20b09dc2d2e6 Mon Sep 17 00:00:00 2001
From: Robin Krahnen <robin.krahnen@sincnovation.com>
Date: Wed, 4 Sep 2024 15:57:55 +0200
Subject: [PATCH] fix handling of validation groups

---
 Classes/Validation/Validator/ConditionalValidator.php | 2 +-
 Classes/Validation/Validator/PropertiesValidator.php  | 2 +-
 Classes/Validation/Validator/SettingsValidator.php    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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']);