Update form::getFields to return also nested fields

[MAILPOET-2609]

lib/Models/Form.php

@@ -43,22 +43,33 @@ class Form extends Model {
     return parent::save();
   }
 
-  public function getFieldList() {
+  public function getFieldList(array $body = null) {
-    $body = $this->getBody();
+    $body = $body ?? $this->getBody();
     if (empty($body)) {
       return false;
     }
 
     $skippedTypes = ['html', 'divider', 'submit'];
+    $nestedTypes = ['column', 'columns'];
     $fields = [];
 
     foreach ((array)$body as $field) {
+      if (!empty($field['type'])
+        && in_array($field['type'], $nestedTypes)
+        && !empty($field['body'])
+      ) {
+        $nestedFields = $this->getFieldList($field['body']);
+        $fields = array_merge($fields, $nestedFields);
+        continue;
+      }
+
       if (empty($field['id'])
         || empty($field['type'])
         || in_array($field['type'], $skippedTypes)
       ) {
         continue;
       }
+
       if ($field['id'] > 0) {
         $fields[] = 'cf_' . $field['id'];
       } else {

tests/integration/Models/FormTest.php

@@ -105,13 +105,27 @@ class FormTest extends \MailPoetTest {
           'type' => 'text',
           'id' => 2,
         ],
+        [
+          'type' => 'columns',
+          'body' => [
+            [
+              'type' => 'column',
+              'body' => [
+                [
+                  'type' => 'text',
+                  'id' => 3,
+                ],
+              ],
+            ],
+          ],
+        ],
         [
           'type' => 'submit',
           'id' => 'submit',
         ],
       ],
     ]);
-    expect($form->getFieldList())->equals(['email', 'cf_2']);
+    expect($form->getFieldList())->equals(['email', 'cf_2', 'cf_3']);
   }
 
   public function testItUpdatesSuccessMessagesWhenConfirmationIsDisabled() {