code quality improvements according to comments from code review

zendframework · Feb 21, 2019 · dad31e9 · dad31e9
1 parent ce463ae
commit dad31e9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/src/Element/Collection.php b/src/Element/Collection.php
@@ -236,7 +236,7 @@ public function populateValues($data)
                 }
             }
 
-            if ($elementOrFieldset) {
+            if ($elementOrFieldset !== null) {
                 if ($elementOrFieldset instanceof FieldsetInterface) {
                     $elementOrFieldset->populateValues($value);
                 } else {

diff --git a/test/Element/CollectionTest.php b/test/Element/CollectionTest.php
@@ -1403,20 +1403,34 @@ public function testTargetElementBeingNullNotCausingAnError()
     {
         $form = new Form();
 
-        $form->add([
-            'type' => 'Zend\Form\Element\Collection',
-            'name' => 'fieldsets',
-            'options' => [
-                'count' => 2
+        $form->add(
+            [
+                'type' => \Zend\Form\Element\Collection::class,
+                'name' => 'fieldsets',
+                'options' => [
+                    'count' => 2
+                ]
             ]
-        ]);
+        );
 
         $collection = $form->get('fieldsets');
-        $data = [];
-        $data['fieldsets'] = ['red', 'green', 'blue'];
+        $data = [
+            'fieldsets' => [
+                'red',
+                'green',
+                'blue'
+            ]
+        ];
 
-        $form->populateValues($data);
+        $form->setData($data);
+        $form->isValid();
 
-        $this->addToAssertionCount(1); // expect no exception being thrown
+        // expect the fieldsets key to be an empty array since there's no valid targetElement
+        $this->assertEquals(
+            [
+                'fieldsets' => []
+            ],
+            $form->getData()
+        );
     }
 }