Merge pull request zendframework/zendframework#5820 from demichl68/ma…

…ster

[Zend\InputFilter\InputFilter] SetValidationGroup() VALIDATE_ALL not working recursively

src/BaseInputFilter.php

@@ -375,6 +375,11 @@ public function setValidationGroup($name)
     {
         if ($name === self::VALIDATE_ALL) {
             $this->validationGroup = null;
+            foreach($this->getInputs() as $input) {
+                if($input instanceof InputFilterInterface) {
+                    $input->setValidationGroup(self::VALIDATE_ALL);
+                }
+            }
             return $this;
         }
 
@@ -386,6 +391,14 @@ public function setValidationGroup($name)
                 } else {
                     $inputs[] = $key;
 
+                    if (!$this->inputs[$key] instanceof InputFilterInterface) {
+                        throw new Exception\InvalidArgumentException(
+                            sprintf(
+                                'Input "%s" must implement InputFilterInterface',
+                                $key
+                            )
+                        );
+                    }
                     // Recursively populate validation groups for sub input filters
                     $this->inputs[$key]->setValidationGroup($value);
                 }

test/BaseInputFilterTest.php

@@ -223,6 +223,41 @@ public function testCanValidatePartialDataset()
         $this->assertFalse($filter->isValid());
     }
 
+    public function testResetEmptyValidationGroupRecursively()
+    {
+        $data = array(
+            'flat' => 'foo',
+            'deep' => array(
+                'deep-input1' => 'deep-foo1',
+                'deep-input2' => 'deep-foo2',
+            )
+        );
+        $filter = new InputFilter;
+        $filter->add(new Input, 'flat');
+        $deepInputFilter = new InputFilter;
+        $deepInputFilter->add(new Input, 'deep-input1');
+        $deepInputFilter->add(new Input, 'deep-input2');
+        $filter->add($deepInputFilter, 'deep');
+        $filter->setData($data);
+        $filter->setValidationGroup(array('deep' => 'deep-input1'));
+        // reset validation group
+        $filter->setValidationGroup(InputFilter::VALIDATE_ALL);
+        $this->assertEquals($data, $filter->getValues());
+    }
+
+    public function testSetDeepValidationGroupToNonInputFilterThrowsException()
+    {
+        $filter = $this->getInputFilter();
+        $filter->add(new Input, 'flat');
+        // we expect setValidationGroup to throw an exception when flat is treated
+        // like an inputfilter which it actually isn't
+        $this->setExpectedException(
+            'Zend\InputFilter\Exception\InvalidArgumentException',
+            'Input "flat" must implement InputFilterInterface'
+        );
+        $filter->setValidationGroup(array('flat' => 'foo'));
+    }
+
     public function testCanRetrieveInvalidInputsOnFailedValidation()
     {
         if (!extension_loaded('intl')) {