feat: formidable use field label as name

Author: orzocogorzo

forms-bridge/includes/class-form-bridge-template.php

@@ -927,7 +927,7 @@ static function ( $field ) {
 
 		if ( 'woo' === $integration ) {
 			$data['form']['id'] = 1;
-		} elseif ( 'wpforms' === $integration ) {
+		} elseif ( in_array( $integration, array( 'wpforms', 'formidable' ), true ) ) {
 			$mappers = array();
 			foreach ( $data['form']['fields'] as &$field ) {
 				if ( 'file' !== $field['type'] ) {

forms-bridge/integrations/formidable/class-formidable-integration.php

@@ -304,14 +304,12 @@ public function serialize_form( $form ) {
 	 * @return array|null
 	 */
 	private function serialize_field( $field ) {
-		// Skip non-input fields.
-		if ( in_array( $field->type, array( 'data', 'summary', 'break', 'end_divider', 'divider', 'html', 'captcha', 'submit' ), true ) ) {
+		$skip_fields = array( 'data', 'summary', 'break', 'end_divider', 'divider', 'html', 'captcha', 'submit' );
+
+		if ( in_array( $field->type, $skip_fields, true ) ) {
 			return null;
 		}
 
-		$label = $field->name ?: $field->description;
-		$name  = $field->field_key ?: $label;
-
 		$options = array();
 		if ( isset( $field->options ) && is_array( $field->options ) ) {
 			foreach ( $field->options as $option ) {
@@ -376,8 +374,8 @@ private function serialize_field( $field ) {
 			array(
 				'id'          => $field->id,
 				'type'        => $type,
-				'name'        => trim( $name ),
-				'label'       => trim( $label ),
+				'name'        => trim( $field->name ),
+				'label'       => trim( $field->name ),
 				'required'    => $field->required,
 				'options'     => $options,
 				'is_file'     => 'file' === $field->type,
@@ -550,8 +548,8 @@ public function serialize_submission( $submission, $form_data ) {
 				continue;
 			}
 
-			$field_name = $field['name'];
-			$field_id   = $field['id'];
+			$field_name = trim( $field['name'] );
+			$field_id   = absint( $field['id'] );
 			$value      = $by_field_id[ $field_id ] ?? null;
 
 			if ( null !== $value ) {
@@ -653,7 +651,7 @@ private function format_value( $value, $field_type ) {
 				default:
 					return (string) $value;
 			}
-		} catch ( TypeError $e ) {
+		} catch ( TypeError ) {
 			return $value;
 		}
 	}
@@ -719,7 +717,7 @@ protected function submission_uploads( $submission, $form_data ) {
 			}
 
 			if ( ! empty( $paths ) ) {
-				$uploads[ $field['name'] ] = array(
+				$uploads[ trim( $field['name'] ) ] = array(
 					'path'     => $field['is_multi'] ? $paths : $paths[0],
 					'is_multi' => $field['is_multi'],
 				);
@@ -738,12 +736,12 @@ protected function submission_uploads( $submission, $form_data ) {
 	 */
 	private function prepare_fields( $fields ) {
 		$formidable_fields = array();
-		$count             = count( $fields );
+
+		$count = count( $fields );
 		for ( $i = 0; $i < $count; $i++ ) {
 			$field = $fields[ $i ];
 			$args  = array(
-				'name'          => $field['name'],
-				'label'         => $field['label'] ?? '',
+				'name'          => $field['label'],
 				'required'      => $field['required'] ?? false,
 				'default_value' => $field['value'] ?? '',
 			);
@@ -806,13 +804,13 @@ private function field_template( $type, $args, $options = array() ) {
 			$args,
 			array(
 				'type'          => $type,
-				'field_key'     => $args['name'] ?? 'untitled',
-				'name'          => $args['label'] ?? 'Untitled',
-				'required'      => $args['required'] ?? '',
+				'field_key'     => sanitize_title( $args['name'] ),
+				'name'          => $args['name'],
+				'required'      => $args['required'] ?? false,
 				'description'   => '',
 				'options'       => $args['options'] ?? '',
 				'field_options' => $options,
-				'multiple'      => $args['is_multi'] ?? 0,
+				'multiple'      => $args['is_multi'] ?? false,
 			),
 		);
 	}

forms-bridge/integrations/wpforms/class-wpforms-integration.php

@@ -22,9 +22,18 @@
  * WPForms integration.
  */
 class WPForms_Integration extends BaseIntegration {
-
+	/**
+	 * Handles integration name.
+	 *
+	 * @var string
+	 */
 	const NAME = 'wpforms';
 
+	/**
+	 * Handles integration title.
+	 *
+	 * @var string
+	 */
 	const TITLE = 'WP Forms';
 
 	/**
@@ -278,26 +287,13 @@ public function serialize_form( $form ) {
 	 * @param array[] $fields List of serialized fields.
 	 * @param array[] $all_fields Complete list of form data fields.
 	 *
-	 * @return array
+	 * @return array|null
 	 */
 	private function serialize_field( $field, $fields = array(), $all_fields = array() ) {
-		if (
-			in_array(
-				$field['type'],
-				array(
-					'submit',
-					'pagebreak',
-					'layout',
-					'captcha',
-					'content',
-					'entry-preview',
-					'html',
-					'divider',
-				),
-				true
-			)
-		) {
-			return;
+		$skip_fields = array( 'submit', 'pagebreak', 'layout', 'captcha', 'content', 'entry-preview', 'html', 'divider' );
+
+		if ( in_array( $field['type'], $skip_fields, true ) ) {
+			return null;
 		}
 
 		$repeaters = array();