fixed #102 do not ignore validation group for collections

zendframework · Jul 8, 2016 · 8991ddb · 8991ddb
1 parent f2218e4
commit 8991ddb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/src/Element/Collection.php b/src/Element/Collection.php
@@ -261,16 +261,18 @@ public function allowValueBinding()
      * Bind values to the object
      *
      * @param array $values
+     * @param array $validationGroup
+     *
      * @return array|mixed|void
      */
-    public function bindValues(array $values = [])
+    public function bindValues(array $values = [], array $validationGroup = null)
     {
         $collection = [];
         foreach ($values as $name => $value) {
             $element = $this->get($name);
 
             if ($element instanceof FieldsetInterface) {
-                $collection[] = $element->bindValues($value);
+                $collection[] = $element->bindValues($value, $validationGroup);
             } else {
                 $collection[] = $value;
             }

diff --git a/src/Fieldset.php b/src/Fieldset.php
@@ -557,9 +557,11 @@ public function allowValueBinding()
      * Bind values to the bound object
      *
      * @param array $values
+     * @param array $validationGroup
+     *
      * @return mixed|void
      */
-    public function bindValues(array $values = [])
+    public function bindValues(array $values = [], array $validationGroup = null)
     {
         $objectData = $this->extract();
         $hydrator = $this->getHydrator();
@@ -568,6 +570,10 @@ public function bindValues(array $values = [])
         foreach ($this->iterator as $element) {
             $name = $element->getName();
 
+            if ($validationGroup && (array_key_exists($name, $validationGroup) || !in_array($name, $validationGroup))) {
+                continue;
+            }
+
             if (!array_key_exists($name, $values)) {
                 if (!($element instanceof Collection)) {
                     continue;
@@ -579,7 +585,7 @@ public function bindValues(array $values = [])
             $value = $values[$name];
 
             if ($element instanceof FieldsetInterface && $element->allowValueBinding()) {
-                $value = $element->bindValues($value);
+                $value = $element->bindValues($value, empty($validationGroup[$name]) ? null : $validationGroup[$name]);
             }
 
             // skip post values for disabled elements, get old value from object

diff --git a/src/Form.php b/src/Form.php
@@ -357,13 +357,14 @@ public function bindValues(array $values = [])
         }
 
         $data = $this->prepareBindData($data, $this->data);
+        $validationGroup = $this->getValidationGroup();
 
         // If there is a base fieldset, only hydrate beginning from the base fieldset
         if ($this->baseFieldset !== null) {
             $data = $data[$this->baseFieldset->getName()];
-            $this->object = $this->baseFieldset->bindValues($data);
+            $this->object = $this->baseFieldset->bindValues($data, $validationGroup[$this->baseFieldset->getName()]);
         } else {
-            $this->object = parent::bindValues($data);
+            $this->object = parent::bindValues($data, $validationGroup);
         }
     }
 

diff --git a/test/FormTest.php b/test/FormTest.php
@@ -587,7 +587,7 @@ public function testSettingValidationGroupWithoutCollectionBindsOnlyThoseValuesT
         $this->form->setHydrator(new Hydrator\ObjectProperty());
         $this->form->bind($model);
         $this->form->setData($dataWithoutCollection);
-        $this->form->setValidationGroup(array('foo'));
+        $this->form->setValidationGroup(['foo']);
         $this->form->isValid();
 
         $this->assertObjectHasAttribute('foo', $model);