BUGFIX: Fix broken recursion with validation groups

Provide current validation group for recursive SettingsValidator.
Adjust test.
Provide configuration to outline the issue.

Classes/Validation/Validator/SettingsValidator.php

@@ -179,12 +179,11 @@ class SettingsValidator extends AbstractValidator
     protected function handleValidationGroups(array &$validatorConfig)
     {
         if (isset($validatorConfig['options']['validationGroups'])
-            && (
+            && $validatorConfig['validator'] !== 'DigiComp.SettingValidator:Settings'
-                $validatorConfig['validator'] !== 'DigiComp.SettingValidator:Settings'
-                || empty($validatorConfig['options']['validationGroups'])
-            )
         ) {
             unset($validatorConfig['options']['validationGroups']);
+        } elseif ($validatorConfig['validator'] === 'DigiComp.SettingValidator:Settings') {
+            $validatorConfig['options']['validationGroups'] = $this->options['validationGroups'];
         }
     }
 }

Configuration/Testing/Validation.yaml

@@ -13,16 +13,26 @@ TrueValidator:
     BooleanValue:
       expectedValue: true
 
-GroupValidatorDefault:
+DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsCustomObject:
   self:
-    BooleanValue:
+    DigiComp.SettingValidator:Settings:
-      expectedValue: true
+      name: GroupValidatorCustom
-      validationGroups:
-        - Default
-GroupValidatorCustom:
-  self:
-    BooleanValue:
-      expectedValue: false
-      validationGroups:
-        - Custom
 
+DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsDefaultObject:
+  self:
+    DigiComp.SettingValidator:Settings:
+      name: GroupValidatorDefault
+
+GroupValidatorDefault:
+  properties:
+    shouldBeTrue:
+      BooleanValue:
+        expectedValue: true
+
+GroupValidatorCustom:
+  properties:
+    shouldBeFalse:
+      BooleanValue:
+        expectedValue: false
+        validationGroups:
+          - Custom

Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php

@@ -6,13 +6,11 @@ use Neos\Flow\Annotations as Flow;
 class TestValidationGroupsCustomObject
 {
     /**
-     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "GroupValidatorDefault", "validationGroups"={"Custom"}})
      * @var bool
      */
     protected $shouldBeTrue = false;
 
     /**
-     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "GroupValidatorCustom", "validationGroups"={"Custom"}})
      * @var bool
      */
     protected $shouldBeFalse = true;

Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php

@@ -6,13 +6,11 @@ use Neos\Flow\Annotations as Flow;
 class TestValidationGroupsDefaultObject
 {
     /**
-     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "GroupValidatorDefault"})
      * @var bool
      */
     protected $shouldBeTrue = false;
 
     /**
-     * @Flow\Validate(type="DigiComp.SettingValidator:Settings", options={"name": "GroupValidatorCustom"})
      * @var bool
      */
     protected $shouldBeFalse = true;

Tests/Functional/SettingsValidatorTest.php

@@ -37,17 +37,21 @@ class SettingsValidatorTest extends FunctionalTestCase
     /**
      * @test
      */
-    public function validationGroupsAreRespected()
+    public function defaultValidationGroupWorks()
     {
-        $validatorResolver = $this->objectManager->get(ValidatorResolver::class);
+        $validator = $this->objectManager->get(SettingsValidator::class, ['validationGroups' => ['Default']]);
-
-        $validator = $validatorResolver->getBaseValidatorConjunction(TestValidationGroupsDefaultObject::class);
         $result = $validator->validate(new TestValidationGroupsDefaultObject());
         $this->assertTrue($result->hasErrors(), 'No Errors for validation group "Default"');
         $this->assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Default"');
         $this->assertCount(1, $result->forProperty('shouldBeTrue')->getErrors(), 'Got no error for shouldBeTrue property');
+    }
 
-        $validator = $validatorResolver->getBaseValidatorConjunction(TestValidationGroupsCustomObject::class);
+    /**
+     * @test
+     */
+    public function customValidationGroupWorks()
+    {
+        $validator = $this->objectManager->get(SettingsValidator::class, ['validationGroups' => ['Custom']]);
         $result = $validator->validate(new TestValidationGroupsCustomObject());
         $this->assertTrue($result->hasErrors(), 'No Errors for validation group "Custom"');
         $this->assertCount(1, $result->getFlattenedErrors(), 'Got a non expected number of errors for group "Custom"');