From daa737be3c35736f3386450133c55f6b32866273 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Tue, 8 Jul 2025 15:01:44 -0700
Subject: [PATCH 01/48] Forms: Adds a new Form_Responses class

---
 .../changelog/update-form-response-storage    |    4 +
 .../src/contact-form/class-contact-form.php   |   12 +-
 .../src/contact-form/class-form-response.php  |  806 ++++++++++++
 .../src/contact-form/class-response-field.php |  157 +++
 .../php/contact-form/Contact_Form_Test.php    |   14 +-
 .../php/contact-form/Form_Response_Test.php   | 1130 +++++++++++++++++
 .../php/contact-form/Response_Field_Test.php  |  110 ++
 .../tests/php/contact-form/class-utility.php  |  137 ++
 8 files changed, 2360 insertions(+), 10 deletions(-)
 create mode 100644 projects/packages/forms/changelog/update-form-response-storage
 create mode 100644 projects/packages/forms/src/contact-form/class-form-response.php
 create mode 100644 projects/packages/forms/src/contact-form/class-response-field.php
 create mode 100644 projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
 create mode 100644 projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
 create mode 100644 projects/packages/forms/tests/php/contact-form/class-utility.php

diff --git a/projects/packages/forms/changelog/update-form-response-storage b/projects/packages/forms/changelog/update-form-response-storage
new file mode 100644
index 0000000000000..bc56c7d94b590
--- /dev/null
+++ b/projects/packages/forms/changelog/update-form-response-storage
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Forms: Adds a new Form_Responses class that keeps consistency between DB form response and the one before we submit it
diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index 6a43e0e60fa08..ca3211cd003e8 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -330,6 +330,14 @@ public static function get_default_subject( $attributes ) {
 
 		return $default_subject;
 	}
+	/**
+	 * Get the forms processed count.
+	 *
+	 * @return int
+	 */
+	public static function get_forms_count() {
+		return count( self::$forms );
+	}
 
 	/**
 	 * Store shortcode content for recall later
@@ -1415,7 +1423,8 @@ public function get_field_ids() {
 		);
 
 		// Initialize marketing consent
-		$field_ids['email_marketing_consent'] = null;
+		$field_ids['email_marketing_consent']       = null;
+		$field_ids['email_marketing_consent_field'] = null;
 
 		foreach ( $this->fields as $id => $field ) {
 			$type = $field->get_attribute( 'type' );
@@ -1448,6 +1457,7 @@ public function get_field_ids() {
 				case 'consent':
 					// Set email marketing consent for the first Consent type field
 					if ( null === $field_ids['email_marketing_consent'] ) {
+						$field_ids['email_marketing_consent_field'] = $id;
 						if ( $field->value ) {
 							$field_ids['email_marketing_consent'] = true;
 						} else {
diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
new file mode 100644
index 0000000000000..7ececfeb7e4d8
--- /dev/null
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -0,0 +1,806 @@
+<?php
+/**
+ * Form_Response class.
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+use WP_Post;
+/**
+ * Handles the response for a contact form submission.
+ *
+ * Form_Response objects are there to help us interact with the form response data.
+ */
+class Form_Response {
+
+	const POST_TYPE = 'feedback';
+
+	/**
+	 * The Post Object of the feedback entry.
+	 *
+	 * @var WP_Post|null
+	 */
+	protected $feedback_post;
+
+	/**
+	 * The form field values.
+	 *
+	 * @var array
+	 */
+	protected $fields = array();
+
+	/**
+	 * The original Contact_Form object, if available.
+	 *
+	 * @var Contact_Form|null
+	 */
+	protected $form;
+
+	/**
+	 * The current post object, if available.
+	 *
+	 * Usallyt this is accostied with the global $post object.
+	 *
+	 * @var WP_Post|null
+	 */
+	protected $current_post;
+
+	/**
+	 * The current page number associated with the feedback entry.
+	 *
+	 * This is used to track the page number of the form that the feedback was submitted from.
+	 *
+	 * Usally this is accosited with the global $page number varieble.
+	 *
+	 * @var int
+	 */
+	protected $current_page_number = 1;
+
+	/**
+	 * The status of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $status = 'publish'; // Default status is 'publish' or other statuses as needed.
+
+	/**
+	 * The IP address of the user who submitted the feedback.
+	 *
+	 * This is only available on form submissions, and might not be available when retrieving existing feedback posts in case the site admin decides to not store the IP address.
+	 *
+	 * @var string|null
+	 */
+	protected $ip_address = null;
+
+	/**
+	 * The subject of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $subject = '';
+
+	/**
+	 * Feedback ID of the feedback entry.
+	 *
+	 * @todo: figure out how this is used if at all.
+	 *
+	 * @var string
+	 */
+	protected $feedback_id = '';
+
+	/**
+	 * The author of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $author = '';
+
+	/**
+	 * The author email of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $author_email = '';
+
+	/**
+	 * The author url of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $author_url = '';
+
+	/**
+	 * The comment content of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $comment_content = '';
+
+	/**
+	 * Whether the user has given consent for data processing.
+	 *
+	 * @var bool
+	 */
+	protected $has_consent = false;
+
+	/**
+	 * The entry ID of the post that the feedback was submitted from.
+	 *
+	 * @var int
+	 */
+	protected $entry_id = 0;
+
+	/**
+	 * The entry title of the post that the feedback was submitted from.
+	 *
+	 * @var string
+	 */
+	protected $entry_title = '';
+
+	/**
+	 * The permalink of the post or page that the feedback was submitted from.
+	 * This is a computed value based on the current post.
+	 *
+	 * @var string
+	 */
+	protected $entry_permalink = '';
+
+	/**
+	 * The page number associated with the feedback entry submission.
+	 *
+	 * @var int
+	 */
+	protected $entry_page = 1;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param WP_Post|null      $feedback_post The post object representing the feedback.
+	 * @param Contact_Form|null $form  The form object.
+	 * @param array|null        $post_data The $_POST recieved during the form submission.
+	 * @param WP_Post|null      $current_post The current post object, if available.
+	 * @param int               $current_page_number The current page number associated with the current post object entry.
+	 */
+	public function __construct( $feedback_post = null, $form = null, $post_data = null, $current_post = null, $current_page_number = 1 ) {
+
+		$this->feedback_post = $feedback_post;
+		$this->form          = $form;
+
+		if ( $this->feedback_post instanceof WP_Post ) {
+
+			$parsed_content = static::parse_content( $this->feedback_post->post_content, $this->feedback_post->post_mime_type );
+
+			$this->status      = $this->feedback_post->post_status;
+			$this->feedback_id = $this->feedback_post->post_name;
+			$this->entry_id    = $this->feedback_post->post_parent ? (int) $this->feedback_post->post_parent : 0;
+			$current_post      = $this->entry_id ? get_post( $this->entry_id ) : null;
+
+			$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
+			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : null;
+			$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : '';
+			$this->author          = isset( $parsed_content['author'] ) ? $parsed_content['author'] : '';
+			$this->author_email    = isset( $parsed_content['author_email'] ) ? $parsed_content['author_email'] : '';
+			$this->author_url      = isset( $parsed_content['author_url'] ) ? $parsed_content['author_url'] : '';
+			$this->comment_content = isset( $parsed_content['comment_content'] ) ? $parsed_content['comment_content'] : '';
+			$this->has_consent     = isset( $parsed_content['has_consent'] ) ? $parsed_content['has_consent'] : false;
+			$this->entry_title     = isset( $parsed_content['entry_title'] ) ? $parsed_content['entry_title'] : '';
+			$this->entry_page      = isset( $parsed_content['entry_page'] ) ? (int) $parsed_content['entry_page'] : 1;
+
+		} elseif ( is_array( $post_data ) && ! empty( $post_data ) ) {
+
+			// If post_data is provided, use it to populate fields.
+			$this->status          = $this->status;
+			$this->feedback_id     = $this->get_computed_feedback_id();
+			$this->fields          = $this->get_computed_fields( $post_data );
+			$this->ip_address      = Contact_Form_Plugin::get_ip_address();
+			$this->subject         = $this->get_computed_subject( $post_data );
+			$this->author          = $this->get_computed_author( $post_data );
+			$this->author_email    = $this->get_computed_author_email( $post_data );
+			$this->author_url      = $this->get_computed_author_url( $post_data );
+			$this->comment_content = $this->get_computed_comment_content( $post_data );
+			$this->has_consent     = $this->get_computed_consent( $post_data );
+			$this->entry_id        = ! empty( $current_post ) ? (int) $current_post->ID : 0;
+			$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : '';
+			$this->entry_page      = $current_page_number;
+		}
+
+		$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : $this->entry_title;
+		$this->entry_permalink = ! empty( $current_post ) ? $this->get_computed_entry_permalink( $current_post, $this->entry_page ) : '';
+	}
+
+	/**
+	 * Get a sanitized value from the post data.
+	 *
+	 * @param string $key The key to look for in the post data.
+	 * @param array  $post_data The post data array, typically $_POST.
+	 *
+	 * @return string|array The sanitized value, or an empty string if the key is not found.
+	 */
+	private function get_field_value( $key, $post_data ) {
+		if ( isset( $post_data[ $key ] ) ) {
+			if ( is_array( $post_data[ $key ] ) ) {
+				return array_map( 'sanitize_text_field', wp_unslash( $post_data[ $key ] ) );
+			} else {
+				return sanitize_text_field( wp_unslash( $post_data[ $key ] ) );
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Create a response object from a feedback post ID.
+	 *
+	 * @param int $feedback_post_id The ID of the feedback post.
+	 * @return static|null
+	 */
+	public static function get( $feedback_post_id ) {
+
+		$feedback_post = get_post( $feedback_post_id );
+		if ( ! $feedback_post || self::POST_TYPE !== $feedback_post->post_type ) {
+			return null;
+		}
+
+		return new static( $feedback_post );
+	}
+
+	/**
+	 * Create a response object from a form submission.
+	 *
+	 * @param array        $post_data Typically $_POST.
+	 * @param Contact_Form $form      The form object.
+	 * @param WP_Post|null $current_post The current post object, if available.
+	 * @param int          $current_page_number The current page number associated with the current post object entry.
+	 *
+	 * @return static
+	 */
+	public static function from_submission( $post_data, $form, $current_post = null, $current_page_number = 1 ) {
+		return new static( null, $form, $post_data, $current_post, $current_page_number );
+	}
+
+	/**
+	 * Get all the fields of the response.
+	 */
+	public function get_fields() {
+		return $this->fields;
+	}
+
+	/**
+	 * Get all the values of the response.
+	 *
+	 * This is a convenience method to get all values in a simple array format.
+	 *
+	 * This is done for backwards compatibility. Use `get_fields()` instead.
+	 *
+	 * @return array
+	 */
+	private function get_all_values() {
+		$values = array();
+		foreach ( $this->fields as $field ) {
+			if ( ! $field instanceof Response_Field ) {
+				continue;
+			}
+			$values[ $field->get_key() ] = $field->get_value();
+		}
+		return $values;
+	}
+
+	/**
+	 * Get the feedback ID of the response.
+	 * Which is the same as the post name for feedback entries.
+	 * Please note that this is not the same as the feedback post ID.
+	 *
+	 * @return string
+	 */
+	public function get_feedback_id() {
+		return $this->feedback_id;
+	}
+
+	/**
+	 * Get the author name of the feedback entry.
+	 * If the author is not provided we will use the email instead.
+	 *
+	 * @return string
+	 */
+	public function get_author() {
+		if ( ! empty( $this->author ) ) {
+			return $this->author;
+		}
+		if ( ! empty( $this->author_email ) ) {
+			return $this->author_email;
+		}
+		return $this->author;
+	}
+
+	/**
+	 * Get the author email of a feedback entry.
+	 *
+	 * @return string
+	 */
+	public function get_author_email() {
+		return $this->author_email;
+	}
+
+	/**
+	 * Get the author url of a feedback entry.
+	 *
+	 * @return string
+	 */
+	public function get_author_url() {
+		return $this->author_url;
+	}
+
+	/**
+	 * Get the comment content of a feedback entry.
+	 *
+	 * @return string
+	 */
+	public function get_comment_content() {
+		return $this->comment_content;
+	}
+
+	/**
+	 * Get the IP address of the submitted feedback request.
+	 *
+	 * @return string|null
+	 */
+	public function get_ip_address() {
+		return $this->ip_address;
+	}
+
+	/**
+	 * Get the email subject.
+	 *
+	 * @return string
+	 */
+	public function get_subject() {
+		return $this->subject;
+	}
+
+	/**
+	 * Gets the value of the consent field.
+	 *
+	 * @return bool
+	 */
+	public function has_consent() {
+		return $this->has_consent;
+	}
+
+	/**
+	 * Get the feedback status. For example 'publish', 'spam' or 'trash'.
+	 *
+	 * @return string
+	 */
+	public function get_status() {
+		return $this->status;
+	}
+
+	/**
+	 * Sets the status of the feedback.
+	 *
+	 * @param string $status The status to set for the feedback entry.
+	 * @return void
+	 */
+	public function set_status( $status ) {
+		$this->status = $status;
+	}
+
+	/**
+	 * Get the entry ID of the post that the feedback was submitted from.
+	 *
+	 * This is the post ID of the post or page that the feedback was submitted from.
+	 *
+	 * @return int|null
+	 */
+	public function get_entry_id() {
+		return $this->entry_id;
+	}
+
+	/**
+	 * Get the entry title of the post that the feedback was submitted from.
+	 *
+	 * This is the title of the post or page that the feedback was submitted from.
+	 *
+	 * @return string
+	 */
+	public function get_entry_title() {
+		return $this->entry_title;
+	}
+
+	/**
+	 * Get the permalink of the post or page that the feedback was submitted from.
+	 * This includes the page number if the feedback was submitted from a paginated form.
+	 *
+	 * @return string
+	 */
+	public function get_entry_permalink() {
+		return $this->entry_permalink;
+	}
+	/**
+	 * Save the feedback entry to the database.
+	 *
+	 * @return int
+	 */
+	public function save() {
+		$post_id = wp_insert_post(
+			array(
+				'post_type'      => self::POST_TYPE,
+				'post_status'    => $this->status,
+				'post_name'      => $this->feedback_id,
+				'post_content'   => $this->serialize(),
+				'post_mime_type' => 'v2', // a way to help us identify what version of the data this is.
+				'post_parent'    => $this->entry_id,
+			)
+		);
+
+		$this->feedback_post = get_post( $post_id );
+		return $this->feedback_post ? $this->feedback_post->ID : 0;
+	}
+
+	/**
+	 * Serialize the fields to JSON format.
+	 *
+	 * @return string
+	 */
+	public function serialize() {
+
+		$fields_to_serialize = array(
+			'subject'         => $this->subject,
+			'author'          => $this->author,
+			'author_email'    => $this->author_email,
+			'author_url'      => $this->author_url,
+			'comment_content' => $this->comment_content,
+			'has_consent'     => (bool) $this->has_consent,
+			'entry_title'     => $this->entry_title,
+			'entry_page'      => $this->entry_page,
+			'ip'              => $this->ip_address,
+		);
+
+		$fields_to_serialize['fields'] = array();
+		foreach ( $this->fields as $field ) {
+			if ( ! $field instanceof Response_Field ) {
+				continue;
+			}
+			$fields_to_serialize['fields'][] = $field->serialize();
+		}
+
+		// Check if the IP should be included.
+		if ( apply_filters( 'jetpack_contact_form_forget_ip_address', false, $this->ip_address ) ) {
+			$fields_to_serialize['ip'] = null;
+		}
+
+		return wp_json_encode( $fields_to_serialize );
+	}
+
+	/**
+	 * Helper function to parse the post content.
+	 *
+	 * @param string      $post_content The post content to parse.
+	 * @param string|null $version The version of the content format.
+	 * @return array Parsed fields.
+	 */
+	public static function parse_content( $post_content = '', $version = null ) {
+		if ( $version === 'v2' ) {
+			$decoded_content = json_decode( $post_content, true );
+			if ( $decoded_content === null ) {
+				// If JSON decoding fails, try to decode the second try with stripslashes and trim.
+				// This is a workaround for some cases where the JSON data is not properly formatted.
+				$decoded_content = json_decode( stripslashes( trim( $post_content ) ), true );
+			}
+
+			if ( $decoded_content === null ) {
+				return array();
+			}
+			$fields = array();
+			foreach ( $decoded_content['fields'] as $field ) {
+				$fields[ $field['key'] ] = Response_Field::from_serialized( $field );
+			}
+			$decoded_content['fields'] = $fields;
+			return $decoded_content;
+		}
+
+		// parse_feedback_content
+		$all_values      = array();
+		$content         = explode( '<!--more-->', $post_content );
+		$lines           = array();
+		$comment_content = '';
+		if ( count( $content ) > 1 ) {
+			$comment_content = $content[0];
+			$content         = str_ireplace( array( '<br />', ')</p>' ), '', $content[1] );
+
+			if ( str_contains( $content, 'JSON_DATA' ) ) {
+				$chunks = explode( "\nJSON_DATA", $content );
+
+				$all_values = json_decode( $chunks[1], true );
+
+				if ( $all_values === null ) {
+					// If JSON decoding fails, try to decode the second try with stripslashes and trim.
+					// This is a workaround for some cases where the JSON data is not properly formatted.
+					$all_values = json_decode( stripslashes( trim( $chunks[1] ) ), true );
+				}
+				$lines = array_filter( explode( "\n", $chunks[0] ) );
+			} else {
+				$fields_array = preg_replace( '/.*Array\s\( (.*)\)/msx', '$1', $content );
+
+				// This line of code is used to parse a string containing key-value pairs formatted as [Key] => Value and extract the keys and values into an array.
+				// The regular expression ensures that each key-value pair is correctly identified and captured.
+				// Given an input string
+				// [Key1] => Value1
+				// [Key2] => Value2
+				// it  $matches[1]: The keys (e.g., Key1, Key2 ).
+				// and $matches[2]: The values (e.g., Value1, Value2 ).
+				preg_match_all( '/^\s*\[([^\]]+)\] =\&gt\; (.*)(?=^\s*(\[[^\]]+\] =\&gt\;)|\z)/msU', $fields_array, $matches );
+
+				if ( count( $matches ) > 1 ) {
+					$all_values = array_combine( array_map( 'trim', $matches[1] ), array_map( 'trim', $matches[2] ) );
+				}
+
+				$lines = array_filter( explode( "\n", $content ) );
+			}
+		}
+
+		$var_map = array(
+			'AUTHOR'       => 'author',
+			'AUTHOR EMAIL' => 'author_email',
+			'AUTHOR URL'   => 'author_url',
+			'SUBJECT'      => 'subject',
+			'IP'           => 'ip',
+		);
+
+		$decoded_fields = array();
+
+		foreach ( $lines as $line ) {
+			$vars = explode( ': ', $line, 2 );
+			if ( ! empty( $vars ) ) {
+				if ( isset( $var_map[ $vars[0] ] ) ) {
+					$type                    = $var_map[ $vars[0] ];
+					$decoded_fields[ $type ] = self::strip_tags( trim( $vars[1] ) );
+				}
+			}
+		}
+		// All fields should always be an array, even if empty.
+		if ( ! is_array( $all_values ) ) {
+			$all_values = array();
+		}
+
+		$non_user_fields = array(
+			'email_marketing_consent',
+			'entry_title',
+			'entry_permalink',
+			'entry_page',
+			'feedback_id',
+		);
+
+		foreach ( $all_values as $key => $value ) {
+			$key   = wp_strip_all_tags( $key );
+			$label = '';
+			if ( in_array( $key, $non_user_fields, true ) ) {
+				$decoded_fields[ $key ] = $value;
+				// Skip fields that are not user-submitted.
+				continue;
+			}
+			$decoded_fields['fields'][ $key ] = new Response_Field( $key, $label, $value );
+		}
+
+		$decoded_fields['comment_content'] = trim( self::strip_tags( $comment_content ) );
+
+		return $decoded_fields;
+	}
+
+	/**
+	 * Strips HTML tags from input.  Output is NOT HTML safe.
+	 *
+	 * @param mixed $data_with_tags - data we're stripping HTML tags from.
+	 * @return mixed
+	 */
+	public static function strip_tags( $data_with_tags ) {
+		$data_without_tags = array();
+		if ( is_array( $data_with_tags ) ) {
+			foreach ( $data_with_tags as $index => $value ) {
+				if ( is_array( $value ) ) {
+					$data_without_tags[ $index ] = self::strip_tags( $value );
+					continue;
+				}
+
+				$index = sanitize_text_field( (string) $index );
+				$value = wp_kses_post( (string) $value );
+				$value = str_replace( '&amp;', '&', $value ); // undo damage done by wp_kses_normalize_entities()
+
+				$data_without_tags[ $index ] = $value;
+			}
+		} else {
+			$data_without_tags = wp_kses_post( (string) $data_with_tags );
+			$data_without_tags = str_replace( '&amp;', '&', $data_without_tags ); // undo damage done by wp_kses_normalize_entities()
+		}
+
+		return $data_without_tags;
+	}
+
+	/**
+	 * Get the computed feedback id.
+	 *
+	 * @return string
+	 */
+	private function get_computed_feedback_id() {
+		$comment_author = $this->get_author();
+
+		// Build feedback reference
+		$feedback_time = \current_time( 'mysql' );
+		return md5( "{$comment_author} - {$feedback_time}" );
+	}
+
+	/**
+	 * Get all the fields of the response, computed from the post data.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return array An array of Response_Field objects.
+	 */
+	private function get_computed_fields( $post_data ) {
+
+		$fields = array();
+
+		$field_ids = $this->form->get_field_ids();
+		// For all fields, grab label and value
+		$i = 1;
+		foreach ( $field_ids['all'] as $field_id ) {
+			$field = $this->form->fields[ $field_id ];
+			$type  = $field->get_attribute( 'type' );
+			if ( ! $field->is_field_renderable( $type ) ) {
+				continue;
+			}
+
+			$value = $this->get_field_value( $field_id, $post_data );
+			$label = wp_strip_all_tags( $field->get_attribute( 'label' ) );
+			$key   = $i . '_' . $label;
+
+			$fields[ $key ] = new Response_Field( $key, $label, $value, $type );
+			++$i; // Increment prefix counter for the next field
+		}
+
+		return $fields;
+	}
+
+	/**
+	 * Gets the computed subject.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_subject( $post_data ) {
+
+		$contact_form_subject = $this->form->get_attribute( 'subject' );
+		$field_ids            = $this->form->get_field_ids();
+
+		if ( isset( $field_ids['subject'] ) ) {
+			$value = $this->get_field_value( $field_ids['subject'], $post_data );
+			if ( ! empty( $value ) ) {
+				$contact_form_subject = $value;
+			}
+		}
+
+		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
+	}
+
+	/**
+	 * Gets the computed author.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_author( $post_data ) {
+		$field_ids = $this->form->get_field_ids();
+		if ( isset( $field_ids['name'] ) ) {
+			$value = $this->get_field_value( $field_ids['name'], $post_data );
+			if ( is_string( $value ) ) {
+				return self::strip_tags(
+					stripslashes(
+						/** This filter is already documented in core/wp-includes/comment-functions.php */
+						apply_filters( 'pre_comment_author_name', addslashes( $value ) )
+					)
+				);
+			}
+		}
+
+		return '';
+	}
+
+	/**
+	 * Gets the computed author email.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_author_email( $post_data ) {
+		$field_ids = $this->form->get_field_ids();
+		if ( isset( $field_ids['email'] ) ) {
+			$value = $this->get_field_value( $field_ids['email'], $post_data );
+			if ( is_string( $value ) ) {
+				return self::strip_tags(
+					stripslashes(
+						/** This filter is already documented in core/wp-includes/comment-functions.php */
+						apply_filters( 'pre_comment_author_email', addslashes( $value ) )
+					)
+				);
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Gets the computed author url.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_author_url( $post_data ) {
+		$field_ids = $this->form->get_field_ids();
+		if ( isset( $field_ids['url'] ) ) {
+			$value = $this->get_field_value( $field_ids['url'], $post_data );
+			if ( is_string( $value ) ) {
+				return self::strip_tags(
+					stripslashes(
+						/** This filter is already documented in core/wp-includes/comment-functions.php */
+						apply_filters( 'pre_comment_author_url', addslashes( $value ) )
+					)
+				);
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Gets the computed comment content.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_comment_content( $post_data ) {
+		$field_ids = $this->form->get_field_ids();
+		if ( isset( $field_ids['textarea'] ) ) {
+			$value = $this->get_field_value( $field_ids['textarea'], $post_data );
+			if ( is_string( $value ) ) {
+				return trim( self::strip_tags( stripslashes( $value ) ) );
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Gets the computed consent.
+	 *
+	 * @param array $post_data The post data from the form submission.
+	 * @return string
+	 */
+	private function get_computed_consent( $post_data ) {
+		$field_ids = $this->form->get_field_ids();
+
+		if ( isset( $field_ids['email_marketing_consent_field'] ) && $field_ids['email_marketing_consent_field'] !== null ) {
+			return (bool) $this->get_field_value( $field_ids['email_marketing_consent_field'], $post_data );
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets the permalink of post parent associated with the feedback.
+	 *
+	 * So that we can link the user to the URL that the feedback was created from.
+	 *
+	 * @param WP_Post|null $current_post The current post object, if available.
+	 * @param int          $current_page_number The current page number associated with the current post.
+	 *
+	 * @return string The permalink of the post or page that the feedback was submitted from.
+	 */
+	private function get_computed_entry_permalink( $current_post = null, $current_page_number = 1 ) {
+
+		if ( $current_post instanceof WP_Post ) {
+			$permalink = get_the_permalink( $current_post );
+			if ( $current_page_number > 1 ) {
+				$permalink = add_query_arg( 'page', $current_page_number, $permalink );
+			}
+			return $permalink;
+		}
+		return '';
+	}
+}
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
new file mode 100644
index 0000000000000..80c027f2eb10d
--- /dev/null
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Response_Field class.
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+/**
+ * Handles the
+ *
+ * Form_Response objects are there to help us interact with the form response data.
+ */
+class Response_Field {
+
+	/**
+	 * The key of the field.
+	 *
+	 * @var string
+	 */
+	private $key;
+
+	/**
+	 * The lable of the field.
+	 *
+	 * @var string
+	 */
+	private $label;
+
+	/**
+	 * The value of the field.
+	 *
+	 * @var mixed
+	 */
+	private $value;
+
+	/**
+	 * The type of the field.
+	 *
+	 * @var string
+	 */
+	private $type;
+
+	/**
+	 * Additional metadata for the field.
+	 *
+	 * @var array
+	 */
+	private $meta;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $key   The key of the field.
+	 * @param string $label The label of the field.
+	 * @param mixed  $value The value of the field.
+	 * @param string $type  The type of the field (default is 'basic').
+	 * @param array  $meta  Additional metadata for the field (default is an empty array).
+	 */
+	public function __construct( $key, $label, $value, $type = 'basic', $meta = array() ) {
+		$this->key   = $key;
+		$this->label = $label;
+		$this->value = $value;
+		$this->type  = $type;
+		$this->meta  = $meta;
+	}
+
+	/**
+	 * Get the value of the field.
+	 *
+	 * @return string
+	 */
+	public function get_key() {
+		return $this->key;
+	}
+
+	/**
+	 * Get the label of the field.
+	 *
+	 * @return string
+	 */
+	public function get_label() {
+		return $this->label;
+	}
+
+	/**
+	 * Get the value of the field.
+	 *
+	 * @return mixed
+	 */
+	public function get_value() {
+		return $this->value;
+	}
+
+	/**
+	 * Get the value of the field.
+	 *
+	 * @return mixed
+	 */
+	public function render_value() {
+		return $this->value;
+	}
+
+	/**
+	 * Get the type of the field.
+	 *
+	 * @return string
+	 */
+	public function get_type() {
+		return $this->type;
+	}
+
+	/**
+	 * Get the meta of the field.
+	 *
+	 * @return string
+	 */
+	public function get_meta() {
+		return $this->meta;
+	}
+
+	/**
+	 * Get the serialized representation of the field.
+	 *
+	 * @return array
+	 */
+	public function serialize() {
+		return array(
+			'key'   => $this->get_key(),
+			'label' => $this->get_label(),
+			'value' => $this->get_value(),
+			'type'  => $this->get_type(),
+			'meta'  => $this->get_meta(),
+		);
+	}
+	/**
+	 * Create a Response_Field object from serialized data.
+	 *
+	 * @param array $data The serialized data.
+	 *
+	 * @return Response_Field|null Returns a Response_Field object or null if the data is invalid.
+	 */
+	public static function from_serialized( $data ) {
+		if ( ! is_array( $data ) || ! isset( $data['key'] ) || ! isset( $data['value'] ) || ! isset( $data['label'] ) ) {
+			return null;
+		}
+
+		return new self(
+			$data['key'],
+			$data['label'],
+			$data['value'],
+			isset( $data['type'] ) ? $data['type'] : 'basic',
+			isset( $data['meta'] ) ? $data['meta'] : array()
+		);
+	}
+}
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index fe63c94439a10..58c03b2566cb8 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -131,15 +131,11 @@ public function tear_down() {
 	 * @param string $form_id Optional form ID. If not provided, will use $this->post->ID.
 	 */
 	private function add_field_values( $values, $form_id = null ) {
-		$prefix = $form_id ? $form_id : 'g' . $this->post->ID;
-		$_POST  = array();
-		foreach ( $values as $key => $val ) {
-			if ( strpos( $key, 'contact-form' ) === 0 || strpos( $key, 'action' ) === 0 ) {
-				$_POST[ $key ] = $val;
-			} else {
-				$_POST[ $prefix . '-' . $key ] = $val;
-			}
-		}
+		Utility::add_post_request(
+			$values,
+			$form_id,
+			$this->post->ID
+		);
 	}
 
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
new file mode 100644
index 0000000000000..7a18da98fd803
--- /dev/null
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -0,0 +1,1130 @@
+<?php
+/**
+ * Unit Tests for Automattic\Jetpack\Forms\Contact_Form.
+ *
+ * To run the test visit the packages/forms directory and run composer test-php
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+require_once __DIR__ . '/class-utility.php'; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use WorDBless\BaseTestCase;
+
+/**
+ * Test class for Contact_Form
+ *
+ * @covers Automattic\Jetpack\Forms\ContactForm\Form_Response
+ */
+#[CoversClass( Form_Response::class )]
+class Form_Response_Test extends BaseTestCase {
+
+	public function test_from_post_id_returns_null_for_invalid_post() {
+		$response = Form_Response::get( 999999 );
+		$this->assertNull( $response );
+	}
+
+	public function test_from_post_id_returns_instance_for_valid_feedback_post() {
+		$post_id  = \wp_insert_post(
+			array(
+				'post_type'     => 'feedback',
+				'post_status'   => 'publish',
+				'post_title'    => 'Test Feedback',
+				'post_content'  => '{}',
+				'page_template' => 'v2',
+			)
+		);
+		$response = Form_Response::get( $post_id );
+		$this->assertInstanceOf( Form_Response::class, $response );
+	}
+
+	public function test_from_submission_sets_fields_and_post_data() {
+		$form      = new Contact_Form( array() );
+		$post_data = array(
+			'name'    => 'John Doe',
+			'email'   => 'john@example.com',
+			'message' => 'Hello!',
+			'ignore'  => 'should not be included',
+		);
+		$response  = Form_Response::from_submission( $post_data, $form );
+		$this->assertInstanceOf( Form_Response::class, $response );
+	}
+
+	public function test_form_response_is_matches_empty_data() {
+		$form      = new Contact_Form( array() );
+		$post_data = array();
+		$response  = Form_Response::from_submission( $post_data, $form );
+		$post_id   = $response->save();
+
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $response->serialize(), $post_response->serialize() );
+		$this->assertEquals( $response->get_fields(), $post_response->get_fields() );
+	}
+
+	public function test_form_response_is_matches_submission_data() {
+		$name    = 'John Doe';
+		$email   = 'john@example.com';
+		$message = 'Test message';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => $name,
+				'email'   => $email,
+				'message' => $message,
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response = Form_Response::from_submission( $post_data, $form );
+		$post_id  = $response->save();
+
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $response->serialize(), $post_response->serialize() );
+		$this->assertEquals( $response->get_fields(), $post_response->get_fields() );
+
+		foreach ( $response->get_fields() as $field ) {
+			$this->assertInstanceOf( Response_Field::class, $field );
+		}
+
+		foreach ( $post_response->get_fields() as $field ) {
+			$this->assertInstanceOf( Response_Field::class, $field );
+		}
+
+		foreach ( $post_response->get_fields() as $field_key => $field ) {
+			$this->assertEquals( $response->get_fields()[ $field_key ]->serialize(), $post_response->get_fields()[ $field_key ]->serialize(), 'Serialized response field should match' );
+		}
+
+		$this->assertEquals( $name, $response->get_fields()['1_Name']->get_value(), 'Response field value should match' );
+		$this->assertEquals( $name, $post_response->get_fields()['1_Name']->get_value(), 'Saved response field value should match' );
+
+		$this->assertEquals( 'Name', $response->get_fields()['1_Name']->get_label(), 'Name response field label should match' );
+		$this->assertEquals( 'Name', $post_response->get_fields()['1_Name']->get_label(), 'Saved response field label should match' );
+		$this->assertEquals( 'name', $response->get_fields()['1_Name']->get_type(), 'Response field type should match' );
+		$this->assertEquals( 'name', $post_response->get_fields()['1_Name']->get_type(), 'Saved response type value should match' );
+
+		$this->assertEquals( $email, $response->get_fields()['2_Email']->get_value(), 'Response field value should match' );
+		$this->assertEquals( $email, $post_response->get_fields()['2_Email']->get_value(), 'Saved response field value should match' );
+
+		$this->assertEquals( $message, $response->get_fields()['3_Message']->get_value(), 'Response field value should match' );
+		$this->assertEquals( $message, $post_response->get_fields()['3_Message']->get_value(), 'Saved Name response field value should match ' );
+	}
+
+	/**
+	 * Test that a previously saved response can be handled correctly.
+	 *
+	 * This test checks if the Form_Response class can retrieve and handle
+	 * a response that was saved in the legacy format.
+	 */
+	public function test_handle_previously_saved_response() {
+
+		$post_id = Utility::create_legacy_feedback(
+			array(
+				'1_field' => 'value1',
+				'2_field' => 'value2',
+			)
+		);
+
+		$response = Form_Response::get( $post_id );
+
+		$this->assertInstanceOf( Form_Response::class, $response );
+
+		$field = $response->get_fields()['1_field'];
+
+		$this->assertInstanceOf( Response_Field::class, $field );
+		$this->assertEquals( '1_field', $field->get_key() );
+		$this->assertEquals( 'value1', $field->render_value() );
+		$this->assertEquals( 'value1', $field->render_value() );
+		$this->assertEquals( 'basic', $field->get_type() ); // Assuming 'basic' is the default type for a simple text field.
+	}
+	/**
+	 * Tests that the feedback ID is computed correctly when saving a from response.
+	 *
+	 * It should be non empty and match the post slug.
+	 */
+	public function test_form_response_computed_feedback_id() {
+		$name    = 'John Doe';
+		$email   = 'john@example.com';
+		$message = 'Test message';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => $name,
+				'email'   => $email,
+				'message' => $message,
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response = Form_Response::from_submission( $post_data, $form );
+		$post_id  = $response->save();
+		$post     = get_post( $post_id );
+
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $response->get_feedback_id(), $post_response->get_feedback_id(), 'Feedback ID should match' );
+		$this->assertEquals( $post->post_name, $post_response->get_feedback_id(), 'Feedback ID should match post slug' );
+		$this->assertNotEmpty( $post_response->get_feedback_id(), 'Feedback ID should not be empty' );
+	}
+
+	/**
+	 * Test the IP address is included in the serialized response.
+	 * It should be always available when the reponse is created during the form submission.
+	 *
+	 * It should only be empty if the response that has the filter applied to it.
+	 */
+	public function test_ip_address_included_in_serialized_response() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'John Doe',
+				'email'   => 'john@example.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		// The IP address should be present.
+		$this->assertNotEmpty( $response->get_ip_address(), 'IP address should not be empty' );
+		$this->assertNotEmpty( $post_response->get_ip_address(), 'IP address should not be empty' );
+		$this->assertEquals( $response->get_ip_address(), $post_response->get_ip_address(), 'IP address should match' );
+
+		add_filter( 'jetpack_contact_form_forget_ip_address', '__return_true' );
+		$new_post_id = $response->save();
+		remove_filter( 'jetpack_contact_form_forget_ip_address', '__return_true' );
+
+		// The IP address should NOT be present.
+		$post_response = Form_Response::get( $new_post_id );
+		$this->assertEmpty( $post_response->get_ip_address(), 'IP address should BE empty' );
+	}
+
+	/**
+	 * Test the IP address is included in the serialized response.
+	 * It should be always available when the reponse is created during the form submission.
+	 *
+	 * It should only be empty if the response that has the filter applied to it.
+	 */
+	public function test_ip_address_in_legacy() {
+		$ip = 'http://123.123.123.122';
+
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			null,
+			null,
+			null,
+			$ip
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $ip, $post_response->get_ip_address(), 'IP should match the legacy feedback  IP' );
+	}
+
+	/**
+	 * Test the subject line is computed for legacy correctly.
+	 */
+	public function test_computed_subject_legacy() {
+		$subject = 'Test Subject';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			null,
+			null,
+			null,
+			null,
+			$subject
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the legacy feedback post subject' );
+	}
+
+	/**
+	 * Test the subject line is computed correctly.
+	 */
+	public function test_computed_form_subject() {
+		$subject = 'Test Subject';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'John Doe',
+				'email'   => 'john@example.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+				'subject'     => $subject,
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
+		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+	}
+
+	/**
+	 * Test the subject line is computed via field
+	 */
+	public function test_computed_form_subject_field() {
+		$subject = 'Test Subject';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'John Doe',
+				'subject' => $subject,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Subject' type='subject' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
+		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+	}
+
+	/**
+	 * Test the subject line is computed correctly when both a subject attribute and a field is present.
+	 */
+	public function test_computed_form_subject_field_overwrites() {
+		$subject = 'Test Subject';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'John Doe',
+				'subject' => $subject,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+				'subject'     => $subject . ' (from form attributes)',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Subject' type='subject' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
+		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+	}
+
+	/**
+	 * Test the subject line is computed correctly and the filter is applied correctly.
+	 */
+	public function test_computed_form_subject_field_overwrites_filter() {
+		$subject = 'Test Subject';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'John Doe',
+				'subject' => $subject,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+				'subject'     => $subject . ' (from form attributes)',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Subject' type='subject' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		add_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
+
+		// Create a contact form
+		$response = Form_Response::from_submission( $post_data, $form );
+		$post_id  = $response->save();
+		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( 'Overwritten Subject (from filter)', $response->get_subject(), 'Subject should match the form submission' );
+		$this->assertEquals( 'Overwritten Subject (from filter)', $post_response->get_subject(), 'Subject should match the saved form submission' );
+	}
+	/**
+	 * Callback for the contact_form_subject filter.
+	 *
+	 * This function is used to overwrite the subject line when the filter is applied.
+	 *
+	 * @return string The overwritten subject line.
+	 */
+	public function subject_from_filter() {
+		// Overwrite the subject with a different value.
+		return 'Overwritten Subject (from filter)';
+	}
+
+	public function test_computed_name_for_legacy() {
+		$author  = 'Mikey Mouse';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			$author
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $author, $post_response->get_author(), 'Author should match the legacy feedback post author' );
+	}
+
+	public function test_computed_name() {
+		$author = 'Mikey Mouse';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => $author,
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $author, $response->get_author(), 'Author should match the form submission' );
+		$this->assertEquals( $author, $post_response->get_author(), 'Author should match the saved form submission' );
+	}
+
+	public function test_computed_name_as_email() {
+		$author = ''; // author is empty
+		$email  = 'email@email.com';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => $author,
+				'email'   => $email,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $email, $response->get_author(), 'Author should match the form submission' );
+		$this->assertEquals( $email, $post_response->get_author(), 'Author should match the saved form submission' );
+	}
+
+	public function test_computed_name_filter() {
+		$author = 'Mikey Mouse';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => $author,
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		add_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
+		$response = Form_Response::from_submission( $post_data, $form );
+		remove_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
+
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( 'STRING', $response->get_author(), 'Author should match the form submission' );
+		$this->assertEquals( 'STRING', $post_response->get_author(), 'Author should match the saved form submission' );
+	}
+	/**
+	 * A helper function that sets the filter to return string 'STRING'.
+	 *
+	 * @return string
+	 */
+	public function set_filter_as_string() {
+		return 'STRING';
+	}
+
+	public function test_computed_email_for_legacy() {
+		$email   = 'email@email.com';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			null,
+			$email
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the legacy feedback post author email' );
+	}
+
+	public function test_computed_email() {
+
+		$email   = 'email@email.com';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'author ',
+				'email'   => $email,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $email, $response->get_author_email(), 'Author email should match the form submission' );
+		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the saved form submission' );
+	}
+
+	public function test_computed_email_filter() {
+		$email = 'email@email.com';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'    => 'joe',
+				'email'   => $email,
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		add_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
+		$response = Form_Response::from_submission( $post_data, $form );
+		remove_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
+
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( 'STRING', $response->get_author_email(), 'Author email should match the form submission' );
+		$this->assertEquals( 'STRING', $post_response->get_author_email(), 'Author email should match the saved form submission' );
+	}
+
+	public function test_computed_url_for_legacy() {
+		$url     = 'https://wordpress.com';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			null,
+			null,
+			$url
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $url, $post_response->get_author_url(), 'Author url should match the legacy feedback post author url' );
+	}
+
+	public function test_computed_url() {
+		$url = 'https://wordpress.com';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'url'     => $url,
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Url' type='url' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $url, $response->get_author_url(), 'Author url should match the form submission' );
+		$this->assertEquals( $url, $post_response->get_author_url(), 'Author url should match the saved form submission' );
+	}
+
+	public function test_computed_url_filter() {
+		$url     = 'https://wordpress.com';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'url'     => $url,
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Url' type='url' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		add_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
+		$response = Form_Response::from_submission( $post_data, $form );
+		remove_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
+
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( 'STRING', $response->get_author_url(), 'Author url should match the form submission' );
+		$this->assertEquals( 'STRING', $post_response->get_author_url(), 'Author url should match the saved form submission' );
+	}
+
+	public function test_computed_comment_content_for_legacy() {
+		$content = 'Some comment content!';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			$content
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $content, $post_response->get_comment_content(), 'Comment content should match the legacy feedback post author url' );
+	}
+
+	public function test_computed_comment_content() {
+		$content = 'Some comment content!';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'url'     => 'https://howdy.com',
+				'email'   => 'email@email.com',
+				'message' => $content,
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Url' type='url' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		// Create a contact form
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $content, $response->get_comment_content(), 'Comment content should match the form submission' );
+		$this->assertEquals( $content, $post_response->get_comment_content(), 'Comment content should match the saved form submission' );
+	}
+
+	public function test_status_from_legacy() {
+		$status  = 'spam';
+		$post_id = Utility::create_legacy_feedback(
+			array(),
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			'spam'
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $status, $post_response->get_status(), 'Status should match the legacy feedback status' );
+	}
+
+	public function test_computed_status() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( 'publish', $response->get_status(), 'Status should match the form submission' );
+		$this->assertEquals( 'publish', $post_response->get_status(), 'Status should match the saved form submission' );
+	}
+
+	public function test_set_status() {
+		$status  = 'trash';
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form );
+		$response->set_status( $status );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertEquals( $status, $response->get_status(), 'Status should match the form submission' );
+		$this->assertEquals( $status, $post_response->get_status(), 'Status should match the saved form submission' );
+	}
+
+	public function test_consent() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email'   => 'email@email.com',
+				'consent' => 'Yes',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
+		);
+
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+		$this->assertTrue( $response->has_consent(), 'Has consent should match the form submission' );
+		$this->assertTrue( $post_response->has_consent(), 'Has consent should match the saved form submission' );
+	}
+
+	public function test_empty_consent() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email'   => 'email@email.com',
+				'consent' => '',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
+		);
+
+		$response      = Form_Response::from_submission( $post_data, $form );
+		$post_id       = $response->save();
+		$post_response = Form_Response::get( $post_id );
+		$this->assertFalse( $response->has_consent(), 'Has consent should match the form submission' );
+		$this->assertFalse( $post_response->has_consent(), 'Has consent should match the saved form submission' );
+	}
+
+	/**
+	 * Helper function for creating the post context.
+	 * This is helpful for testing the post context.
+	 **/
+	private function create_post_context() {
+		$author_id = wp_insert_user(
+			array(
+				'user_email' => 'john@example.com',
+				'user_login' => 'test_user',
+				'user_pass'  => 'abc123',
+			)
+		);
+
+		$post_id = wp_insert_post(
+			array(
+				'post_title'   => 'POST TITLE ' . microtime(),
+				'post_content' => 'POST CONTENT',
+				'post_status'  => 'publish',
+				'post_author'  => $author_id,
+			),
+			true
+		);
+
+		global $post;
+		$post = get_post( $post_id );
+		return $post;
+	}
+
+	/**
+	 * Helper function for destroying the post context.
+	 * This is helpful cleaning up the post context after the test.
+	 **/
+	private function destroy_post_context() {
+		global $post;
+		if ( $post ) {
+			wp_delete_user( $post->post_author, true );
+			wp_delete_post( $post->ID, true );
+			$post = null;
+		}
+	}
+
+	public function test_compute_entry_ID_legacy() {
+		$current_post = $this->create_post_context();
+		$post_id      = Utility::create_legacy_feedback();
+		$this->destroy_post_context();
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $current_post->ID, $post_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
+	}
+
+	public function test_compute_entry_ID() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email'   => 'email@email.com',
+				'consent' => '',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+		$this->destroy_post_context();
+
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEquals( $current_post->ID, $response->get_entry_id(), 'Entry_ID should match the form submission' );
+		$this->assertEquals( $current_post->ID, $post_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
+	}
+
+	public function test_compute_entry_title() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+
+		$post_response = Form_Response::get( $post_id );
+		$this->destroy_post_context();
+
+		$this->assertEquals( $current_post->post_title, $response->get_entry_title(), 'Post title should match the form submission' );
+		$this->assertEquals( $current_post->post_title, $post_response->get_entry_title(), 'Post title should match the saved form submission' );
+	}
+
+	public function test_compute_entry_title_updated() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+
+		// Update the post title to simulate an update.
+		$update_title = 'Updated Title';
+		wp_update_post(
+			array(
+				'ID'         => $current_post->ID,
+				'post_title' => $update_title,
+			)
+		);
+
+		$post_response = Form_Response::get( $post_id );
+		$this->destroy_post_context();
+
+		$this->assertEquals( $update_title, $post_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
+	}
+
+	public function test_compute_entry_title_deleted() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+		$this->destroy_post_context();
+
+		$this->assertSame( '', get_the_title( $current_post->ID ), 'Post title should not be available after the post is deleted' );
+		// At this point we should have a deleted post.
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertNotEmpty( $post_response->get_entry_title(), 'Post Title should NOT be empty after the post is deleted' );
+		$this->assertEquals( $current_post->post_title, $post_response->get_entry_title(), 'Post Title should match the saved form submission Original post title' );
+	}
+
+	public function test_compute_entry_permalink() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+
+		$post_response = Form_Response::get( $post_id );
+		$this->destroy_post_context();
+		$current_permalink = get_the_permalink( $current_post );
+		$this->assertEquals( $current_permalink, $response->get_entry_permalink(), 'Post permalink should match the form submission' );
+
+		$this->assertEquals( $current_permalink, $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
+	}
+
+	public function test_compute_entry_permalink_deleted_post() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$post_id  = $response->save();
+		$this->destroy_post_context(); // Destroy the post context to simulate a deleted post.
+		$post_response = Form_Response::get( $post_id );
+		$this->assertEmpty( $post_response->get_entry_permalink(), 'Post permalink should match the form submission' );
+	}
+
+	public function test_compute_entry_permalink_with_page_number() {
+		$current_post = $this->create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form, $current_post, 999 );
+		$post_id  = $response->save();
+
+		$post_response = Form_Response::get( $post_id );
+		$this->destroy_post_context();
+
+		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
+		$this->assertStringContainsString( 'page=999', $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
+	}
+}
diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
new file mode 100644
index 0000000000000..4f54f903f2cc0
--- /dev/null
+++ b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Unit Tests for Automattic\Jetpack\Forms\Contact_Form.
+ *
+ * To run the test visit the packages/forms directory and run composer test-php
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use WorDBless\BaseTestCase;
+
+/**
+ * Test class for Response_Field
+ *
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Response_Field
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Form_Response
+ */
+#[CoversClass( Response_Field::class )]
+#[CoversClass( Form_Response::class )]
+class Response_Field_Test extends BaseTestCase {
+	/**
+	 * Test that the Response_Field class can be instantiated.
+	 */
+	public function test_response_field_can_be_instantiated() {
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertInstanceOf( Response_Field::class, $field );
+
+		$this->assertEquals( 'test_key', $field->get_key() );
+		$this->assertEquals( 'test_label', $field->get_label() );
+		$this->assertEquals( 'test_value', $field->get_value() );
+		$this->assertEquals( 'basic', $field->get_type() );
+		$this->assertEquals( array(), $field->get_meta() );
+	}
+
+	/**
+	 * Test that the Response_Field class can be instantiated with additional parameters.
+	 */
+	public function test_response_field_with_additional_parameters() {
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
+		$this->assertEquals( 'test_key', $field->get_key() );
+		$this->assertEquals( 'test_label', $field->get_label() );
+		$this->assertEquals( 'test_value', $field->get_value() );
+		$this->assertEquals( 'text', $field->get_type() );
+		$this->assertEquals( array( 'meta_key' => 'meta_value' ), $field->get_meta() );
+	}
+
+	/**
+	 * Test that the Response_Field class can handle empty values.
+	 */
+	public function test_response_field_with_empty_values() {
+		$field = new Response_Field( 'test_key', '', '' );
+		$this->assertEquals( 'test_key', $field->get_key() );
+		$this->assertSame( '', $field->get_label() );
+		$this->assertSame( '', $field->get_value() );
+		$this->assertEquals( 'basic', $field->get_type() );
+		$this->assertEquals( array(), $field->get_meta() );
+	}
+
+	/**
+	 * Test that the Response_Field can serealize and unserialize correctly.
+	 */
+	public function test_response_field_serialization() {
+		$field        = new Response_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
+		$serialized   = $field->serialize();
+		$unserialized = Response_Field::from_serialized( $serialized );
+
+		$this->assertInstanceOf( Response_Field::class, $unserialized );
+
+		$this->assertEquals( $serialized, $unserialized->serialize() );
+		$this->assertEquals( 'test_key', $unserialized->get_key() );
+		$this->assertEquals( 'test_label', $unserialized->get_label() );
+		$this->assertEquals( 'test_value', $unserialized->get_value() );
+		$this->assertEquals( 'text', $unserialized->get_type() );
+		$this->assertEquals( array( 'meta_key' => 'meta_value' ), $unserialized->get_meta() );
+	}
+
+	/**
+	 * Test that the Response_Field can serealize and unserialize correctly.
+	 */
+	public function test_response_from_serialized_is_null() {
+
+		$unserialized = Response_Field::from_serialized( array( 'key' => 'test_key' ) );
+
+		$this->assertNull( $unserialized );
+
+		$unserialized = Response_Field::from_serialized( 'howdy' );
+
+		$this->assertNull( $unserialized );
+
+		$unserialized = Response_Field::from_serialized( array( 'value' => 'test_value' ) );
+
+		$this->assertNull( $unserialized );
+
+		$unserialized = Response_Field::from_serialized( array( 'label' => 'test_value' ) );
+
+		$this->assertNull( $unserialized );
+
+		$unserialized = Response_Field::from_serialized(
+			array(
+				'label' => 'test_value',
+				'value' => 'value',
+			)
+		);
+
+		$this->assertNull( $unserialized );
+	}
+}
diff --git a/projects/packages/forms/tests/php/contact-form/class-utility.php b/projects/packages/forms/tests/php/contact-form/class-utility.php
new file mode 100644
index 0000000000000..3f8653696a058
--- /dev/null
+++ b/projects/packages/forms/tests/php/contact-form/class-utility.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * Utility functions for Contact Form tests.
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+class Utility {
+	/**
+	 * Create a legacy feedback post.
+	 *
+	 * This function creates a mock feedback post in the legacy format used by Jetpack Contact Form.
+	 *
+	 * @param array  $all_values               An associative array of field values.
+	 * @param string $comment_content          The content of the comment.
+	 * @param string $comment_author           The name of the comment author.
+	 * @param string $comment_author_email     The email of the comment author.
+	 * @param string $comment_author_url       The URL of the comment author.
+	 * @param string $comment_ip_text          The IP address of the comment author.
+	 * @param string $subject                  The subject of the feedback.
+	 * @param string $status                   The status of the post (default is 'publish').
+	 * @return int|WP_Error The ID of the created post on success, or a WP_Error object on failure.
+	 */
+	public static function create_legacy_feedback(
+		$all_values = array(),
+		$comment_content = 'This is a test comment content.',
+		$comment_author = 'Test User',
+		$comment_author_email = 'test@email.com',
+		$comment_author_url = 'http://example.com',
+		$comment_ip_text = 'https://127.0.0.1',
+		$subject = 'Test Subject',
+		$status = 'publish'
+	) {
+		global $post;
+		$feedback_time  = current_time( 'mysql' );
+		$feedback_title = "{$comment_author} - {$feedback_time}";
+		$feedback_id    = md5( $feedback_title );
+
+		if ( empty( $all_values ) ) {
+			$all_values = array(
+				'field1'                  => 'value1',
+				'field2'                  => 'value2',
+				'email_marketing_consent' => 'yes',
+			);
+		}
+		// Ensure all_values is an array and has the necessary keys.
+		$entry_values = array(
+			'entry_title'     => 'Cool Post Title',
+			'entry_permalink' => 'https://example.com/post/123',
+			'feedback_id'     => $feedback_id,
+		);
+
+		if ( isset( $_POST['page'] ) ) {
+			$entry_values['entry_page'] = absint( wp_unslash( $_POST['page'] ) );
+		}
+
+		if ( ! isset( $all_values['email_marketing_consent'] ) ) {
+			$all_values['email_marketing_consent'] = false;
+		}
+
+		$all_values = array_merge(
+			$all_values,
+			$entry_values
+		);
+
+		$content = addslashes( wp_kses( "$comment_content\n<!--more-->\nAUTHOR: {$comment_author}\nAUTHOR EMAIL: {$comment_author_email}\nAUTHOR URL: {$comment_author_url}\nSUBJECT: {$subject}\nIP: {$comment_ip_text}\nJSON_DATA\n" . wp_json_encode( $all_values ), array() ) );
+
+		// Create a mock post with JSON_DATA format
+		return wp_insert_post(
+			array(
+				'post_date'    => addslashes( $feedback_time ),
+				'post_type'    => 'feedback',
+				'post_status'  => addslashes( $status ),
+				'post_parent'  => $post ? $post->ID : 0,
+				'post_title'   => addslashes( wp_kses( $feedback_title, array() ) ),
+				'post_content' => $content, // so that search will pick up this data
+				'post_name'    => $feedback_id,
+			)
+		);
+	}
+
+	/**
+	 * Adds the field values to the global $_POST value.
+	 *
+	 * @param array  $values Array of form fields and values.
+	 * @param string $form_id Optional form ID. If not provided, will use $post_id.
+	 */
+	public static function add_post_request( $values, $form_id = null, $post_id = 0 ) {
+		$post_data = self::get_post_request( $values, $form_id, $post_id );
+		foreach ( $post_data as $key => $value ) {
+			$_POST[ $key ] = $value;
+		}
+	}
+
+	public static function get_form_id( $attributes = array() ) {
+		global $post, $page;
+
+		$count = Contact_Form::get_forms_count();
+
+		if ( ! empty( $attributes['widget'] ) && $attributes['widget'] ) {
+			$attributes['id'] = 'widget-' . $attributes['widget'];
+		} elseif ( ! empty( $attributes['block_template'] ) && $attributes['block_template'] ) {
+
+			$attributes['id'] = 'block-template-' . $attributes['block_template'];
+		} elseif ( ! empty( $attributes['block_template_part'] ) && $attributes['block_template_part'] ) {
+			$attributes['id'] = 'block-template-part-' . $attributes['block_template_part'];
+		} elseif ( $post ) {
+			$attributes['id'] = $post->ID;
+		}
+
+		if ( $count ) {
+			// Ensure 'id' exists in $attributes before trying to modify it
+			if ( ! isset( $attributes['id'] ) ) {
+				$attributes['id'] = '';
+			}
+
+			// When submitting the page number is not always set, so we need to handle that: TODO: This is a hack, we need to find a better way to handle form identification
+			$page_num = max( 1, intval( $page ) );
+
+			$attributes['id'] = $attributes['id'] . '-' . ( $count + 1 ) . '-' . $page_num;
+		}
+		return $attributes['id'];
+	}
+
+	public static function get_post_request( $values, $form_id = null, $post_id = 0 ) {
+		$prefix    = $form_id ? $form_id : 'g' . $post_id;
+		$post_data = array();
+		foreach ( $values as $key => $val ) {
+			if ( strpos( $key, 'contact-form' ) === 0 || strpos( $key, 'action' ) === 0 ) {
+				$post_data[ $key ] = $val;
+			} else {
+				$post_data[ $prefix . '-' . $key ] = $val;
+			}
+		}
+		return $post_data;
+	}
+}

From d45083f4a212eb9657ce7d7f921ab36896a51a55 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Tue, 8 Jul 2025 15:16:44 -0700
Subject: [PATCH 02/48] Add tests for Form_Response::strip_tags method

---
 .../php/contact-form/Form_Response_Test.php   | 152 ++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
index 7a18da98fd803..51aeffee66d64 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -1127,4 +1127,156 @@ public function test_compute_entry_permalink_with_page_number() {
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 		$this->assertStringContainsString( 'page=999', $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
 	}
+	/**
+	 * Test that strip_tags handles simple string without HTML tags.
+	 */
+	public function test_strip_tags_with_plain_string() {
+		$input    = 'Hello, this is a plain text string.';
+		$expected = 'Hello, this is a plain text string.';
+		$result   = Form_Response::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags removes script tags but keeps the content.
+	 */
+	public function test_strip_tags_removes_script_tags() {
+		$input    = '<script>alert("XSS")</script>Hello <b>world</b>!';
+		$expected = 'alert("XSS")Hello <b>world</b>!';
+		$result   = Form_Response::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags handles HTML entities correctly.
+	 */
+	public function test_strip_tags_handles_html_entities() {
+		$input    = 'Hello &amp; goodbye';
+		$expected = 'Hello & goodbye';
+		$result   = Form_Response::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags handles arrays recursively.
+	 */
+	public function test_strip_tags_handles_arrays() {
+		$input = array(
+			'field1' => 'Hello <script>alert("XSS")</script>world',
+			'field2' => array(
+				'nested' => 'Test <b>bold</b> text',
+				'deep'   => array(
+					'deeper' => 'More &amp; testing',
+				),
+			),
+		);
+
+		$expected = array(
+			'field1' => 'Hello alert("XSS")world',
+			'field2' => array(
+				'nested' => 'Test <b>bold</b> text',
+				'deep'   => array(
+					'deeper' => 'More & testing',
+				),
+			),
+		);
+
+		$result = Form_Response::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags sanitizes array keys.
+	 */
+	public function test_strip_tags_sanitizes_array_keys() {
+		$input = array(
+			'<script>key</script>' => 'value1',
+			'normal_key'           => 'value2',
+		);
+
+		$result = Form_Response::strip_tags( $input );
+
+		// Check that the results exist and are correct
+		// We need to check what key actually gets created after sanitization
+		$keys = array_keys( $result );
+		$this->assertCount( 2, $keys );
+		$this->assertEquals( 'value2', $result['normal_key'] );
+
+		// Find the sanitized key (should be the one that's not 'normal_key')
+		$sanitized_key = null;
+		foreach ( $keys as $key ) {
+			if ( $key !== 'normal_key' ) {
+				$sanitized_key = $key;
+				break;
+			}
+		}
+		$this->assertEquals( 'value1', $result[ $sanitized_key ] );
+	}
+
+	/**
+	 * Test that strip_tags handles empty values.
+	 */
+	public function test_strip_tags_handles_empty_values() {
+		$this->assertSame( '', Form_Response::strip_tags( '' ) );
+		$this->assertEquals( array(), Form_Response::strip_tags( array() ) );
+		$this->assertSame( '0', Form_Response::strip_tags( 0 ) );
+		$this->assertSame( '', Form_Response::strip_tags( null ) );
+	}
+
+	/**
+	 * Test that strip_tags handles numeric values.
+	 */
+	public function test_strip_tags_handles_numeric_values() {
+		$this->assertSame( '123', Form_Response::strip_tags( 123 ) );
+		$this->assertSame( '123.45', Form_Response::strip_tags( 123.45 ) );
+	}
+
+	/**
+	 * Test that strip_tags preserves allowed HTML tags as per wp_kses_post.
+	 */
+	public function test_strip_tags_preserves_allowed_html() {
+		$input  = '<p>This is a <strong>test</strong> with <em>emphasis</em> and <a href="http://example.com">links</a>.</p>';
+		$result = Form_Response::strip_tags( $input );
+
+		// wp_kses_post should preserve these tags - let's just verify we get a non-empty string with HTML
+		$this->assertNotEquals( '', $result );
+		$this->assertStringContainsString( 'This is a', $result );
+		$this->assertStringContainsString( 'test', $result );
+	}
+
+	/**
+	 * Test that strip_tags removes dangerous HTML tags.
+	 */
+	public function test_strip_tags_removes_dangerous_html() {
+		$input  = '<script>alert("XSS")</script><iframe src="evil.com"></iframe>Hello world';
+		$result = Form_Response::strip_tags( $input );
+
+		// These dangerous tags should be removed, but content might remain
+		$this->assertStringNotContainsString( '<script>', $result );
+		$this->assertStringNotContainsString( '<iframe>', $result );
+		$this->assertStringContainsString( 'Hello world', $result );
+	}
+
+	/**
+	 * Test that strip_tags handles mixed array with different data types.
+	 */
+	public function test_strip_tags_handles_mixed_array() {
+		$input = array(
+			'string'  => 'Hello <b>world</b>',
+			'number'  => 42,
+			'boolean' => true,
+			'array'   => array(
+				'nested_string' => 'Test &amp; case',
+				'nested_number' => 3.14,
+			),
+		);
+
+		$result = Form_Response::strip_tags( $input );
+
+		$this->assertEquals( 'Hello <b>world</b>', $result['string'] );
+		$this->assertSame( '42', $result['number'] );
+		$this->assertSame( '1', $result['boolean'] ); // true converted to string
+		$this->assertEquals( 'Test & case', $result['array']['nested_string'] );
+		$this->assertSame( '3.14', $result['array']['nested_number'] );
+	}
 }

From eb66d9dd07d4cfa158ebef61c632bd6990baef7c Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 9 Jul 2025 13:30:44 -0700
Subject: [PATCH 03/48] Make endpoint rendering work

---
 .../class-contact-form-endpoint.php           |  82 +-----
 .../src/contact-form/class-form-response.php  | 261 +++++++++++++++---
 .../src/contact-form/class-response-field.php |  97 +++++++
 .../php/contact-form/Form_Response_Test.php   |  69 +++++
 4 files changed, 401 insertions(+), 108 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
index bc7d998b0b5fc..e0c2175137f4d 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
@@ -530,100 +530,48 @@ public function prepare_item_for_response( $item, $request ) {
 		$data     = $response->get_data();
 		$fields   = $this->get_fields_for_response( $request );
 
-		$has_file    = false;
-		$base_fields = array(
-			'email_marketing_consent' => '',
-			'entry_title'             => '',
-			'entry_permalink'         => '',
-			'feedback_id'             => '',
-		);
-
-		$data_defaults = array(
-			'_feedback_author'       => '',
-			'_feedback_author_email' => '',
-			'_feedback_author_url'   => '',
-			'_feedback_all_fields'   => array(),
-			'_feedback_ip'           => '',
-			'_feedback_subject'      => '',
-		);
-
-		$feedback_data = array_merge(
-			$data_defaults,
-			\Automattic\Jetpack\Forms\ContactForm\Contact_Form_Plugin::parse_fields_from_content( $item->ID )
-		);
-
-		$all_fields = array_merge( $base_fields, $feedback_data['_feedback_all_fields'] );
+		$response = Form_Response::get( $item->ID );
 
 		$data['date'] = get_the_date( 'c', $data['id'] );
 		if ( rest_is_field_included( 'uid', $fields ) ) {
-			$data['uid'] = $all_fields['feedback_id'];
+			$data['uid'] = $response->get_feedback_id();
 		}
 		if ( rest_is_field_included( 'author_name', $fields ) ) {
-			$data['author_name'] = $feedback_data['_feedback_author'];
+			$data['author_name'] = $response->get_author();
 		}
 		if ( rest_is_field_included( 'author_email', $fields ) ) {
-			$data['author_email'] = $feedback_data['_feedback_author_email'];
+			$data['author_email'] = $response->get_author_email();
 		}
 		if ( rest_is_field_included( 'author_url', $fields ) ) {
-			$data['author_url'] = $feedback_data['_feedback_author_url'];
+			$data['author_url'] = $response->get_author_url();
 		}
 		if ( rest_is_field_included( 'author_avatar', $fields ) ) {
-			$data['author_avatar'] = empty( $feedback_data['_feedback_author_email'] ) ? '' : get_avatar_url( $feedback_data['_feedback_author_email'] );
+			$data['author_avatar'] = $response->get_author_avatar();
 		}
 		if ( rest_is_field_included( 'email_marketing_consent', $fields ) ) {
-			$data['email_marketing_consent'] = $all_fields['email_marketing_consent'];
+			$data['email_marketing_consent'] = $response->has_consent() ? __( 'Yes', 'jetpack-forms' ) : __( 'No', 'jetpack-forms' );
 		}
 		if ( rest_is_field_included( 'ip', $fields ) ) {
-			$data['ip'] = $feedback_data['_feedback_ip'];
+			$data['ip'] = $response->get_ip_address();
 		}
 		if ( rest_is_field_included( 'entry_title', $fields ) ) {
-			$data['entry_title'] = $all_fields['entry_title'];
+			$data['entry_title'] = $response->get_entry_title();
 		}
 		if ( rest_is_field_included( 'entry_permalink', $fields ) ) {
-			$data['entry_permalink'] = $all_fields['entry_permalink'];
+			$data['entry_permalink'] = $response->get_entry_permalink();
 		}
 		if ( rest_is_field_included( 'subject', $fields ) ) {
-			$data['subject'] = $feedback_data['_feedback_subject'];
+			$data['subject'] = $response->get_subject();
 		}
 		if ( rest_is_field_included( 'fields', $fields ) ) {
-			$fields_data = array_diff_key( $all_fields, $base_fields );
-
-			foreach ( $fields_data as &$field ) {
-				if ( Contact_Form::is_file_upload_field( $field ) ) {
-
-					foreach ( $field['files'] as &$file ) {
-						if ( ! isset( $file['size'] ) || ! isset( $file['file_id'] ) ) {
-							// this shouldn't happen, todo: log this
-							continue;
-						}
-						$file_id                = absint( $file['file_id'] );
-						$file['file_id']        = $file_id;
-						$file['size']           = size_format( $file['size'] );
-						$file['url']            = apply_filters( 'jetpack_unauth_file_download_url', '', $file_id );
-						$file['is_previewable'] = self::is_previewable_file( $file );
-						$has_file               = true;
-					}
-				}
-			}
+			$data['fields'] = $response->get_api_fields_values();
+		}
 
-			$data['fields']   = $fields_data;
-			$data['has_file'] = $has_file;
+		if ( rest_is_field_included( 'has_file', $fields ) ) {
+			$data['has_file'] = $response->has_file();
 		}
 		return rest_ensure_response( $data );
 	}
-	/**
-	 * Checks if the file is previewable based on its type or extension.
-	 *
-	 * @param array $file File data.
-	 * @return bool True if the file is previewable, false otherwise.
-	 */
-	private static function is_previewable_file( $file ) {
-		$file_type = strtolower( pathinfo( $file['name'], PATHINFO_EXTENSION ) );
-		// Check if the file is previewable based on its type or extension.
-		// Note: This is a simplified check and does not match if the file is allowed to be uploaded by the server.
-		$previewable_types = array( 'jpg', 'jpeg', 'png', 'gif', 'webp' );
-		return in_array( $file_type, $previewable_types, true );
-	}
 
 	/**
 	 * Retrieves the query params for the feedback collection.
diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
index 7ececfeb7e4d8..6d6982667e05b 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -31,6 +31,13 @@ class Form_Response {
 	 */
 	protected $fields = array();
 
+	/**
+	 * Does the response have files attached to it?
+	 *
+	 * @var bool
+	 */
+	protected $has_file = false;
+
 	/**
 	 * The original Contact_Form object, if available.
 	 *
@@ -90,6 +97,24 @@ class Form_Response {
 	 */
 	protected $feedback_id = '';
 
+	/**
+	 * The title of the feedback entry.
+	 *
+	 * This is used to store the title of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $feedback_title = '';
+
+	/**
+	 * The time of the feedback entry.
+	 *
+	 * This is used to store the title of the feedback entry.
+	 *
+	 * @var string
+	 */
+	protected $feedback_time = '';
+
 	/**
 	 * The author of the feedback entry.
 	 *
@@ -170,12 +195,13 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 
 		if ( $this->feedback_post instanceof WP_Post ) {
 
-			$parsed_content = static::parse_content( $this->feedback_post->post_content, $this->feedback_post->post_mime_type );
+			$parsed_content = $this->parse_content( $this->feedback_post->post_content, $this->feedback_post->post_mime_type );
 
-			$this->status      = $this->feedback_post->post_status;
-			$this->feedback_id = $this->feedback_post->post_name;
-			$this->entry_id    = $this->feedback_post->post_parent ? (int) $this->feedback_post->post_parent : 0;
-			$current_post      = $this->entry_id ? get_post( $this->entry_id ) : null;
+			$this->status        = $this->feedback_post->post_status;
+			$this->feedback_id   = $this->feedback_post->post_name;
+			$this->entry_id      = $this->feedback_post->post_parent ? (int) $this->feedback_post->post_parent : 0;
+			$this->feedback_time = $this->feedback_post->post_date;
+			$current_post        = $this->entry_id ? get_post( $this->entry_id ) : null;
 
 			$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
 			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : null;
@@ -187,12 +213,12 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$this->has_consent     = isset( $parsed_content['has_consent'] ) ? $parsed_content['has_consent'] : false;
 			$this->entry_title     = isset( $parsed_content['entry_title'] ) ? $parsed_content['entry_title'] : '';
 			$this->entry_page      = isset( $parsed_content['entry_page'] ) ? (int) $parsed_content['entry_page'] : 1;
+			$this->feedback_title  = $this->feedback_post->post_title ? $this->feedback_post->post_title : $this->get_author() . ' - ' . $this->feedback_post->post_date;
 
 		} elseif ( is_array( $post_data ) && ! empty( $post_data ) ) {
 
 			// If post_data is provided, use it to populate fields.
 			$this->status          = $this->status;
-			$this->feedback_id     = $this->get_computed_feedback_id();
 			$this->fields          = $this->get_computed_fields( $post_data );
 			$this->ip_address      = Contact_Form_Plugin::get_ip_address();
 			$this->subject         = $this->get_computed_subject( $post_data );
@@ -204,31 +230,15 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$this->entry_id        = ! empty( $current_post ) ? (int) $current_post->ID : 0;
 			$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : '';
 			$this->entry_page      = $current_page_number;
+			$this->feedback_time   = current_time( 'mysql' );
+			$this->feedback_title  = "{$this->get_author()} - {$this->feedback_time}";
+			$this->feedback_id     = md5( $this->feedback_title );
 		}
 
 		$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : $this->entry_title;
 		$this->entry_permalink = ! empty( $current_post ) ? $this->get_computed_entry_permalink( $current_post, $this->entry_page ) : '';
 	}
 
-	/**
-	 * Get a sanitized value from the post data.
-	 *
-	 * @param string $key The key to look for in the post data.
-	 * @param array  $post_data The post data array, typically $_POST.
-	 *
-	 * @return string|array The sanitized value, or an empty string if the key is not found.
-	 */
-	private function get_field_value( $key, $post_data ) {
-		if ( isset( $post_data[ $key ] ) ) {
-			if ( is_array( $post_data[ $key ] ) ) {
-				return array_map( 'sanitize_text_field', wp_unslash( $post_data[ $key ] ) );
-			} else {
-				return sanitize_text_field( wp_unslash( $post_data[ $key ] ) );
-			}
-		}
-		return '';
-	}
-
 	/**
 	 * Create a response object from a feedback post ID.
 	 *
@@ -259,6 +269,25 @@ public static function from_submission( $post_data, $form, $current_post = null,
 		return new static( null, $form, $post_data, $current_post, $current_page_number );
 	}
 
+	/**
+	 * Get a sanitized value from the post data.
+	 *
+	 * @param string $key The key to look for in the post data.
+	 * @param array  $post_data The post data array, typically $_POST.
+	 *
+	 * @return string|array The sanitized value, or an empty string if the key is not found.
+	 */
+	private function get_field_value( $key, $post_data ) {
+		if ( isset( $post_data[ $key ] ) ) {
+			if ( is_array( $post_data[ $key ] ) ) {
+				return array_map( 'sanitize_text_field', wp_unslash( $post_data[ $key ] ) );
+			} else {
+				return sanitize_text_field( wp_unslash( $post_data[ $key ] ) );
+			}
+		}
+		return '';
+	}
+
 	/**
 	 * Get all the fields of the response.
 	 */
@@ -281,7 +310,63 @@ private function get_all_values() {
 			if ( ! $field instanceof Response_Field ) {
 				continue;
 			}
-			$values[ $field->get_key() ] = $field->get_value();
+			$values[ $field->get_key() ] = $field->get_render_value();
+		}
+		return $values;
+	}
+
+	/**
+	 * Get the values related to where the form was submitted from.
+	 *
+	 * @return $array
+	 */
+	private function get_entry_values() {
+		// This is a convenience method to get the entry values in a simple array format.
+		$entry_values = array(
+			'email_marketing_consent' => (string) $this->has_consent,
+			'entry_title'             => $this->entry_title,
+			'entry_permalink'         => $this->entry_permalink,
+			'feedback_id'             => $this->feedback_id,
+		);
+
+		if ( $this->entry_page > 1 ) {
+			$entry_values['entry_page'] = $this->entry_page;
+		}
+		return $entry_values;
+	}
+
+	/**
+	 * Get all values of the response.
+	 *
+	 * @return array
+	 */
+	public function get_old_all_values() {
+		// This is a legacy method to maintain compatibility with older code.
+		// It returns the same values as get_all_values() but is kept for backward compatibility.
+		return array_merge( $this->get_all_values(), $this->get_entry_values() );
+	}
+
+	/**
+	 * Get the field values for the API Response.
+	 *
+	 * @return array
+	 */
+	public function get_api_fields_values() {
+		// This is a legacy method to maintain compatibility with older code.
+		// It returns the same values as get_all_values() but is kept for backward compatibility.
+		return array_merge( $this->get_api_all_values() );
+	}
+
+	/**
+	 * Get all the values of the response for API.
+	 */
+	private function get_api_all_values() {
+		$values = array();
+		foreach ( $this->fields as $field ) {
+			if ( ! $field instanceof Response_Field ) {
+				continue;
+			}
+			$values[ $field->get_key() ] = $field->get_render_api_value();
 		}
 		return $values;
 	}
@@ -297,6 +382,77 @@ public function get_feedback_id() {
 		return $this->feedback_id;
 	}
 
+	/**
+	 * Get the feedback title of the response.
+	 *
+	 * This is mostly used for legacy reasons.
+	 *
+	 * @return string
+	 */
+	public function get_title() {
+		return $this->feedback_title;
+	}
+
+	/**
+	 * Get the time of the feedback entry.
+	 *
+	 * @return string
+	 */
+	public function get_time() {
+		return $this->feedback_time;
+	}
+
+	/**
+	 * Get the askimet vars that are used to check for spam.
+	 *
+	 * These are the variables that are sent to Akismet to check if the feedback is spam or not.
+	 *
+	 * @return array
+	 */
+	public function get_akismet_vars() {
+		$akismet_vars = array(
+			'comment_author'       => $this->author,
+			'comment_author_email' => $this->get_author_email(),
+			'comment_author_url'   => $this->get_author_url(),
+			'contact_form_subject' => $this->get_subject(),
+			'comment_author_ip'    => $this->get_ip_address(),
+			'comment_content'      => empty( $this->get_comment_content() ) ? null : $this->get_comment_content(),
+		);
+
+		$field_ids = $this->form->get_field_ids();
+
+		foreach ( array_merge( $field_ids['all'], $field_ids['extra'] ) as $field_id ) {
+			$field = $this->form->fields[ $field_id ];
+
+			// Skip any fields that are just a choice from a pre-defined list. They wouldn't have any value
+			// from a spam-filtering point of view.
+			if ( in_array( $field->get_attribute( 'type' ), array( 'select', 'checkbox', 'checkbox-multiple', 'radio', 'file' ), true ) ) {
+				continue;
+			}
+
+			// Normalize the label into a slug.
+			$field_slug = trim( // Strip all leading/trailing dashes.
+				preg_replace(   // Normalize everything to a-z0-9_-
+					'/[^a-z0-9_]+/',
+					'-',
+					strtolower( $field->get_attribute( 'label' ) ) // Lowercase
+				),
+				'-'
+			);
+
+			$field_value = ( is_array( $field->value ) ) ? trim( implode( ', ', $field->value ) ) : trim( $field->value );
+
+			// Skip any values that are already in the array we're sending.
+			if ( $field_value && in_array( $field_value, $akismet_vars, true ) ) {
+				continue;
+			}
+
+			$akismet_vars[ 'contact_form_field_' . $field_slug ] = $field_value;
+		}
+
+		return $akismet_vars;
+	}
+
 	/**
 	 * Get the author name of the feedback entry.
 	 * If the author is not provided we will use the email instead.
@@ -310,7 +466,7 @@ public function get_author() {
 		if ( ! empty( $this->author_email ) ) {
 			return $this->author_email;
 		}
-		return $this->author;
+		return '';
 	}
 
 	/**
@@ -322,6 +478,21 @@ public function get_author_email() {
 		return $this->author_email;
 	}
 
+	/**
+	 * Get the author's gravatar URL.
+	 *
+	 * This is a convenience method to get the author's gravatar URL.
+	 *
+	 * @return string
+	 */
+	public function get_author_avatar() {
+		// This is a convenience method to get the author's gravatar URL.
+		if ( ! empty( $this->author_email ) ) {
+			return get_avatar_url( $this->author_email );
+		}
+		return '';
+	}
+
 	/**
 	 * Get the author url of a feedback entry.
 	 *
@@ -367,6 +538,15 @@ public function has_consent() {
 		return $this->has_consent;
 	}
 
+	/**
+	 * Gets the value of the consent field.
+	 *
+	 * @return bool
+	 */
+	public function has_file() {
+		return $this->has_file;
+	}
+
 	/**
 	 * Get the feedback status. For example 'publish', 'spam' or 'trash'.
 	 *
@@ -427,6 +607,8 @@ public function save() {
 			array(
 				'post_type'      => self::POST_TYPE,
 				'post_status'    => $this->status,
+				'post_title'     => $this->feedback_title,
+				'post_date'      => $this->feedback_time,
 				'post_name'      => $this->feedback_id,
 				'post_content'   => $this->serialize(),
 				'post_mime_type' => 'v2', // a way to help us identify what version of the data this is.
@@ -480,7 +662,7 @@ public function serialize() {
 	 * @param string|null $version The version of the content format.
 	 * @return array Parsed fields.
 	 */
-	public static function parse_content( $post_content = '', $version = null ) {
+	private function parse_content( $post_content = '', $version = null ) {
 		if ( $version === 'v2' ) {
 			$decoded_content = json_decode( $post_content, true );
 			if ( $decoded_content === null ) {
@@ -495,6 +677,9 @@ public static function parse_content( $post_content = '', $version = null ) {
 			$fields = array();
 			foreach ( $decoded_content['fields'] as $field ) {
 				$fields[ $field['key'] ] = Response_Field::from_serialized( $field );
+				if ( ! $this->has_file && $fields[ $field['key'] ]->is_non_empty_file_field() ) {
+					$this->has_file = true;
+				}
 			}
 			$decoded_content['fields'] = $fields;
 			return $decoded_content;
@@ -581,6 +766,10 @@ public static function parse_content( $post_content = '', $version = null ) {
 				continue;
 			}
 			$decoded_fields['fields'][ $key ] = new Response_Field( $key, $label, $value );
+
+			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->is_non_empty_file_field() ) {
+				$this->has_file = true;
+			}
 		}
 
 		$decoded_fields['comment_content'] = trim( self::strip_tags( $comment_content ) );
@@ -617,19 +806,6 @@ public static function strip_tags( $data_with_tags ) {
 		return $data_without_tags;
 	}
 
-	/**
-	 * Get the computed feedback id.
-	 *
-	 * @return string
-	 */
-	private function get_computed_feedback_id() {
-		$comment_author = $this->get_author();
-
-		// Build feedback reference
-		$feedback_time = \current_time( 'mysql' );
-		return md5( "{$comment_author} - {$feedback_time}" );
-	}
-
 	/**
 	 * Get all the fields of the response, computed from the post data.
 	 *
@@ -655,6 +831,9 @@ private function get_computed_fields( $post_data ) {
 			$key   = $i . '_' . $label;
 
 			$fields[ $key ] = new Response_Field( $key, $label, $value, $type );
+			if ( ! $this->has_file && $fields[ $key ]->is_non_empty_file_field() ) {
+				$this->has_file = true;
+			}
 			++$i; // Increment prefix counter for the next field
 		}
 
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index 80c027f2eb10d..0b836bc240559 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -102,6 +102,89 @@ public function render_value() {
 		return $this->value;
 	}
 
+	/**
+	 * Get the value of the field for rendering.
+	 *
+	 * @return string
+	 */
+	public function get_render_value() {
+		if ( is_array( $this->value ) ) {
+			// If the value is an array, we can return it as a JSON string.
+			return implode( ', ', $this->value );
+		}
+		// This method is deprecated, use render_value instead.
+		return $this->value;
+	}
+
+	/**
+	 * Get the value of the field for the API.
+	 *
+	 * @deprecated Use render_value instead.
+	 *
+	 * @return string
+	 */
+	public function get_render_api_value() {
+
+		if ( $this->is_file_field() ) {
+			$files = array();
+			foreach ( $this->value['files'] as &$file ) {
+				if ( ! isset( $file['size'] ) || ! isset( $file['file_id'] ) ) {
+					// this shouldn't happen, todo: log this
+					continue;
+				}
+				$file_id                = absint( $file['file_id'] );
+				$file['file_id']        = $file_id;
+				$file['size']           = size_format( $file['size'] );
+				$file['url']            = apply_filters( 'jetpack_unauth_file_download_url', '', $file_id );
+				$file['is_previewable'] = $this->is_previewable_file( $file );
+				$files[]                = $file;
+			}
+			$this->value['files'] = $files;
+			return $this->value;
+
+		}
+
+		if ( is_array( $this->value ) ) {
+			// If the value is an array, we can return it as a JSON string.
+			return implode( ', ', $this->value );
+		}
+		// This method is deprecated, use render_value instead.
+		return $this->value;
+	}
+
+	/**
+	 * Check if the field is a file field.
+	 *
+	 * @return bool
+	 */
+	public function is_file_field() {
+		if ( 'file' === $this->type ) {
+			return true;
+		}
+		if ( 'basic' === $this->type ) {
+			// If the type is basic, we can check if the value is an array and contains files.
+			if ( is_array( $this->value ) && isset( $this->value['files'] ) && is_array( $this->value['files'] ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Check if the field is a non-empty file field.
+	 *
+	 * @return bool
+	 */
+	public function is_non_empty_file_field() {
+		if ( $this->is_file_field() ) {
+			l( (int) count( $this->value['files'] ) > 0 );
+			return count( $this->value['files'] ) > 0;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Get the type of the field.
 	 *
@@ -154,4 +237,18 @@ public static function from_serialized( $data ) {
 			isset( $data['meta'] ) ? $data['meta'] : array()
 		);
 	}
+
+	/**
+	 * Checks if the file is previewable based on its type or extension.
+	 *
+	 * @param array $file File data.
+	 * @return bool True if the file is previewable, false otherwise.
+	 */
+	private function is_previewable_file( $file ) {
+		$file_type = strtolower( pathinfo( $file['name'], PATHINFO_EXTENSION ) );
+		// Check if the file is previewable based on its type or extension.
+		// Note: This is a simplified check and does not match if the file is allowed to be uploaded by the server.
+		$previewable_types = array( 'jpg', 'jpeg', 'png', 'gif', 'webp' );
+		return in_array( $file_type, $previewable_types, true );
+	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
index 51aeffee66d64..d3164a741f843 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -554,11 +554,13 @@ public function test_computed_email_for_legacy() {
 
 		$post_response = Form_Response::get( $post_id );
 		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the legacy feedback post author email' );
+		$this->assertEquals( get_avatar_url( $email ), $post_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
 	}
 
 	public function test_computed_email() {
 
 		$email   = 'email@email.com';
+		$avatar  = get_avatar_url( $email );
 		$form_id = Utility::get_form_id();
 		// Create a form submission
 		$post_data = Utility::get_post_request(
@@ -584,7 +586,9 @@ public function test_computed_email() {
 		$post_response = Form_Response::get( $post_id );
 
 		$this->assertEquals( $email, $response->get_author_email(), 'Author email should match the form submission' );
+		$this->assertEquals( $avatar, $post_response->get_author_avatar(), 'Author avatar should match the legacy feedback post author email' );
 		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the saved form submission' );
+		$this->assertEquals( $avatar, $post_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
 	}
 
 	public function test_computed_email_filter() {
@@ -1127,7 +1131,72 @@ public function test_compute_entry_permalink_with_page_number() {
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 		$this->assertStringContainsString( 'page=999', $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
 	}
+
+	public function test_feedback_title() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'  => 'Test User',
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form );
+		$post_id  = $response->save();
+
+		$post          = get_post( $post_id );
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertStringContainsString( $post->post_title, $response->get_title(), 'Feedback title should match the form submission' );
+		$this->assertStringContainsString( $post->post_title, $post_response->get_title(), 'Feedback title should match the saved form submission' );
+	}
+
+	public function test_feedback_title_time() {
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$post_data = Utility::get_post_request(
+			array(
+				'name'  => 'Test User',
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Form_Response::from_submission( $post_data, $form );
+		$post_id  = $response->save();
+
+		$post          = get_post( $post_id );
+		$post_response = Form_Response::get( $post_id );
+
+		$this->assertStringContainsString( $post->post_date, $response->get_time(), 'Feedback submitted time should match the form submission' );
+		$this->assertStringContainsString( $post->post_date, $post_response->get_time(), 'Feedback submitted time should match the saved form submission' );
+	}
+
 	/**
+	 * ======================================================
+	 * Tests for the strip_tags method in Form_Response class.
+	 * ======================================================
+	 *
 	 * Test that strip_tags handles simple string without HTML tags.
 	 */
 	public function test_strip_tags_with_plain_string() {

From caec50de9a032140d3ee48ce109eaf9d3e61f886 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 9 Jul 2025 15:08:05 -0700
Subject: [PATCH 04/48] Make for submission work with the new response data

---
 .../src/contact-form/class-contact-form.php   | 148 +++---------------
 .../src/contact-form/class-form-response.php  |  39 ++++-
 .../src/contact-form/class-response-field.php |  14 ++
 .../php/contact-form/Form_Response_Test.php   |   2 +-
 4 files changed, 78 insertions(+), 125 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index ca3211cd003e8..4a3833475c5d9 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -850,13 +850,17 @@ public static function success_message( $feedback_id, $form ) {
 	 * Returns a compiled form with labels and values in a form of  an array
 	 * of lines.
 	 *
-	 * @param int          $feedback_id - the feedback ID.
-	 * @param Contact_Form $form - the form.
+	 * @param int               $feedback_id - the feedback ID.
+	 * @param Contact_Form|null $form - the contact form object. This parameter is deprecated and no longer used.
 	 *
 	 * @return array $lines
 	 */
-	public static function get_compiled_form( $feedback_id, $form ) {
-		$compiled_form = self::get_raw_compiled_form_data( $feedback_id, $form );
+	public static function get_compiled_form( $feedback_id, $form = null ) {
+		if ( $form ) {
+			// you are doing it wrong, the $form parameter is deprecated and no longer used
+			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
+		}
+		$compiled_form = self::get_raw_compiled_form_data( $feedback_id );
 
 		foreach ( $compiled_form as $field_index => $data ) {
 			$safe_display_value = self::escape_and_sanitize_field_value( $data['value'] );
@@ -890,138 +894,36 @@ public static function get_compiled_form( $feedback_id, $form ) {
 	/**
 	 * Returns the JSON data for the form submission.
 	 *
-	 * @param int          $feedback_id - the feedback ID.
-	 * @param Contact_Form $form - the form.
+	 * @param int $feedback_id - the feedback ID.
+	 *
 	 *
 	 * @return array $json_data
 	 */
-	public static function get_json_data( $feedback_id, $form ) {
-		$raw_data  = self::get_raw_compiled_form_data( $feedback_id, $form );
-		$json_data = array();
-
-		// Handle file upload field (new structure with field_id and files array)
-		foreach ( $raw_data as $field_data ) {
-			$value = $field_data['value'];
-			$label = $field_data['label'];
-
-			if ( self::is_file_upload_field( $value ) ) {
-				$files = $value['files'];
-
-				if ( empty( $files ) ) {
-					continue;
-				}
-
-				foreach ( $files as $file ) {
-					if ( ! empty( $file['file_id'] ) ) {
-						$file_name = isset( $file['name'] ) ? $file['name'] : __( 'Attached file', 'jetpack-forms' );
-						$file_size = isset( $file['size'] ) ? size_format( $file['size'] ) : '';
-
-						$json_data[] = array(
-							'label' => $label,
-							'value' => array(
-								'name' => $file_name,
-								'size' => $file_size,
-							),
-						);
-					}
-				}
-			} else {
-				$json_data[] = array(
-					'label' => $label,
-					'value' => $value,
-				);
-			}
+	public static function get_json_data( $feedback_id, $form = null ) {
+		if ( $form ) {
+			// you are doing it wrong, the $form parameter is deprecated and no longer used
+			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
 		}
 
-		return $json_data;
+		return self::get_raw_compiled_form_data( $feedback_id );
 	}
 
 	/**
 	 * Retrieves raw compiled form data.
 	 *
-	 * @param int          $feedback_id - the feedback ID.
-	 * @param Contact_Form $form - the form.
+	 * @param int               $feedback_id - the feedback ID.
+	 * @param Contact_Form|null $form - the contact form object. This parameter is deprecated and no longer used.
 	 *
 	 * @return array $raw_data Associative array where keys are field_index and values are arrays with 'label' and 'value'.
 	 */
-	private static function get_raw_compiled_form_data( $feedback_id, $form ) {
-		$feedback       = get_post( $feedback_id );
-		$field_ids      = $form->get_field_ids();
-		$content_fields = Contact_Form_Plugin::parse_fields_from_content( $feedback_id );
-
-		// Maps field_ids to post_meta keys
-		$field_value_map = array(
-			'name'     => 'author',
-			'email'    => 'author_email',
-			'url'      => 'author_url',
-			'subject'  => 'subject',
-			'textarea' => false, // not a post_meta key.  This is stored in post_content
-		);
-
-		$raw_data = array();
-
-		// "Standard" field allowed list.
-		foreach ( $field_value_map as $type => $meta_key ) {
-			if ( isset( $field_ids[ $type ] ) ) {
-				$field = $form->fields[ $field_ids[ $type ] ];
-				$value = null;
-
-				if ( $meta_key ) {
-					if ( isset( $content_fields[ "_feedback_{$meta_key}" ] ) ) {
-						if ( 'name' === $type ) {
-							// If a form contains both email and name fields but the user doesn't provide a name, we don't need to show the name field
-							// in the success message after submision. We have this specific check because in the above case the `author` field gets
-							// a fallback value of the provided email and is used in the backend in various places.
-							if ( isset( $content_fields['_feedback_author_email'] ) && $content_fields['_feedback_author'] === $content_fields['_feedback_author_email'] ) {
-								continue;
-							}
-						}
-						$value = $content_fields[ "_feedback_{$meta_key}" ];
-					}
-				} else {
-					// The feedback content is stored as the first "half" of post_content
-					$current_value         = ( is_object( $feedback ) && is_a( $feedback, '\WP_Post' ) ) ?
-									$feedback->post_content : '';
-					list( $current_value ) = explode( '<!--more-->', $current_value );
-					$value                 = trim( $current_value );
-				}
-
-				$field_index = array_search( $field_ids[ $type ], $field_ids['all'], true );
-				$field_label = $field->get_attribute( 'label' );
-
-				$raw_data[ $field_index ] = array(
-					'label' => $field_label,
-					'value' => $value,
-				);
-			}
+	private static function get_raw_compiled_form_data( $feedback_id, $form = null ) {
+		if ( $form ) {
+			// you are doing it wrong, the $form parameter is deprecated and no longer used.
+			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
 		}
 
-		// "Non-standard" fields
-		if ( $field_ids['extra'] ) {
-			// array indexed by field label (not field id)
-			$extra_fields = get_post_meta( $feedback_id, '_feedback_extra_fields', true );
-			/**
-			 * Only get data for the compiled form if `$extra_fields` is a valid and non-empty array.
-			 */
-			if ( is_array( $extra_fields ) && ! empty( $extra_fields ) ) {
-
-				$extra_field_keys = array_keys( $extra_fields );
-
-				$i = 0;
-				foreach ( $field_ids['extra'] as $field_id ) {
-					$field                    = $form->fields[ $field_id ];
-					$field_index              = array_search( $field_id, $field_ids['all'], true );
-					$field_label              = $field->get_attribute( 'label' );
-					$value                    = isset( $extra_field_keys[ $i ] ) && isset( $extra_fields[ $extra_field_keys[ $i ] ] ) ? $extra_fields[ $extra_field_keys[ $i ] ] : '';
-					$raw_data[ $field_index ] = array(
-						'label' => $field_label,
-						'value' => $value,
-					);
-					++$i;
-				}
-			}
-		}
-		return $raw_data;
+		$response = Form_Response::get( $feedback_id );
+		return $response->get_compiled_fields();
 	}
 
 	/**
@@ -1034,7 +936,7 @@ private static function get_raw_compiled_form_data( $feedback_id, $form ) {
 	 * @return array $lines
 	 */
 	public static function get_compiled_form_for_email( $feedback_id, $form ) {
-		$compiled_form = self::get_raw_compiled_form_data( $feedback_id, $form );
+		$compiled_form = self::get_raw_compiled_form_data( $feedback_id );
 
 		/**
 		 * This filter allows a site owner to customize the response to be emailed, by adding their own HTML around it for example.
@@ -2159,7 +2061,7 @@ public function process_submission() {
 			echo wp_json_encode(
 				array(
 					'success'     => true,
-					'data'        => self::get_json_data( $post_id, $this ),
+					'data'        => self::get_json_data( $post_id ),
 					'refreshArgs' => $refresh_args,
 				)
 			);
diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
index 6d6982667e05b..001b41e352fdc 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -357,6 +357,28 @@ public function get_api_fields_values() {
 		return array_merge( $this->get_api_all_values() );
 	}
 
+	/**
+	 * Get the computed fields
+	 *
+	 * Computed fields is an array of fields that have a label and a value.
+	 *
+	 * @return array
+	 */
+	public function get_compiled_fields() {
+		// This is a convenience method to get the compiled fields in a simple array format.
+		$compiled_fields = array();
+		foreach ( $this->fields as $field ) {
+			if ( ! $field instanceof Response_Field ) {
+				continue;
+			}
+			$compiled_fields[] = array(
+				'label' => $field->get_label(),
+				'value' => $field->get_render_value(),
+			);
+		}
+		return $compiled_fields;
+	}
+
 	/**
 	 * Get all the values of the response for API.
 	 */
@@ -759,7 +781,7 @@ private function parse_content( $post_content = '', $version = null ) {
 
 		foreach ( $all_values as $key => $value ) {
 			$key   = wp_strip_all_tags( $key );
-			$label = '';
+			$label = self::extract_label_from_key( $key );
 			if ( in_array( $key, $non_user_fields, true ) ) {
 				$decoded_fields[ $key ] = $value;
 				// Skip fields that are not user-submitted.
@@ -777,6 +799,21 @@ private function parse_content( $post_content = '', $version = null ) {
 		return $decoded_fields;
 	}
 
+	/**
+	 * Extract the label from a key that might be in the format "1_label".
+	 *
+	 * @param string $key The key to extract the label from.
+	 * @return string The extracted label.
+	 */
+	private static function extract_label_from_key( $key ) {
+		// Check if the key starts with a number followed by underscore
+		if ( preg_match( '/^\d+_(.+)$/', $key, $matches ) ) {
+			return $matches[1];
+		}
+		// If no number prefix, return the key as is
+		return $key;
+	}
+
 	/**
 	 * Strips HTML tags from input.  Output is NOT HTML safe.
 	 *
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index 0b836bc240559..d95a8cbd38400 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -108,6 +108,20 @@ public function render_value() {
 	 * @return string
 	 */
 	public function get_render_value() {
+		if ( $this->is_file_field() ) {
+			$files = array();
+			foreach ( $this->value['files'] as &$file ) {
+				if ( ! isset( $file['size'] ) || ! isset( $file['file_id'] ) ) {
+					// this shouldn't happen, todo: log this
+					continue;
+				}
+				$file_name = isset( $file['name'] ) ? $file['name'] : __( 'Attached file', 'jetpack-forms' );
+				$file_size = isset( $file['size'] ) ? size_format( $file['size'] ) : '';
+				$files[]   = $file_name . ' (' . $file_size . ')';
+			}
+			$this->value = $files;
+			// If the value is a file field, we can return it as a JSON string
+		}
 		if ( is_array( $this->value ) ) {
 			// If the value is an array, we can return it as a JSON string.
 			return implode( ', ', $this->value );
diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
index d3164a741f843..e18bec0ebc99a 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -147,7 +147,7 @@ public function test_handle_previously_saved_response() {
 
 		$this->assertInstanceOf( Response_Field::class, $field );
 		$this->assertEquals( '1_field', $field->get_key() );
-		$this->assertEquals( 'value1', $field->render_value() );
+		$this->assertEquals( 'field', $field->get_label() );
 		$this->assertEquals( 'value1', $field->render_value() );
 		$this->assertEquals( 'basic', $field->get_type() ); // Assuming 'basic' is the default type for a simple text field.
 	}

From 2cbb3c5f9d0254c6b917b8826ffa72de24a53864 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 9 Jul 2025 15:58:03 -0700
Subject: [PATCH 05/48] Add test for get_render_value

---
 .../tests/php/contact-form/Response_Field_Test.php    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
index 4f54f903f2cc0..a4663ad523496 100644
--- a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
@@ -107,4 +107,15 @@ public function test_response_from_serialized_is_null() {
 
 		$this->assertNull( $unserialized );
 	}
+
+	public function test_get_render_value() {
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertEquals( 'test_value', $field->get_render_value() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
+		$this->assertEquals( 'value1, value2', $field->get_render_value() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
+		$this->assertSame( '', $field->get_render_value() );
+	}
 }

From db409ae3e0ef390658ec9a7c31d67a2234300cf7 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 9 Jul 2025 16:05:13 -0700
Subject: [PATCH 06/48] Update has_file tests

---
 .../src/contact-form/class-form-response.php  |  8 ++---
 .../src/contact-form/class-response-field.php |  5 ++-
 .../php/contact-form/Response_Field_Test.php  | 31 +++++++++++++++++++
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
index 001b41e352fdc..f8ae97818571c 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -699,7 +699,7 @@ private function parse_content( $post_content = '', $version = null ) {
 			$fields = array();
 			foreach ( $decoded_content['fields'] as $field ) {
 				$fields[ $field['key'] ] = Response_Field::from_serialized( $field );
-				if ( ! $this->has_file && $fields[ $field['key'] ]->is_non_empty_file_field() ) {
+				if ( ! $this->has_file && $fields[ $field['key'] ]->has_file() ) {
 					$this->has_file = true;
 				}
 			}
@@ -789,7 +789,7 @@ private function parse_content( $post_content = '', $version = null ) {
 			}
 			$decoded_fields['fields'][ $key ] = new Response_Field( $key, $label, $value );
 
-			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->is_non_empty_file_field() ) {
+			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->has_file() ) {
 				$this->has_file = true;
 			}
 		}
@@ -868,10 +868,10 @@ private function get_computed_fields( $post_data ) {
 			$key   = $i . '_' . $label;
 
 			$fields[ $key ] = new Response_Field( $key, $label, $value, $type );
-			if ( ! $this->has_file && $fields[ $key ]->is_non_empty_file_field() ) {
+			if ( ! $this->has_file && $fields[ $key ]->has_file() ) {
 				$this->has_file = true;
 			}
-			++$i; // Increment prefix counter for the next field
+			++$i; // Increment prefix counter for the next field.
 		}
 
 		return $fields;
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index d95a8cbd38400..1cfd2d6cae580 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -186,13 +186,12 @@ public function is_file_field() {
 	}
 
 	/**
-	 * Check if the field is a non-empty file field.
+	 * Check if the field has a file.
 	 *
 	 * @return bool
 	 */
-	public function is_non_empty_file_field() {
+	public function has_file() {
 		if ( $this->is_file_field() ) {
-			l( (int) count( $this->value['files'] ) > 0 );
 			return count( $this->value['files'] ) > 0;
 		}
 
diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
index a4663ad523496..de5b974756607 100644
--- a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
@@ -118,4 +118,35 @@ public function test_get_render_value() {
 		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
 		$this->assertSame( '', $field->get_render_value() );
 	}
+
+	public function test_is_file_field() {
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
+		$this->assertTrue( $field->is_file_field() );
+
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertFalse( $field->is_file_field() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ) );
+		$this->assertTrue( $field->is_file_field() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ), 'file' );
+		$this->assertTrue( $field->is_file_field() );
+	}
+
+	public function test_has_file() {
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
+		$this->assertTrue( $field->has_file() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
+		$this->assertTrue( $field->has_file() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ) );
+		$this->assertFalse( $field->has_file() );
+
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertFalse( $field->has_file(), 'basic field should not be a file field' );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
+		$this->assertFalse( $field->has_file(), 'empty file field should not be non-empty' );
+	}
 }

From 2316c2cf034ca9a62d1b65ca7d60e3e1601b0262 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Thu, 10 Jul 2025 10:56:01 -0700
Subject: [PATCH 07/48] Add tests for get_render_api_value method

---
 .../src/contact-form/class-response-field.php |  5 +-
 .../php/contact-form/Response_Field_Test.php  | 59 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index 1cfd2d6cae580..010d255db74f2 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -133,8 +133,6 @@ public function get_render_value() {
 	/**
 	 * Get the value of the field for the API.
 	 *
-	 * @deprecated Use render_value instead.
-	 *
 	 * @return string
 	 */
 	public function get_render_api_value() {
@@ -155,7 +153,6 @@ public function get_render_api_value() {
 			}
 			$this->value['files'] = $files;
 			return $this->value;
-
 		}
 
 		if ( is_array( $this->value ) ) {
@@ -186,7 +183,7 @@ public function is_file_field() {
 	}
 
 	/**
-	 * Check if the field has a file.
+	 * Check if the field has a file
 	 *
 	 * @return bool
 	 */
diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
index de5b974756607..3b444c0f7ff04 100644
--- a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
@@ -134,7 +134,19 @@ public function test_is_file_field() {
 	}
 
 	public function test_has_file() {
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
+		$field = new Response_Field(
+			'test_key',
+			'test_label',
+			array(
+				'files' => array(
+					array(
+						'name'    => 'file1.jpg',
+						'file_id' => 123,
+						'size'    => 123456789,
+					),
+				),
+			)
+		);
 		$this->assertTrue( $field->has_file() );
 
 		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
@@ -149,4 +161,49 @@ public function test_has_file() {
 		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
 		$this->assertFalse( $field->has_file(), 'empty file field should not be non-empty' );
 	}
+
+	public function test_get_render_api_value() {
+		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertEquals( 'test_value', $field->get_render_api_value() );
+
+		$field = new Response_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
+		$this->assertEquals( 'value1, value2', $field->get_render_api_value() );
+
+		$expected = array(
+			'files' => array(
+				array(
+					'name'           => 'file1.jpg',
+					'file_id'        => 123,
+					'size'           => '118 MB',
+					'url'            => 'https://example.com/file1.jpg',
+					'is_previewable' => true,
+				),
+			),
+		);
+		$field    = new Response_Field(
+			'test_key',
+			'test_label',
+			array(
+				'files' => array(
+					array(
+						'name'    => 'file1.jpg',
+						'file_id' => 123,
+						'size'    => 123456789,
+					),
+				),
+			)
+		);
+
+		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
+		$this->assertSame( $expected, $field->get_render_api_value() );
+		remove_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
+	}
+	/**
+	 * Helper function to return a URL for the file.
+	 *
+	 * @return string
+	 */
+	public function return_url() {
+		return 'https://example.com/file1.jpg';
+	}
 }

From 85551b7ef68531f84d92b8bcfe7c15527f224cef Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Thu, 10 Jul 2025 11:08:48 -0700
Subject: [PATCH 08/48] rename for clarity

---
 .../php/contact-form/Form_Response_Test.php   | 348 +++++++++---------
 1 file changed, 174 insertions(+), 174 deletions(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
index e18bec0ebc99a..5a5e583cbc672 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -42,27 +42,27 @@ public function test_from_post_id_returns_instance_for_valid_feedback_post() {
 	}
 
 	public function test_from_submission_sets_fields_and_post_data() {
-		$form      = new Contact_Form( array() );
-		$post_data = array(
+		$form       = new Contact_Form( array() );
+		$_post_data = array(
 			'name'    => 'John Doe',
 			'email'   => 'john@example.com',
 			'message' => 'Hello!',
 			'ignore'  => 'should not be included',
 		);
-		$response  = Form_Response::from_submission( $post_data, $form );
+		$response   = Form_Response::from_submission( $_post_data, $form );
 		$this->assertInstanceOf( Form_Response::class, $response );
 	}
 
 	public function test_form_response_is_matches_empty_data() {
-		$form      = new Contact_Form( array() );
-		$post_data = array();
-		$response  = Form_Response::from_submission( $post_data, $form );
-		$post_id   = $response->save();
+		$form       = new Contact_Form( array() );
+		$_post_data = array();
+		$response   = Form_Response::from_submission( $_post_data, $form );
+		$post_id    = $response->save();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
-		$this->assertEquals( $response->serialize(), $post_response->serialize() );
-		$this->assertEquals( $response->get_fields(), $post_response->get_fields() );
+		$this->assertEquals( $response->serialize(), $saved_response->serialize() );
+		$this->assertEquals( $response->get_fields(), $saved_response->get_fields() );
 	}
 
 	public function test_form_response_is_matches_submission_data() {
@@ -71,7 +71,7 @@ public function test_form_response_is_matches_submission_data() {
 		$message = 'Test message';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => $name,
 				'email'   => $email,
@@ -89,39 +89,39 @@ public function test_form_response_is_matches_submission_data() {
 		);
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
-		$this->assertEquals( $response->serialize(), $post_response->serialize() );
-		$this->assertEquals( $response->get_fields(), $post_response->get_fields() );
+		$this->assertEquals( $response->serialize(), $saved_response->serialize() );
+		$this->assertEquals( $response->get_fields(), $saved_response->get_fields() );
 
 		foreach ( $response->get_fields() as $field ) {
 			$this->assertInstanceOf( Response_Field::class, $field );
 		}
 
-		foreach ( $post_response->get_fields() as $field ) {
+		foreach ( $saved_response->get_fields() as $field ) {
 			$this->assertInstanceOf( Response_Field::class, $field );
 		}
 
-		foreach ( $post_response->get_fields() as $field_key => $field ) {
-			$this->assertEquals( $response->get_fields()[ $field_key ]->serialize(), $post_response->get_fields()[ $field_key ]->serialize(), 'Serialized response field should match' );
+		foreach ( $saved_response->get_fields() as $field_key => $field ) {
+			$this->assertEquals( $response->get_fields()[ $field_key ]->serialize(), $saved_response->get_fields()[ $field_key ]->serialize(), 'Serialized response field should match' );
 		}
 
 		$this->assertEquals( $name, $response->get_fields()['1_Name']->get_value(), 'Response field value should match' );
-		$this->assertEquals( $name, $post_response->get_fields()['1_Name']->get_value(), 'Saved response field value should match' );
+		$this->assertEquals( $name, $saved_response->get_fields()['1_Name']->get_value(), 'Saved response field value should match' );
 
 		$this->assertEquals( 'Name', $response->get_fields()['1_Name']->get_label(), 'Name response field label should match' );
-		$this->assertEquals( 'Name', $post_response->get_fields()['1_Name']->get_label(), 'Saved response field label should match' );
+		$this->assertEquals( 'Name', $saved_response->get_fields()['1_Name']->get_label(), 'Saved response field label should match' );
 		$this->assertEquals( 'name', $response->get_fields()['1_Name']->get_type(), 'Response field type should match' );
-		$this->assertEquals( 'name', $post_response->get_fields()['1_Name']->get_type(), 'Saved response type value should match' );
+		$this->assertEquals( 'name', $saved_response->get_fields()['1_Name']->get_type(), 'Saved response type value should match' );
 
 		$this->assertEquals( $email, $response->get_fields()['2_Email']->get_value(), 'Response field value should match' );
-		$this->assertEquals( $email, $post_response->get_fields()['2_Email']->get_value(), 'Saved response field value should match' );
+		$this->assertEquals( $email, $saved_response->get_fields()['2_Email']->get_value(), 'Saved response field value should match' );
 
 		$this->assertEquals( $message, $response->get_fields()['3_Message']->get_value(), 'Response field value should match' );
-		$this->assertEquals( $message, $post_response->get_fields()['3_Message']->get_value(), 'Saved Name response field value should match ' );
+		$this->assertEquals( $message, $saved_response->get_fields()['3_Message']->get_value(), 'Saved Name response field value should match ' );
 	}
 
 	/**
@@ -162,7 +162,7 @@ public function test_form_response_computed_feedback_id() {
 		$message = 'Test message';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => $name,
 				'email'   => $email,
@@ -180,15 +180,15 @@ public function test_form_response_computed_feedback_id() {
 		);
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 		$post     = get_post( $post_id );
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
-		$this->assertEquals( $response->get_feedback_id(), $post_response->get_feedback_id(), 'Feedback ID should match' );
-		$this->assertEquals( $post->post_name, $post_response->get_feedback_id(), 'Feedback ID should match post slug' );
-		$this->assertNotEmpty( $post_response->get_feedback_id(), 'Feedback ID should not be empty' );
+		$this->assertEquals( $response->get_feedback_id(), $saved_response->get_feedback_id(), 'Feedback ID should match' );
+		$this->assertEquals( $post->post_name, $saved_response->get_feedback_id(), 'Feedback ID should match post slug' );
+		$this->assertNotEmpty( $saved_response->get_feedback_id(), 'Feedback ID should not be empty' );
 	}
 
 	/**
@@ -201,7 +201,7 @@ public function test_ip_address_included_in_serialized_response() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'John Doe',
 				'email'   => 'john@example.com',
@@ -219,22 +219,22 @@ public function test_ip_address_included_in_serialized_response() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		// The IP address should be present.
 		$this->assertNotEmpty( $response->get_ip_address(), 'IP address should not be empty' );
-		$this->assertNotEmpty( $post_response->get_ip_address(), 'IP address should not be empty' );
-		$this->assertEquals( $response->get_ip_address(), $post_response->get_ip_address(), 'IP address should match' );
+		$this->assertNotEmpty( $saved_response->get_ip_address(), 'IP address should not be empty' );
+		$this->assertEquals( $response->get_ip_address(), $saved_response->get_ip_address(), 'IP address should match' );
 
 		add_filter( 'jetpack_contact_form_forget_ip_address', '__return_true' );
 		$new_post_id = $response->save();
 		remove_filter( 'jetpack_contact_form_forget_ip_address', '__return_true' );
 
 		// The IP address should NOT be present.
-		$post_response = Form_Response::get( $new_post_id );
-		$this->assertEmpty( $post_response->get_ip_address(), 'IP address should BE empty' );
+		$saved_response = Form_Response::get( $new_post_id );
+		$this->assertEmpty( $saved_response->get_ip_address(), 'IP address should BE empty' );
 	}
 
 	/**
@@ -255,8 +255,8 @@ public function test_ip_address_in_legacy() {
 			$ip
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $ip, $post_response->get_ip_address(), 'IP should match the legacy feedback  IP' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $ip, $saved_response->get_ip_address(), 'IP should match the legacy feedback  IP' );
 	}
 
 	/**
@@ -274,8 +274,8 @@ public function test_computed_subject_legacy() {
 			$subject
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the legacy feedback post subject' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the legacy feedback post subject' );
 	}
 
 	/**
@@ -285,7 +285,7 @@ public function test_computed_form_subject() {
 		$subject = 'Test Subject';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'John Doe',
 				'email'   => 'john@example.com',
@@ -304,12 +304,12 @@ public function test_computed_form_subject() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
-		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
 	}
 
 	/**
@@ -319,7 +319,7 @@ public function test_computed_form_subject_field() {
 		$subject = 'Test Subject';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'John Doe',
 				'subject' => $subject,
@@ -337,12 +337,12 @@ public function test_computed_form_subject_field() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
-		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
 	}
 
 	/**
@@ -352,7 +352,7 @@ public function test_computed_form_subject_field_overwrites() {
 		$subject = 'Test Subject';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'John Doe',
 				'subject' => $subject,
@@ -371,12 +371,12 @@ public function test_computed_form_subject_field_overwrites() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
-		$this->assertEquals( $subject, $post_response->get_subject(), 'Subject should match the saved form submission' );
+		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
 	}
 
 	/**
@@ -386,7 +386,7 @@ public function test_computed_form_subject_field_overwrites_filter() {
 		$subject = 'Test Subject';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'John Doe',
 				'subject' => $subject,
@@ -407,13 +407,13 @@ public function test_computed_form_subject_field_overwrites_filter() {
 		add_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
 		$this->assertEquals( 'Overwritten Subject (from filter)', $response->get_subject(), 'Subject should match the form submission' );
-		$this->assertEquals( 'Overwritten Subject (from filter)', $post_response->get_subject(), 'Subject should match the saved form submission' );
+		$this->assertEquals( 'Overwritten Subject (from filter)', $saved_response->get_subject(), 'Subject should match the saved form submission' );
 	}
 	/**
 	 * Callback for the contact_form_subject filter.
@@ -435,8 +435,8 @@ public function test_computed_name_for_legacy() {
 			$author
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $author, $post_response->get_author(), 'Author should match the legacy feedback post author' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $author, $saved_response->get_author(), 'Author should match the legacy feedback post author' );
 	}
 
 	public function test_computed_name() {
@@ -444,7 +444,7 @@ public function test_computed_name() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => $author,
 				'email'   => 'email@email.com',
@@ -462,12 +462,12 @@ public function test_computed_name() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $author, $response->get_author(), 'Author should match the form submission' );
-		$this->assertEquals( $author, $post_response->get_author(), 'Author should match the saved form submission' );
+		$this->assertEquals( $author, $saved_response->get_author(), 'Author should match the saved form submission' );
 	}
 
 	public function test_computed_name_as_email() {
@@ -476,7 +476,7 @@ public function test_computed_name_as_email() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => $author,
 				'email'   => $email,
@@ -494,12 +494,12 @@ public function test_computed_name_as_email() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $email, $response->get_author(), 'Author should match the form submission' );
-		$this->assertEquals( $email, $post_response->get_author(), 'Author should match the saved form submission' );
+		$this->assertEquals( $email, $saved_response->get_author(), 'Author should match the saved form submission' );
 	}
 
 	public function test_computed_name_filter() {
@@ -507,7 +507,7 @@ public function test_computed_name_filter() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => $author,
 				'email'   => 'email@email.com',
@@ -525,14 +525,14 @@ public function test_computed_name_filter() {
 		);
 
 		add_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		remove_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
 
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( 'STRING', $response->get_author(), 'Author should match the form submission' );
-		$this->assertEquals( 'STRING', $post_response->get_author(), 'Author should match the saved form submission' );
+		$this->assertEquals( 'STRING', $saved_response->get_author(), 'Author should match the saved form submission' );
 	}
 	/**
 	 * A helper function that sets the filter to return string 'STRING'.
@@ -552,9 +552,9 @@ public function test_computed_email_for_legacy() {
 			$email
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the legacy feedback post author email' );
-		$this->assertEquals( get_avatar_url( $email ), $post_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $email, $saved_response->get_author_email(), 'Author email should match the legacy feedback post author email' );
+		$this->assertEquals( get_avatar_url( $email ), $saved_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
 	}
 
 	public function test_computed_email() {
@@ -563,7 +563,7 @@ public function test_computed_email() {
 		$avatar  = get_avatar_url( $email );
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'author ',
 				'email'   => $email,
@@ -581,14 +581,14 @@ public function test_computed_email() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $email, $response->get_author_email(), 'Author email should match the form submission' );
-		$this->assertEquals( $avatar, $post_response->get_author_avatar(), 'Author avatar should match the legacy feedback post author email' );
-		$this->assertEquals( $email, $post_response->get_author_email(), 'Author email should match the saved form submission' );
-		$this->assertEquals( $avatar, $post_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
+		$this->assertEquals( $avatar, $saved_response->get_author_avatar(), 'Author avatar should match the legacy feedback post author email' );
+		$this->assertEquals( $email, $saved_response->get_author_email(), 'Author email should match the saved form submission' );
+		$this->assertEquals( $avatar, $saved_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
 	}
 
 	public function test_computed_email_filter() {
@@ -596,7 +596,7 @@ public function test_computed_email_filter() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'    => 'joe',
 				'email'   => $email,
@@ -614,14 +614,14 @@ public function test_computed_email_filter() {
 		);
 
 		add_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		remove_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
 
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( 'STRING', $response->get_author_email(), 'Author email should match the form submission' );
-		$this->assertEquals( 'STRING', $post_response->get_author_email(), 'Author email should match the saved form submission' );
+		$this->assertEquals( 'STRING', $saved_response->get_author_email(), 'Author email should match the saved form submission' );
 	}
 
 	public function test_computed_url_for_legacy() {
@@ -634,8 +634,8 @@ public function test_computed_url_for_legacy() {
 			$url
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $url, $post_response->get_author_url(), 'Author url should match the legacy feedback post author url' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $url, $saved_response->get_author_url(), 'Author url should match the legacy feedback post author url' );
 	}
 
 	public function test_computed_url() {
@@ -643,7 +643,7 @@ public function test_computed_url() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'url'     => $url,
 				'email'   => 'email@email.com',
@@ -661,19 +661,19 @@ public function test_computed_url() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $url, $response->get_author_url(), 'Author url should match the form submission' );
-		$this->assertEquals( $url, $post_response->get_author_url(), 'Author url should match the saved form submission' );
+		$this->assertEquals( $url, $saved_response->get_author_url(), 'Author url should match the saved form submission' );
 	}
 
 	public function test_computed_url_filter() {
 		$url     = 'https://wordpress.com';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'url'     => $url,
 				'email'   => 'email@email.com',
@@ -691,14 +691,14 @@ public function test_computed_url_filter() {
 		);
 
 		add_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		remove_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
 
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( 'STRING', $response->get_author_url(), 'Author url should match the form submission' );
-		$this->assertEquals( 'STRING', $post_response->get_author_url(), 'Author url should match the saved form submission' );
+		$this->assertEquals( 'STRING', $saved_response->get_author_url(), 'Author url should match the saved form submission' );
 	}
 
 	public function test_computed_comment_content_for_legacy() {
@@ -708,8 +708,8 @@ public function test_computed_comment_content_for_legacy() {
 			$content
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $content, $post_response->get_comment_content(), 'Comment content should match the legacy feedback post author url' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $content, $saved_response->get_comment_content(), 'Comment content should match the legacy feedback post author url' );
 	}
 
 	public function test_computed_comment_content() {
@@ -717,7 +717,7 @@ public function test_computed_comment_content() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'url'     => 'https://howdy.com',
 				'email'   => 'email@email.com',
@@ -735,12 +735,12 @@ public function test_computed_comment_content() {
 		);
 
 		// Create a contact form
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $content, $response->get_comment_content(), 'Comment content should match the form submission' );
-		$this->assertEquals( $content, $post_response->get_comment_content(), 'Comment content should match the saved form submission' );
+		$this->assertEquals( $content, $saved_response->get_comment_content(), 'Comment content should match the saved form submission' );
 	}
 
 	public function test_status_from_legacy() {
@@ -756,15 +756,15 @@ public function test_status_from_legacy() {
 			'spam'
 		);
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $status, $post_response->get_status(), 'Status should match the legacy feedback status' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $status, $saved_response->get_status(), 'Status should match the legacy feedback status' );
 	}
 
 	public function test_computed_status() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email'   => 'email@email.com',
 				'message' => 'Test message',
@@ -780,19 +780,19 @@ public function test_computed_status() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
 		);
 
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( 'publish', $response->get_status(), 'Status should match the form submission' );
-		$this->assertEquals( 'publish', $post_response->get_status(), 'Status should match the saved form submission' );
+		$this->assertEquals( 'publish', $saved_response->get_status(), 'Status should match the saved form submission' );
 	}
 
 	public function test_set_status() {
 		$status  = 'trash';
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email'   => 'email@email.com',
 				'message' => 'Test message',
@@ -808,20 +808,20 @@ public function test_set_status() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$response->set_status( $status );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 
 		$this->assertEquals( $status, $response->get_status(), 'Status should match the form submission' );
-		$this->assertEquals( $status, $post_response->get_status(), 'Status should match the saved form submission' );
+		$this->assertEquals( $status, $saved_response->get_status(), 'Status should match the saved form submission' );
 	}
 
 	public function test_consent() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email'   => 'email@email.com',
 				'consent' => 'Yes',
@@ -837,18 +837,18 @@ public function test_consent() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 		$this->assertTrue( $response->has_consent(), 'Has consent should match the form submission' );
-		$this->assertTrue( $post_response->has_consent(), 'Has consent should match the saved form submission' );
+		$this->assertTrue( $saved_response->has_consent(), 'Has consent should match the saved form submission' );
 	}
 
 	public function test_empty_consent() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email'   => 'email@email.com',
 				'consent' => '',
@@ -864,11 +864,11 @@ public function test_empty_consent() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response      = Form_Response::from_submission( $post_data, $form );
-		$post_id       = $response->save();
-		$post_response = Form_Response::get( $post_id );
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
+		$saved_response   = Form_Response::get( $feedback_post_id );
 		$this->assertFalse( $response->has_consent(), 'Has consent should match the form submission' );
-		$this->assertFalse( $post_response->has_consent(), 'Has consent should match the saved form submission' );
+		$this->assertFalse( $saved_response->has_consent(), 'Has consent should match the saved form submission' );
 	}
 
 	/**
@@ -917,15 +917,15 @@ public function test_compute_entry_ID_legacy() {
 		$post_id      = Utility::create_legacy_feedback();
 		$this->destroy_post_context();
 
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEquals( $current_post->ID, $post_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEquals( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
 	}
 
 	public function test_compute_entry_ID() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email'   => 'email@email.com',
 				'consent' => '',
@@ -941,20 +941,20 @@ public function test_compute_entry_ID() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 		$this->assertEquals( $current_post->ID, $response->get_entry_id(), 'Entry_ID should match the form submission' );
-		$this->assertEquals( $current_post->ID, $post_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
+		$this->assertEquals( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
 	}
 
 	public function test_compute_entry_title() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -969,21 +969,21 @@ public function test_compute_entry_title() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 		$this->destroy_post_context();
 
 		$this->assertEquals( $current_post->post_title, $response->get_entry_title(), 'Post title should match the form submission' );
-		$this->assertEquals( $current_post->post_title, $post_response->get_entry_title(), 'Post title should match the saved form submission' );
+		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post title should match the saved form submission' );
 	}
 
 	public function test_compute_entry_title_updated() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -998,7 +998,7 @@ public function test_compute_entry_title_updated() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
 		// Update the post title to simulate an update.
@@ -1010,17 +1010,17 @@ public function test_compute_entry_title_updated() {
 			)
 		);
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 		$this->destroy_post_context();
 
-		$this->assertEquals( $update_title, $post_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
+		$this->assertEquals( $update_title, $saved_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
 	}
 
 	public function test_compute_entry_title_deleted() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -1035,23 +1035,23 @@ public function test_compute_entry_title_deleted() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context();
 
 		$this->assertSame( '', get_the_title( $current_post->ID ), 'Post title should not be available after the post is deleted' );
 		// At this point we should have a deleted post.
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
-		$this->assertNotEmpty( $post_response->get_entry_title(), 'Post Title should NOT be empty after the post is deleted' );
-		$this->assertEquals( $current_post->post_title, $post_response->get_entry_title(), 'Post Title should match the saved form submission Original post title' );
+		$this->assertNotEmpty( $saved_response->get_entry_title(), 'Post Title should NOT be empty after the post is deleted' );
+		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post Title should match the saved form submission Original post title' );
 	}
 
 	public function test_compute_entry_permalink() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -1066,22 +1066,22 @@ public function test_compute_entry_permalink() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 		$this->destroy_post_context();
 		$current_permalink = get_the_permalink( $current_post );
 		$this->assertEquals( $current_permalink, $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 
-		$this->assertEquals( $current_permalink, $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
+		$this->assertEquals( $current_permalink, $saved_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
 	}
 
 	public function test_compute_entry_permalink_deleted_post() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -1096,18 +1096,18 @@ public function test_compute_entry_permalink_deleted_post() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context(); // Destroy the post context to simulate a deleted post.
-		$post_response = Form_Response::get( $post_id );
-		$this->assertEmpty( $post_response->get_entry_permalink(), 'Post permalink should match the form submission' );
+		$saved_response = Form_Response::get( $post_id );
+		$this->assertEmpty( $saved_response->get_entry_permalink(), 'Post permalink should match the form submission' );
 	}
 
 	public function test_compute_entry_permalink_with_page_number() {
 		$current_post = $this->create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'email' => 'email@email.com',
 			),
@@ -1122,21 +1122,21 @@ public function test_compute_entry_permalink_with_page_number() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form, $current_post, 999 );
+		$response = Form_Response::from_submission( $_post_data, $form, $current_post, 999 );
 		$post_id  = $response->save();
 
-		$post_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 		$this->destroy_post_context();
 
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
-		$this->assertStringContainsString( 'page=999', $post_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
+		$this->assertStringContainsString( 'page=999', $saved_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
 	}
 
 	public function test_feedback_title() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'  => 'Test User',
 				'email' => 'email@email.com',
@@ -1152,21 +1152,21 @@ public function test_feedback_title() {
 			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
-		$post          = get_post( $post_id );
-		$post_response = Form_Response::get( $post_id );
+		$post           = get_post( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
 		$this->assertStringContainsString( $post->post_title, $response->get_title(), 'Feedback title should match the form submission' );
-		$this->assertStringContainsString( $post->post_title, $post_response->get_title(), 'Feedback title should match the saved form submission' );
+		$this->assertStringContainsString( $post->post_title, $saved_response->get_title(), 'Feedback title should match the saved form submission' );
 	}
 
 	public function test_feedback_title_time() {
 
 		$form_id = Utility::get_form_id();
 		// Create a form submission
-		$post_data = Utility::get_post_request(
+		$_post_data = Utility::get_post_request(
 			array(
 				'name'  => 'Test User',
 				'email' => 'email@email.com',
@@ -1182,14 +1182,14 @@ public function test_feedback_title_time() {
 			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $post_data, $form );
+		$response = Form_Response::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
-		$post          = get_post( $post_id );
-		$post_response = Form_Response::get( $post_id );
+		$post           = get_post( $post_id );
+		$saved_response = Form_Response::get( $post_id );
 
 		$this->assertStringContainsString( $post->post_date, $response->get_time(), 'Feedback submitted time should match the form submission' );
-		$this->assertStringContainsString( $post->post_date, $post_response->get_time(), 'Feedback submitted time should match the saved form submission' );
+		$this->assertStringContainsString( $post->post_date, $saved_response->get_time(), 'Feedback submitted time should match the saved form submission' );
 	}
 
 	/**

From 9e6927fa3706d67f89763ecae1d3b1b1ec255346 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Thu, 10 Jul 2025 14:59:47 -0700
Subject: [PATCH 09/48] Simplify things

---
 .../src/contact-form/class-form-response.php  | 184 +++++++++---------
 .../src/contact-form/class-response-field.php |  11 +-
 .../php/contact-form/Form_Response_Test.php   |  31 ++-
 .../php/contact-form/Response_Field_Test.php  |   2 +
 4 files changed, 123 insertions(+), 105 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
index f8ae97818571c..d3e98f0761cb1 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -204,13 +204,13 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$current_post        = $this->entry_id ? get_post( $this->entry_id ) : null;
 
 			$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
-			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : null;
-			$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : '';
-			$this->author          = isset( $parsed_content['author'] ) ? $parsed_content['author'] : '';
-			$this->author_email    = isset( $parsed_content['author_email'] ) ? $parsed_content['author_email'] : '';
-			$this->author_url      = isset( $parsed_content['author_url'] ) ? $parsed_content['author_url'] : '';
-			$this->comment_content = isset( $parsed_content['comment_content'] ) ? $parsed_content['comment_content'] : '';
-			$this->has_consent     = isset( $parsed_content['has_consent'] ) ? $parsed_content['has_consent'] : false;
+			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
+			$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
+			$this->author          = $this->get_first_field_of_type( 'name', 'pre_comment_author_name' );
+			$this->author_email    = $this->get_first_field_of_type( 'email', 'pre_comment_author_email' );
+			$this->author_url      = $this->get_first_field_of_type( 'url', 'pre_comment_author_url' );
+			$this->comment_content = $this->get_first_field_of_type( 'textarea' );
+			$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
 			$this->entry_title     = isset( $parsed_content['entry_title'] ) ? $parsed_content['entry_title'] : '';
 			$this->entry_page      = isset( $parsed_content['entry_page'] ) ? (int) $parsed_content['entry_page'] : 1;
 			$this->feedback_title  = $this->feedback_post->post_title ? $this->feedback_post->post_title : $this->get_author() . ' - ' . $this->feedback_post->post_date;
@@ -222,9 +222,9 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$this->fields          = $this->get_computed_fields( $post_data );
 			$this->ip_address      = Contact_Form_Plugin::get_ip_address();
 			$this->subject         = $this->get_computed_subject( $post_data );
-			$this->author          = $this->get_computed_author( $post_data );
-			$this->author_email    = $this->get_computed_author_email( $post_data );
-			$this->author_url      = $this->get_computed_author_url( $post_data );
+			$this->author          = $this->get_computer_author_info( $post_data, 'name', 'pre_comment_author_name' );
+			$this->author_email    = $this->get_computer_author_info( $post_data, 'email', 'pre_comment_author_email' );
+			$this->author_url      = $this->get_computer_author_info( $post_data, 'url', 'pre_comment_author_url' );
 			$this->comment_content = $this->get_computed_comment_content( $post_data );
 			$this->has_consent     = $this->get_computed_consent( $post_data );
 			$this->entry_id        = ! empty( $current_post ) ? (int) $current_post->ID : 0;
@@ -287,6 +287,31 @@ private function get_field_value( $key, $post_data ) {
 		}
 		return '';
 	}
+	/**
+	 * Get the value of the field based on the first type found.
+	 *
+	 * @param string      $type The type of the field to look for.
+	 * @param string|null $filter Optional filter to apply to the value.
+	 *
+	 * @return string The value of the first field of the specified type, or an empty string if not found.
+	 */
+	private function get_first_field_of_type( $type, $filter = null ) {
+		// This method is used to get the first field of a specific type.
+		foreach ( $this->fields as $field ) {
+			if ( $field->get_type() === $type ) {
+				if ( $filter ) {
+					return self::strip_tags(
+						stripslashes(
+							/** This filter is already documented in core/wp-includes/comment-functions.php */
+							\apply_filters( $filter, addslashes( $field->get_render_value() ) )
+						)
+					);
+				}
+				return $field->get_render_value();
+			}
+		}
+		return null;
+	}
 
 	/**
 	 * Get all the fields of the response.
@@ -310,6 +335,9 @@ private function get_all_values() {
 			if ( ! $field instanceof Response_Field ) {
 				continue;
 			}
+			if ( $field->get_meta( 'render' ) === false ) {
+				continue; // Skip fields that are not meant to be rendered.
+			}
 			$values[ $field->get_key() ] = $field->get_render_value();
 		}
 		return $values;
@@ -365,13 +393,12 @@ public function get_api_fields_values() {
 	 * @return array
 	 */
 	public function get_compiled_fields() {
-		// This is a convenience method to get the compiled fields in a simple array format.
 		$compiled_fields = array();
 		foreach ( $this->fields as $field ) {
 			if ( ! $field instanceof Response_Field ) {
 				continue;
 			}
-			$compiled_fields[] = array(
+			$compiled_fields[ $field->get_key() ] = array(
 				'label' => $field->get_label(),
 				'value' => $field->get_render_value(),
 			);
@@ -388,6 +415,9 @@ private function get_api_all_values() {
 			if ( ! $field instanceof Response_Field ) {
 				continue;
 			}
+			if ( $field->get_meta( 'render' ) === false ) {
+				continue; // Skip fields that are not meant to be rendered.
+			}
 			$values[ $field->get_key() ] = $field->get_render_api_value();
 		}
 		return $values;
@@ -650,15 +680,10 @@ public function save() {
 	public function serialize() {
 
 		$fields_to_serialize = array(
-			'subject'         => $this->subject,
-			'author'          => $this->author,
-			'author_email'    => $this->author_email,
-			'author_url'      => $this->author_url,
-			'comment_content' => $this->comment_content,
-			'has_consent'     => (bool) $this->has_consent,
-			'entry_title'     => $this->entry_title,
-			'entry_page'      => $this->entry_page,
-			'ip'              => $this->ip_address,
+			'subject'     => $this->subject,
+			'entry_title' => $this->entry_title,
+			'entry_page'  => $this->entry_page,
+			'ip'          => $this->ip_address,
 		);
 
 		$fields_to_serialize['fields'] = array();
@@ -748,21 +773,39 @@ private function parse_content( $post_content = '', $version = null ) {
 		}
 
 		$var_map = array(
-			'AUTHOR'       => 'author',
-			'AUTHOR EMAIL' => 'author_email',
-			'AUTHOR URL'   => 'author_url',
-			'SUBJECT'      => 'subject',
-			'IP'           => 'ip',
+			'AUTHOR'       => array(
+				'type'  => 'name',
+				'label' => 'Author',
+			),
+			'AUTHOR EMAIL' => array(
+				'type'  => 'email',
+				'label' => 'Email',
+			),
+			'AUTHOR URL'   => array(
+				'type'  => 'url',
+				'label' => 'Url',
+			),
+			'SUBJECT'      => array(
+				'type'  => 'subject',
+				'label' => 'Subject',
+			),
+			'IP'           => array(
+				'type'  => 'ip',
+				'label' => 'IP',
+			),
 		);
 
 		$decoded_fields = array();
 
 		foreach ( $lines as $line ) {
-			$vars = explode( ': ', $line, 2 );
-			if ( ! empty( $vars ) ) {
-				if ( isset( $var_map[ $vars[0] ] ) ) {
-					$type                    = $var_map[ $vars[0] ];
-					$decoded_fields[ $type ] = self::strip_tags( trim( $vars[1] ) );
+
+			list( $key, $value ) = explode( ': ', $line, 2 );
+
+			if ( ! empty( $key ) ) {
+				if ( isset( $var_map[ $key ] ) ) {
+					$map_to_field                     = $var_map[ $key ];
+					$value                            = self::strip_tags( trim( $value ) );
+					$decoded_fields['fields'][ $key ] = new Response_Field( $key, $map_to_field['label'], $value, $map_to_field['type'], array( 'render' => false ) );
 				}
 			}
 		}
@@ -794,7 +837,13 @@ private function parse_content( $post_content = '', $version = null ) {
 			}
 		}
 
-		$decoded_fields['comment_content'] = trim( self::strip_tags( $comment_content ) );
+		$decoded_fields['fields']['comment_content'] = new Response_Field(
+			'comment_content',
+			'Comment Content',
+			trim( self::strip_tags( $comment_content ) ),
+			'textarea',
+			array( 'render' => false )
+		);
 
 		return $decoded_fields;
 	}
@@ -897,69 +946,28 @@ private function get_computed_subject( $post_data ) {
 
 		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
 	}
-
 	/**
 	 * Gets the computed author.
 	 *
-	 * @param array $post_data The post data from the form submission.
-	 * @return string
-	 */
-	private function get_computed_author( $post_data ) {
-		$field_ids = $this->form->get_field_ids();
-		if ( isset( $field_ids['name'] ) ) {
-			$value = $this->get_field_value( $field_ids['name'], $post_data );
-			if ( is_string( $value ) ) {
-				return self::strip_tags(
-					stripslashes(
-						/** This filter is already documented in core/wp-includes/comment-functions.php */
-						apply_filters( 'pre_comment_author_name', addslashes( $value ) )
-					)
-				);
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * Gets the computed author email.
-	 *
-	 * @param array $post_data The post data from the form submission.
+	 * @param array       $post_data The post data from the form submission.
+	 * @param string      $type The type of author information to retrieve (e.g., 'name', 'email', 'url').
+	 * @param string|null $filter Optional filter to apply to the value.
 	 * @return string
 	 */
-	private function get_computed_author_email( $post_data ) {
+	private function get_computer_author_info( $post_data, $type, $filter = null ) {
 		$field_ids = $this->form->get_field_ids();
-		if ( isset( $field_ids['email'] ) ) {
-			$value = $this->get_field_value( $field_ids['email'], $post_data );
+		if ( isset( $field_ids[ $type ] ) ) {
+			$value = $this->get_field_value( $field_ids[ $type ], $post_data );
 			if ( is_string( $value ) ) {
-				return self::strip_tags(
-					stripslashes(
-						/** This filter is already documented in core/wp-includes/comment-functions.php */
-						apply_filters( 'pre_comment_author_email', addslashes( $value ) )
-					)
-				);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * Gets the computed author url.
-	 *
-	 * @param array $post_data The post data from the form submission.
-	 * @return string
-	 */
-	private function get_computed_author_url( $post_data ) {
-		$field_ids = $this->form->get_field_ids();
-		if ( isset( $field_ids['url'] ) ) {
-			$value = $this->get_field_value( $field_ids['url'], $post_data );
-			if ( is_string( $value ) ) {
-				return self::strip_tags(
-					stripslashes(
-						/** This filter is already documented in core/wp-includes/comment-functions.php */
-						apply_filters( 'pre_comment_author_url', addslashes( $value ) )
-					)
-				);
+				if ( ! empty( $filter ) ) {
+					return self::strip_tags(
+						stripslashes(
+							/** This filter is already documented in core/wp-includes/comment-functions.php */
+							apply_filters( $filter, addslashes( $value ) )
+						)
+					);
+				}
+				return self::strip_tags( stripslashes( $value ) );
 			}
 		}
 		return '';
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index 010d255db74f2..47bfe887349ba 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -207,9 +207,18 @@ public function get_type() {
 	/**
 	 * Get the meta of the field.
 	 *
+	 * @param string|null $meta_key The key of the meta to retrieve. If null, returns all meta.
+	 *
 	 * @return string
 	 */
-	public function get_meta() {
+	public function get_meta( $meta_key = null ) {
+
+		if ( $meta_key ) {
+			if ( isset( $this->meta[ $meta_key ] ) ) {
+				return $this->meta[ $meta_key ];
+			}
+			return null;
+		}
 		return $this->meta;
 	}
 
diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
index 5a5e583cbc672..2a955f8d7ac1c 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
@@ -54,15 +54,15 @@ public function test_from_submission_sets_fields_and_post_data() {
 	}
 
 	public function test_form_response_is_matches_empty_data() {
-		$form       = new Contact_Form( array() );
-		$_post_data = array();
-		$response   = Form_Response::from_submission( $_post_data, $form );
-		$post_id    = $response->save();
+		$form             = new Contact_Form( array() );
+		$_post_data       = array();
+		$response         = Form_Response::from_submission( $_post_data, $form );
+		$feedback_post_id = $response->save();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Form_Response::get( $feedback_post_id );
 
-		$this->assertEquals( $response->serialize(), $saved_response->serialize() );
-		$this->assertEquals( $response->get_fields(), $saved_response->get_fields() );
+		$this->assertEquals( $response->serialize(), $saved_response->serialize(), 'Serialized data does not match' );
+		$this->assertEquals( $response->get_fields(), $saved_response->get_fields(), 'Fields data does not match' );
 	}
 
 	public function test_form_response_is_matches_submission_data() {
@@ -407,10 +407,10 @@ public function test_computed_form_subject_field_overwrites_filter() {
 		add_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $_post_data, $form );
-		$post_id  = $response->save();
-		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
+		$response       = Form_Response::from_submission( $_post_data, $form );
+		$post_id        = $response->save();
 		$saved_response = Form_Response::get( $post_id );
+		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
 
 		$this->assertEquals( 'Overwritten Subject (from filter)', $response->get_subject(), 'Subject should match the form submission' );
 		$this->assertEquals( 'Overwritten Subject (from filter)', $saved_response->get_subject(), 'Subject should match the saved form submission' );
@@ -526,10 +526,10 @@ public function test_computed_name_filter() {
 
 		add_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
 		$response = Form_Response::from_submission( $_post_data, $form );
-		remove_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
 
 		$feedback_post_id = $response->save();
 		$saved_response   = Form_Response::get( $feedback_post_id );
+		remove_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
 
 		$this->assertEquals( 'STRING', $response->get_author(), 'Author should match the form submission' );
 		$this->assertEquals( 'STRING', $saved_response->get_author(), 'Author should match the saved form submission' );
@@ -615,11 +615,10 @@ public function test_computed_email_filter() {
 
 		add_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
 		$response = Form_Response::from_submission( $_post_data, $form );
-		remove_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
 
 		$feedback_post_id = $response->save();
 		$saved_response   = Form_Response::get( $feedback_post_id );
-
+		remove_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
 		$this->assertEquals( 'STRING', $response->get_author_email(), 'Author email should match the form submission' );
 		$this->assertEquals( 'STRING', $saved_response->get_author_email(), 'Author email should match the saved form submission' );
 	}
@@ -691,12 +690,12 @@ public function test_computed_url_filter() {
 		);
 
 		add_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $_post_data, $form );
-		remove_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
-
+		$response         = Form_Response::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
 		$saved_response   = Form_Response::get( $feedback_post_id );
 
+		remove_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
+
 		$this->assertEquals( 'STRING', $response->get_author_url(), 'Author url should match the form submission' );
 		$this->assertEquals( 'STRING', $saved_response->get_author_url(), 'Author url should match the saved form submission' );
 	}
diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
index 3b444c0f7ff04..7ad595a8f169e 100644
--- a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
@@ -45,6 +45,8 @@ public function test_response_field_with_additional_parameters() {
 		$this->assertEquals( 'test_value', $field->get_value() );
 		$this->assertEquals( 'text', $field->get_type() );
 		$this->assertEquals( array( 'meta_key' => 'meta_value' ), $field->get_meta() );
+		$this->assertEquals( 'meta_value', $field->get_meta( 'meta_key' ) );
+		$this->assertNull( $field->get_meta( 'non_existant' ) );
 	}
 
 	/**

From 8558fe92444a0ebebdc636bf20d598837cd276a7 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Thu, 10 Jul 2025 15:10:21 -0700
Subject: [PATCH 10/48] Fix rendering on submit

---
 .../packages/forms/src/contact-form/class-form-response.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-form-response.php
index d3e98f0761cb1..3d8572aaefeab 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-form-response.php
@@ -398,6 +398,9 @@ public function get_compiled_fields() {
 			if ( ! $field instanceof Response_Field ) {
 				continue;
 			}
+			if ( $field->get_meta( 'render' ) === false ) {
+				continue; // Skip fields that are not meant to be rendered.
+			}
 			$compiled_fields[ $field->get_key() ] = array(
 				'label' => $field->get_label(),
 				'value' => $field->get_render_value(),

From c1a260f5577b5b0e098633628decf9ffe3f95604 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 13:26:51 -0700
Subject: [PATCH 11/48] Rename Form_Response => Feedback

---
 .../class-contact-form-endpoint.php           |   2 +-
 .../src/contact-form/class-contact-form.php   |   9 +-
 ...s-form-response.php => class-feedback.php} |   6 +-
 .../src/contact-form/class-response-field.php |   2 +-
 ...rm_Response_Test.php => Feedback_Test.php} | 192 +++++++++---------
 5 files changed, 103 insertions(+), 108 deletions(-)
 rename projects/packages/forms/src/contact-form/{class-form-response.php => class-feedback.php} (99%)
 rename projects/packages/forms/tests/php/contact-form/{Form_Response_Test.php => Feedback_Test.php} (86%)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
index e0c2175137f4d..c8fb8ad22b26d 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
@@ -530,7 +530,7 @@ public function prepare_item_for_response( $item, $request ) {
 		$data     = $response->get_data();
 		$fields   = $this->get_fields_for_response( $request );
 
-		$response = Form_Response::get( $item->ID );
+		$response = Feedback::get( $item->ID );
 
 		$data['date'] = get_the_date( 'c', $data['id'] );
 		if ( rest_is_field_included( 'uid', $fields ) ) {
diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index 4a3833475c5d9..366034f9d735a 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -916,13 +916,8 @@ public static function get_json_data( $feedback_id, $form = null ) {
 	 *
 	 * @return array $raw_data Associative array where keys are field_index and values are arrays with 'label' and 'value'.
 	 */
-	private static function get_raw_compiled_form_data( $feedback_id, $form = null ) {
-		if ( $form ) {
-			// you are doing it wrong, the $form parameter is deprecated and no longer used.
-			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
-		}
-
-		$response = Form_Response::get( $feedback_id );
+	private static function get_raw_compiled_form_data( $feedback_id ) {
+		$response = Feedback::get( $feedback_id );
 		return $response->get_compiled_fields();
 	}
 
diff --git a/projects/packages/forms/src/contact-form/class-form-response.php b/projects/packages/forms/src/contact-form/class-feedback.php
similarity index 99%
rename from projects/packages/forms/src/contact-form/class-form-response.php
rename to projects/packages/forms/src/contact-form/class-feedback.php
index 3d8572aaefeab..c591eb10a635d 100644
--- a/projects/packages/forms/src/contact-form/class-form-response.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Form_Response class.
+ * Feedback class.
  *
  * @package automattic/jetpack-forms
  */
@@ -11,9 +11,9 @@
 /**
  * Handles the response for a contact form submission.
  *
- * Form_Response objects are there to help us interact with the form response data.
+ * Feedback objects are there to help us interact with the form response data.
  */
-class Form_Response {
+class Feedback {
 
 	const POST_TYPE = 'feedback';
 
diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-response-field.php
index 47bfe887349ba..7c743b0a09194 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-response-field.php
@@ -10,7 +10,7 @@
 /**
  * Handles the
  *
- * Form_Response objects are there to help us interact with the form response data.
+ * Represents the submitted form data of an invividual field.
  */
 class Response_Field {
 
diff --git a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
similarity index 86%
rename from projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
rename to projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 2a955f8d7ac1c..3803c164414d7 100644
--- a/projects/packages/forms/tests/php/contact-form/Form_Response_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -17,13 +17,13 @@
 /**
  * Test class for Contact_Form
  *
- * @covers Automattic\Jetpack\Forms\ContactForm\Form_Response
+ * @covers Automattic\Jetpack\Forms\ContactForm\Feedback
  */
-#[CoversClass( Form_Response::class )]
-class Form_Response_Test extends BaseTestCase {
+#[CoversClass( Feedback::class )]
+class Feedback_Test extends BaseTestCase {
 
 	public function test_from_post_id_returns_null_for_invalid_post() {
-		$response = Form_Response::get( 999999 );
+		$response = Feedback::get( 999999 );
 		$this->assertNull( $response );
 	}
 
@@ -37,8 +37,8 @@ public function test_from_post_id_returns_instance_for_valid_feedback_post() {
 				'page_template' => 'v2',
 			)
 		);
-		$response = Form_Response::get( $post_id );
-		$this->assertInstanceOf( Form_Response::class, $response );
+		$response = Feedback::get( $post_id );
+		$this->assertInstanceOf( Feedback::class, $response );
 	}
 
 	public function test_from_submission_sets_fields_and_post_data() {
@@ -49,23 +49,23 @@ public function test_from_submission_sets_fields_and_post_data() {
 			'message' => 'Hello!',
 			'ignore'  => 'should not be included',
 		);
-		$response   = Form_Response::from_submission( $_post_data, $form );
-		$this->assertInstanceOf( Form_Response::class, $response );
+		$response   = Feedback::from_submission( $_post_data, $form );
+		$this->assertInstanceOf( Feedback::class, $response );
 	}
 
-	public function test_form_response_is_matches_empty_data() {
+	public function test_Feedback_is_matches_empty_data() {
 		$form             = new Contact_Form( array() );
 		$_post_data       = array();
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
 
-		$saved_response = Form_Response::get( $feedback_post_id );
+		$saved_response = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $response->serialize(), $saved_response->serialize(), 'Serialized data does not match' );
 		$this->assertEquals( $response->get_fields(), $saved_response->get_fields(), 'Fields data does not match' );
 	}
 
-	public function test_form_response_is_matches_submission_data() {
+	public function test_Feedback_is_matches_submission_data() {
 		$name    = 'John Doe';
 		$email   = 'john@example.com';
 		$message = 'Test message';
@@ -89,10 +89,10 @@ public function test_form_response_is_matches_submission_data() {
 		);
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 
 		$this->assertEquals( $response->serialize(), $saved_response->serialize() );
 		$this->assertEquals( $response->get_fields(), $saved_response->get_fields() );
@@ -127,7 +127,7 @@ public function test_form_response_is_matches_submission_data() {
 	/**
 	 * Test that a previously saved response can be handled correctly.
 	 *
-	 * This test checks if the Form_Response class can retrieve and handle
+	 * This test checks if the Feedback class can retrieve and handle
 	 * a response that was saved in the legacy format.
 	 */
 	public function test_handle_previously_saved_response() {
@@ -139,9 +139,9 @@ public function test_handle_previously_saved_response() {
 			)
 		);
 
-		$response = Form_Response::get( $post_id );
+		$response = Feedback::get( $post_id );
 
-		$this->assertInstanceOf( Form_Response::class, $response );
+		$this->assertInstanceOf( Feedback::class, $response );
 
 		$field = $response->get_fields()['1_field'];
 
@@ -156,7 +156,7 @@ public function test_handle_previously_saved_response() {
 	 *
 	 * It should be non empty and match the post slug.
 	 */
-	public function test_form_response_computed_feedback_id() {
+	public function test_Feedback_computed_feedback_id() {
 		$name    = 'John Doe';
 		$email   = 'john@example.com';
 		$message = 'Test message';
@@ -180,11 +180,11 @@ public function test_form_response_computed_feedback_id() {
 		);
 
 		// Create a contact form
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 		$post     = get_post( $post_id );
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 
 		$this->assertEquals( $response->get_feedback_id(), $saved_response->get_feedback_id(), 'Feedback ID should match' );
 		$this->assertEquals( $post->post_name, $saved_response->get_feedback_id(), 'Feedback ID should match post slug' );
@@ -219,9 +219,9 @@ public function test_ip_address_included_in_serialized_response() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		// The IP address should be present.
 		$this->assertNotEmpty( $response->get_ip_address(), 'IP address should not be empty' );
@@ -233,7 +233,7 @@ public function test_ip_address_included_in_serialized_response() {
 		remove_filter( 'jetpack_contact_form_forget_ip_address', '__return_true' );
 
 		// The IP address should NOT be present.
-		$saved_response = Form_Response::get( $new_post_id );
+		$saved_response = Feedback::get( $new_post_id );
 		$this->assertEmpty( $saved_response->get_ip_address(), 'IP address should BE empty' );
 	}
 
@@ -255,7 +255,7 @@ public function test_ip_address_in_legacy() {
 			$ip
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $ip, $saved_response->get_ip_address(), 'IP should match the legacy feedback  IP' );
 	}
 
@@ -274,7 +274,7 @@ public function test_computed_subject_legacy() {
 			$subject
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the legacy feedback post subject' );
 	}
 
@@ -304,9 +304,9 @@ public function test_computed_form_subject() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
 		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
@@ -337,9 +337,9 @@ public function test_computed_form_subject_field() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
 		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
@@ -371,9 +371,9 @@ public function test_computed_form_subject_field_overwrites() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $subject, $response->get_subject(), 'Subject should match the form submission' );
 		$this->assertEquals( $subject, $saved_response->get_subject(), 'Subject should match the saved form submission' );
@@ -407,9 +407,9 @@ public function test_computed_form_subject_field_overwrites_filter() {
 		add_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
 
 		// Create a contact form
-		$response       = Form_Response::from_submission( $_post_data, $form );
+		$response       = Feedback::from_submission( $_post_data, $form );
 		$post_id        = $response->save();
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
 
 		$this->assertEquals( 'Overwritten Subject (from filter)', $response->get_subject(), 'Subject should match the form submission' );
@@ -435,7 +435,7 @@ public function test_computed_name_for_legacy() {
 			$author
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $author, $saved_response->get_author(), 'Author should match the legacy feedback post author' );
 	}
 
@@ -462,9 +462,9 @@ public function test_computed_name() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $author, $response->get_author(), 'Author should match the form submission' );
 		$this->assertEquals( $author, $saved_response->get_author(), 'Author should match the saved form submission' );
@@ -494,9 +494,9 @@ public function test_computed_name_as_email() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $email, $response->get_author(), 'Author should match the form submission' );
 		$this->assertEquals( $email, $saved_response->get_author(), 'Author should match the saved form submission' );
@@ -525,10 +525,10 @@ public function test_computed_name_filter() {
 		);
 
 		add_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 		remove_filter( 'pre_comment_author_name', array( $this, 'set_filter_as_string' ) );
 
 		$this->assertEquals( 'STRING', $response->get_author(), 'Author should match the form submission' );
@@ -552,7 +552,7 @@ public function test_computed_email_for_legacy() {
 			$email
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $email, $saved_response->get_author_email(), 'Author email should match the legacy feedback post author email' );
 		$this->assertEquals( get_avatar_url( $email ), $saved_response->get_author_avatar(), 'Author email should match the legacy feedback post author email' );
 	}
@@ -581,9 +581,9 @@ public function test_computed_email() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $email, $response->get_author_email(), 'Author email should match the form submission' );
 		$this->assertEquals( $avatar, $saved_response->get_author_avatar(), 'Author avatar should match the legacy feedback post author email' );
@@ -614,10 +614,10 @@ public function test_computed_email_filter() {
 		);
 
 		add_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 		remove_filter( 'pre_comment_author_email', array( $this, 'set_filter_as_string' ) );
 		$this->assertEquals( 'STRING', $response->get_author_email(), 'Author email should match the form submission' );
 		$this->assertEquals( 'STRING', $saved_response->get_author_email(), 'Author email should match the saved form submission' );
@@ -633,7 +633,7 @@ public function test_computed_url_for_legacy() {
 			$url
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $url, $saved_response->get_author_url(), 'Author url should match the legacy feedback post author url' );
 	}
 
@@ -660,9 +660,9 @@ public function test_computed_url() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $url, $response->get_author_url(), 'Author url should match the form submission' );
 		$this->assertEquals( $url, $saved_response->get_author_url(), 'Author url should match the saved form submission' );
@@ -690,9 +690,9 @@ public function test_computed_url_filter() {
 		);
 
 		add_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		remove_filter( 'pre_comment_author_url', array( $this, 'set_filter_as_string' ) );
 
@@ -707,7 +707,7 @@ public function test_computed_comment_content_for_legacy() {
 			$content
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $content, $saved_response->get_comment_content(), 'Comment content should match the legacy feedback post author url' );
 	}
 
@@ -734,9 +734,9 @@ public function test_computed_comment_content() {
 		);
 
 		// Create a contact form
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $content, $response->get_comment_content(), 'Comment content should match the form submission' );
 		$this->assertEquals( $content, $saved_response->get_comment_content(), 'Comment content should match the saved form submission' );
@@ -755,7 +755,7 @@ public function test_status_from_legacy() {
 			'spam'
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $status, $saved_response->get_status(), 'Status should match the legacy feedback status' );
 	}
 
@@ -779,9 +779,9 @@ public function test_computed_status() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
 		);
 
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( 'publish', $response->get_status(), 'Status should match the form submission' );
 		$this->assertEquals( 'publish', $saved_response->get_status(), 'Status should match the saved form submission' );
@@ -807,10 +807,10 @@ public function test_set_status() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 		$response->set_status( $status );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 
 		$this->assertEquals( $status, $response->get_status(), 'Status should match the form submission' );
 		$this->assertEquals( $status, $saved_response->get_status(), 'Status should match the saved form submission' );
@@ -836,9 +836,9 @@ public function test_consent() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 		$this->assertTrue( $response->has_consent(), 'Has consent should match the form submission' );
 		$this->assertTrue( $saved_response->has_consent(), 'Has consent should match the saved form submission' );
 	}
@@ -863,9 +863,9 @@ public function test_empty_consent() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response         = Form_Response::from_submission( $_post_data, $form );
+		$response         = Feedback::from_submission( $_post_data, $form );
 		$feedback_post_id = $response->save();
-		$saved_response   = Form_Response::get( $feedback_post_id );
+		$saved_response   = Feedback::get( $feedback_post_id );
 		$this->assertFalse( $response->has_consent(), 'Has consent should match the form submission' );
 		$this->assertFalse( $saved_response->has_consent(), 'Has consent should match the saved form submission' );
 	}
@@ -916,7 +916,7 @@ public function test_compute_entry_ID_legacy() {
 		$post_id      = Utility::create_legacy_feedback();
 		$this->destroy_post_context();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
 	}
 
@@ -940,11 +940,11 @@ public function test_compute_entry_ID() {
 			"[contact-field label='Email' type='email' required='1'/][contact-field label='Consent' type='consent' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $current_post->ID, $response->get_entry_id(), 'Entry_ID should match the form submission' );
 		$this->assertEquals( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
 	}
@@ -968,10 +968,10 @@ public function test_compute_entry_title() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->destroy_post_context();
 
 		$this->assertEquals( $current_post->post_title, $response->get_entry_title(), 'Post title should match the form submission' );
@@ -997,7 +997,7 @@ public function test_compute_entry_title_updated() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
 		// Update the post title to simulate an update.
@@ -1009,7 +1009,7 @@ public function test_compute_entry_title_updated() {
 			)
 		);
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->destroy_post_context();
 
 		$this->assertEquals( $update_title, $saved_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
@@ -1034,13 +1034,13 @@ public function test_compute_entry_title_deleted() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context();
 
 		$this->assertSame( '', get_the_title( $current_post->ID ), 'Post title should not be available after the post is deleted' );
 		// At this point we should have a deleted post.
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 
 		$this->assertNotEmpty( $saved_response->get_entry_title(), 'Post Title should NOT be empty after the post is deleted' );
 		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post Title should match the saved form submission Original post title' );
@@ -1065,10 +1065,10 @@ public function test_compute_entry_permalink() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->destroy_post_context();
 		$current_permalink = get_the_permalink( $current_post );
 		$this->assertEquals( $current_permalink, $response->get_entry_permalink(), 'Post permalink should match the form submission' );
@@ -1095,10 +1095,10 @@ public function test_compute_entry_permalink_deleted_post() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
 		$this->destroy_post_context(); // Destroy the post context to simulate a deleted post.
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->assertEmpty( $saved_response->get_entry_permalink(), 'Post permalink should match the form submission' );
 	}
 
@@ -1121,10 +1121,10 @@ public function test_compute_entry_permalink_with_page_number() {
 			"[contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form, $current_post, 999 );
+		$response = Feedback::from_submission( $_post_data, $form, $current_post, 999 );
 		$post_id  = $response->save();
 
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 		$this->destroy_post_context();
 
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
@@ -1151,11 +1151,11 @@ public function test_feedback_title() {
 			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
 		$post           = get_post( $post_id );
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 
 		$this->assertStringContainsString( $post->post_title, $response->get_title(), 'Feedback title should match the form submission' );
 		$this->assertStringContainsString( $post->post_title, $saved_response->get_title(), 'Feedback title should match the saved form submission' );
@@ -1181,11 +1181,11 @@ public function test_feedback_title_time() {
 			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
 		);
 
-		$response = Form_Response::from_submission( $_post_data, $form );
+		$response = Feedback::from_submission( $_post_data, $form );
 		$post_id  = $response->save();
 
 		$post           = get_post( $post_id );
-		$saved_response = Form_Response::get( $post_id );
+		$saved_response = Feedback::get( $post_id );
 
 		$this->assertStringContainsString( $post->post_date, $response->get_time(), 'Feedback submitted time should match the form submission' );
 		$this->assertStringContainsString( $post->post_date, $saved_response->get_time(), 'Feedback submitted time should match the saved form submission' );
@@ -1193,7 +1193,7 @@ public function test_feedback_title_time() {
 
 	/**
 	 * ======================================================
-	 * Tests for the strip_tags method in Form_Response class.
+	 * Tests for the strip_tags method in Feedback class.
 	 * ======================================================
 	 *
 	 * Test that strip_tags handles simple string without HTML tags.
@@ -1201,7 +1201,7 @@ public function test_feedback_title_time() {
 	public function test_strip_tags_with_plain_string() {
 		$input    = 'Hello, this is a plain text string.';
 		$expected = 'Hello, this is a plain text string.';
-		$result   = Form_Response::strip_tags( $input );
+		$result   = Feedback::strip_tags( $input );
 		$this->assertEquals( $expected, $result );
 	}
 
@@ -1211,7 +1211,7 @@ public function test_strip_tags_with_plain_string() {
 	public function test_strip_tags_removes_script_tags() {
 		$input    = '<script>alert("XSS")</script>Hello <b>world</b>!';
 		$expected = 'alert("XSS")Hello <b>world</b>!';
-		$result   = Form_Response::strip_tags( $input );
+		$result   = Feedback::strip_tags( $input );
 		$this->assertEquals( $expected, $result );
 	}
 
@@ -1221,7 +1221,7 @@ public function test_strip_tags_removes_script_tags() {
 	public function test_strip_tags_handles_html_entities() {
 		$input    = 'Hello &amp; goodbye';
 		$expected = 'Hello & goodbye';
-		$result   = Form_Response::strip_tags( $input );
+		$result   = Feedback::strip_tags( $input );
 		$this->assertEquals( $expected, $result );
 	}
 
@@ -1249,7 +1249,7 @@ public function test_strip_tags_handles_arrays() {
 			),
 		);
 
-		$result = Form_Response::strip_tags( $input );
+		$result = Feedback::strip_tags( $input );
 		$this->assertEquals( $expected, $result );
 	}
 
@@ -1262,7 +1262,7 @@ public function test_strip_tags_sanitizes_array_keys() {
 			'normal_key'           => 'value2',
 		);
 
-		$result = Form_Response::strip_tags( $input );
+		$result = Feedback::strip_tags( $input );
 
 		// Check that the results exist and are correct
 		// We need to check what key actually gets created after sanitization
@@ -1285,18 +1285,18 @@ public function test_strip_tags_sanitizes_array_keys() {
 	 * Test that strip_tags handles empty values.
 	 */
 	public function test_strip_tags_handles_empty_values() {
-		$this->assertSame( '', Form_Response::strip_tags( '' ) );
-		$this->assertEquals( array(), Form_Response::strip_tags( array() ) );
-		$this->assertSame( '0', Form_Response::strip_tags( 0 ) );
-		$this->assertSame( '', Form_Response::strip_tags( null ) );
+		$this->assertSame( '', Feedback::strip_tags( '' ) );
+		$this->assertEquals( array(), Feedback::strip_tags( array() ) );
+		$this->assertSame( '0', Feedback::strip_tags( 0 ) );
+		$this->assertSame( '', Feedback::strip_tags( null ) );
 	}
 
 	/**
 	 * Test that strip_tags handles numeric values.
 	 */
 	public function test_strip_tags_handles_numeric_values() {
-		$this->assertSame( '123', Form_Response::strip_tags( 123 ) );
-		$this->assertSame( '123.45', Form_Response::strip_tags( 123.45 ) );
+		$this->assertSame( '123', Feedback::strip_tags( 123 ) );
+		$this->assertSame( '123.45', Feedback::strip_tags( 123.45 ) );
 	}
 
 	/**
@@ -1304,7 +1304,7 @@ public function test_strip_tags_handles_numeric_values() {
 	 */
 	public function test_strip_tags_preserves_allowed_html() {
 		$input  = '<p>This is a <strong>test</strong> with <em>emphasis</em> and <a href="http://example.com">links</a>.</p>';
-		$result = Form_Response::strip_tags( $input );
+		$result = Feedback::strip_tags( $input );
 
 		// wp_kses_post should preserve these tags - let's just verify we get a non-empty string with HTML
 		$this->assertNotEquals( '', $result );
@@ -1317,7 +1317,7 @@ public function test_strip_tags_preserves_allowed_html() {
 	 */
 	public function test_strip_tags_removes_dangerous_html() {
 		$input  = '<script>alert("XSS")</script><iframe src="evil.com"></iframe>Hello world';
-		$result = Form_Response::strip_tags( $input );
+		$result = Feedback::strip_tags( $input );
 
 		// These dangerous tags should be removed, but content might remain
 		$this->assertStringNotContainsString( '<script>', $result );
@@ -1339,7 +1339,7 @@ public function test_strip_tags_handles_mixed_array() {
 			),
 		);
 
-		$result = Form_Response::strip_tags( $input );
+		$result = Feedback::strip_tags( $input );
 
 		$this->assertEquals( 'Hello <b>world</b>', $result['string'] );
 		$this->assertSame( '42', $result['number'] );

From 2a63acf049a46139215d88fe490c12cc5b2cf0bc Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 13:34:44 -0700
Subject: [PATCH 12/48] Rename Response_Field => Feedback_Field

---
 ...nse-field.php => class-feedback-field.php} |  8 +-
 .../forms/src/contact-form/class-feedback.php | 20 ++---
 ...Field_Test.php => Feedback_Field_Test.php} | 82 ++++++++++---------
 .../tests/php/contact-form/Feedback_Test.php  | 12 +--
 4 files changed, 62 insertions(+), 60 deletions(-)
 rename projects/packages/forms/src/contact-form/{class-response-field.php => class-feedback-field.php} (97%)
 rename projects/packages/forms/tests/php/contact-form/{Response_Field_Test.php => Feedback_Field_Test.php} (66%)

diff --git a/projects/packages/forms/src/contact-form/class-response-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
similarity index 97%
rename from projects/packages/forms/src/contact-form/class-response-field.php
rename to projects/packages/forms/src/contact-form/class-feedback-field.php
index 7c743b0a09194..5c4d8cce1cdfc 100644
--- a/projects/packages/forms/src/contact-form/class-response-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Response_Field class.
+ * Feedback_Field class.
  *
  * @package automattic/jetpack-forms
  */
@@ -12,7 +12,7 @@
  *
  * Represents the submitted form data of an invividual field.
  */
-class Response_Field {
+class Feedback_Field {
 
 	/**
 	 * The key of the field.
@@ -237,11 +237,11 @@ public function serialize() {
 		);
 	}
 	/**
-	 * Create a Response_Field object from serialized data.
+	 * Create a Feedback_Field object from serialized data.
 	 *
 	 * @param array $data The serialized data.
 	 *
-	 * @return Response_Field|null Returns a Response_Field object or null if the data is invalid.
+	 * @return Feedback_Field|null Returns a Feedback_Field object or null if the data is invalid.
 	 */
 	public static function from_serialized( $data ) {
 		if ( ! is_array( $data ) || ! isset( $data['key'] ) || ! isset( $data['value'] ) || ! isset( $data['label'] ) ) {
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index c591eb10a635d..3ca2cef2a4148 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -332,7 +332,7 @@ public function get_fields() {
 	private function get_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Response_Field ) {
+			if ( ! $field instanceof Feedback_Field ) {
 				continue;
 			}
 			if ( $field->get_meta( 'render' ) === false ) {
@@ -395,7 +395,7 @@ public function get_api_fields_values() {
 	public function get_compiled_fields() {
 		$compiled_fields = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Response_Field ) {
+			if ( ! $field instanceof Feedback_Field ) {
 				continue;
 			}
 			if ( $field->get_meta( 'render' ) === false ) {
@@ -415,7 +415,7 @@ public function get_compiled_fields() {
 	private function get_api_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Response_Field ) {
+			if ( ! $field instanceof Feedback_Field ) {
 				continue;
 			}
 			if ( $field->get_meta( 'render' ) === false ) {
@@ -691,7 +691,7 @@ public function serialize() {
 
 		$fields_to_serialize['fields'] = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Response_Field ) {
+			if ( ! $field instanceof Feedback_Field ) {
 				continue;
 			}
 			$fields_to_serialize['fields'][] = $field->serialize();
@@ -726,7 +726,7 @@ private function parse_content( $post_content = '', $version = null ) {
 			}
 			$fields = array();
 			foreach ( $decoded_content['fields'] as $field ) {
-				$fields[ $field['key'] ] = Response_Field::from_serialized( $field );
+				$fields[ $field['key'] ] = Feedback_Field::from_serialized( $field );
 				if ( ! $this->has_file && $fields[ $field['key'] ]->has_file() ) {
 					$this->has_file = true;
 				}
@@ -808,7 +808,7 @@ private function parse_content( $post_content = '', $version = null ) {
 				if ( isset( $var_map[ $key ] ) ) {
 					$map_to_field                     = $var_map[ $key ];
 					$value                            = self::strip_tags( trim( $value ) );
-					$decoded_fields['fields'][ $key ] = new Response_Field( $key, $map_to_field['label'], $value, $map_to_field['type'], array( 'render' => false ) );
+					$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $map_to_field['label'], $value, $map_to_field['type'], array( 'render' => false ) );
 				}
 			}
 		}
@@ -833,14 +833,14 @@ private function parse_content( $post_content = '', $version = null ) {
 				// Skip fields that are not user-submitted.
 				continue;
 			}
-			$decoded_fields['fields'][ $key ] = new Response_Field( $key, $label, $value );
+			$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $label, $value );
 
 			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->has_file() ) {
 				$this->has_file = true;
 			}
 		}
 
-		$decoded_fields['fields']['comment_content'] = new Response_Field(
+		$decoded_fields['fields']['comment_content'] = new Feedback_Field(
 			'comment_content',
 			'Comment Content',
 			trim( self::strip_tags( $comment_content ) ),
@@ -899,7 +899,7 @@ public static function strip_tags( $data_with_tags ) {
 	 * Get all the fields of the response, computed from the post data.
 	 *
 	 * @param array $post_data The post data from the form submission.
-	 * @return array An array of Response_Field objects.
+	 * @return array An array of Feedback_Field objects.
 	 */
 	private function get_computed_fields( $post_data ) {
 
@@ -919,7 +919,7 @@ private function get_computed_fields( $post_data ) {
 			$label = wp_strip_all_tags( $field->get_attribute( 'label' ) );
 			$key   = $i . '_' . $label;
 
-			$fields[ $key ] = new Response_Field( $key, $label, $value, $type );
+			$fields[ $key ] = new Feedback_Field( $key, $label, $value, $type );
 			if ( ! $this->has_file && $fields[ $key ]->has_file() ) {
 				$this->has_file = true;
 			}
diff --git a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
similarity index 66%
rename from projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
rename to projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 7ad595a8f169e..0d915ecd89c2d 100644
--- a/projects/packages/forms/tests/php/contact-form/Response_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -13,20 +13,22 @@
 use WorDBless\BaseTestCase;
 
 /**
- * Test class for Response_Field
+ * Test class for Feedback_Field
  *
- * @covers \Automattic\Jetpack\Forms\ContactForm\Response_Field
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback_Field
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback
  * @covers \Automattic\Jetpack\Forms\ContactForm\Form_Response
  */
-#[CoversClass( Response_Field::class )]
+#[CoversClass( Feedback_Field::class )]
 #[CoversClass( Form_Response::class )]
-class Response_Field_Test extends BaseTestCase {
+#[CoversClass( Feedback::class )]
+class Feedback_Field_Test extends BaseTestCase {
 	/**
-	 * Test that the Response_Field class can be instantiated.
+	 * Test that the Feedback_Field class can be instantiated.
 	 */
-	public function test_response_field_can_be_instantiated() {
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
-		$this->assertInstanceOf( Response_Field::class, $field );
+	public function test_Feedback_Field_can_be_instantiated() {
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
+		$this->assertInstanceOf( Feedback_Field::class, $field );
 
 		$this->assertEquals( 'test_key', $field->get_key() );
 		$this->assertEquals( 'test_label', $field->get_label() );
@@ -36,10 +38,10 @@ public function test_response_field_can_be_instantiated() {
 	}
 
 	/**
-	 * Test that the Response_Field class can be instantiated with additional parameters.
+	 * Test that the Feedback_Field class can be instantiated with additional parameters.
 	 */
-	public function test_response_field_with_additional_parameters() {
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
+	public function test_Feedback_Field_with_additional_parameters() {
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
 		$this->assertEquals( 'test_key', $field->get_key() );
 		$this->assertEquals( 'test_label', $field->get_label() );
 		$this->assertEquals( 'test_value', $field->get_value() );
@@ -50,10 +52,10 @@ public function test_response_field_with_additional_parameters() {
 	}
 
 	/**
-	 * Test that the Response_Field class can handle empty values.
+	 * Test that the Feedback_Field class can handle empty values.
 	 */
-	public function test_response_field_with_empty_values() {
-		$field = new Response_Field( 'test_key', '', '' );
+	public function test_Feedback_Field_with_empty_values() {
+		$field = new Feedback_Field( 'test_key', '', '' );
 		$this->assertEquals( 'test_key', $field->get_key() );
 		$this->assertSame( '', $field->get_label() );
 		$this->assertSame( '', $field->get_value() );
@@ -62,14 +64,14 @@ public function test_response_field_with_empty_values() {
 	}
 
 	/**
-	 * Test that the Response_Field can serealize and unserialize correctly.
+	 * Test that the Feedback_Field can serealize and unserialize correctly.
 	 */
-	public function test_response_field_serialization() {
-		$field        = new Response_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
+	public function test_Feedback_Field_serialization() {
+		$field        = new Feedback_Field( 'test_key', 'test_label', 'test_value', 'text', array( 'meta_key' => 'meta_value' ) );
 		$serialized   = $field->serialize();
-		$unserialized = Response_Field::from_serialized( $serialized );
+		$unserialized = Feedback_Field::from_serialized( $serialized );
 
-		$this->assertInstanceOf( Response_Field::class, $unserialized );
+		$this->assertInstanceOf( Feedback_Field::class, $unserialized );
 
 		$this->assertEquals( $serialized, $unserialized->serialize() );
 		$this->assertEquals( 'test_key', $unserialized->get_key() );
@@ -80,27 +82,27 @@ public function test_response_field_serialization() {
 	}
 
 	/**
-	 * Test that the Response_Field can serealize and unserialize correctly.
+	 * Test that the Feedback_Field can serealize and unserialize correctly.
 	 */
 	public function test_response_from_serialized_is_null() {
 
-		$unserialized = Response_Field::from_serialized( array( 'key' => 'test_key' ) );
+		$unserialized = Feedback_Field::from_serialized( array( 'key' => 'test_key' ) );
 
 		$this->assertNull( $unserialized );
 
-		$unserialized = Response_Field::from_serialized( 'howdy' );
+		$unserialized = Feedback_Field::from_serialized( 'howdy' );
 
 		$this->assertNull( $unserialized );
 
-		$unserialized = Response_Field::from_serialized( array( 'value' => 'test_value' ) );
+		$unserialized = Feedback_Field::from_serialized( array( 'value' => 'test_value' ) );
 
 		$this->assertNull( $unserialized );
 
-		$unserialized = Response_Field::from_serialized( array( 'label' => 'test_value' ) );
+		$unserialized = Feedback_Field::from_serialized( array( 'label' => 'test_value' ) );
 
 		$this->assertNull( $unserialized );
 
-		$unserialized = Response_Field::from_serialized(
+		$unserialized = Feedback_Field::from_serialized(
 			array(
 				'label' => 'test_value',
 				'value' => 'value',
@@ -111,32 +113,32 @@ public function test_response_from_serialized_is_null() {
 	}
 
 	public function test_get_render_value() {
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertEquals( 'test_value', $field->get_render_value() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
 		$this->assertEquals( 'value1, value2', $field->get_render_value() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
 		$this->assertSame( '', $field->get_render_value() );
 	}
 
 	public function test_is_file_field() {
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
 		$this->assertTrue( $field->is_file_field() );
 
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertFalse( $field->is_file_field() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ) );
 		$this->assertTrue( $field->is_file_field() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ), 'file' );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ), 'file' );
 		$this->assertTrue( $field->is_file_field() );
 	}
 
 	public function test_has_file() {
-		$field = new Response_Field(
+		$field = new Feedback_Field(
 			'test_key',
 			'test_label',
 			array(
@@ -151,24 +153,24 @@ public function test_has_file() {
 		);
 		$this->assertTrue( $field->has_file() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
 		$this->assertTrue( $field->has_file() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ) );
 		$this->assertFalse( $field->has_file() );
 
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertFalse( $field->has_file(), 'basic field should not be a file field' );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
 		$this->assertFalse( $field->has_file(), 'empty file field should not be non-empty' );
 	}
 
 	public function test_get_render_api_value() {
-		$field = new Response_Field( 'test_key', 'test_label', 'test_value' );
+		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertEquals( 'test_value', $field->get_render_api_value() );
 
-		$field = new Response_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
 		$this->assertEquals( 'value1, value2', $field->get_render_api_value() );
 
 		$expected = array(
@@ -182,7 +184,7 @@ public function test_get_render_api_value() {
 				),
 			),
 		);
-		$field    = new Response_Field(
+		$field    = new Feedback_Field(
 			'test_key',
 			'test_label',
 			array(
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 3803c164414d7..ebaf0303ab3eb 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -53,7 +53,7 @@ public function test_from_submission_sets_fields_and_post_data() {
 		$this->assertInstanceOf( Feedback::class, $response );
 	}
 
-	public function test_Feedback_is_matches_empty_data() {
+	public function test_feedback_is_matches_empty_data() {
 		$form             = new Contact_Form( array() );
 		$_post_data       = array();
 		$response         = Feedback::from_submission( $_post_data, $form );
@@ -65,7 +65,7 @@ public function test_Feedback_is_matches_empty_data() {
 		$this->assertEquals( $response->get_fields(), $saved_response->get_fields(), 'Fields data does not match' );
 	}
 
-	public function test_Feedback_is_matches_submission_data() {
+	public function test_feedback_is_matches_submission_data() {
 		$name    = 'John Doe';
 		$email   = 'john@example.com';
 		$message = 'Test message';
@@ -98,11 +98,11 @@ public function test_Feedback_is_matches_submission_data() {
 		$this->assertEquals( $response->get_fields(), $saved_response->get_fields() );
 
 		foreach ( $response->get_fields() as $field ) {
-			$this->assertInstanceOf( Response_Field::class, $field );
+			$this->assertInstanceOf( Feedback_Field::class, $field );
 		}
 
 		foreach ( $saved_response->get_fields() as $field ) {
-			$this->assertInstanceOf( Response_Field::class, $field );
+			$this->assertInstanceOf( Feedback_Field::class, $field );
 		}
 
 		foreach ( $saved_response->get_fields() as $field_key => $field ) {
@@ -145,7 +145,7 @@ public function test_handle_previously_saved_response() {
 
 		$field = $response->get_fields()['1_field'];
 
-		$this->assertInstanceOf( Response_Field::class, $field );
+		$this->assertInstanceOf( Feedback_Field::class, $field );
 		$this->assertEquals( '1_field', $field->get_key() );
 		$this->assertEquals( 'field', $field->get_label() );
 		$this->assertEquals( 'value1', $field->render_value() );
@@ -156,7 +156,7 @@ public function test_handle_previously_saved_response() {
 	 *
 	 * It should be non empty and match the post slug.
 	 */
-	public function test_Feedback_computed_feedback_id() {
+	public function test_feedback_computed_feedback_id() {
 		$name    = 'John Doe';
 		$email   = 'john@example.com';
 		$message = 'Test message';

From b72b37462429209a76acb7aee250d235c1307724 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:06:37 -0700
Subject: [PATCH 13/48] Implement CSV Export

---
 .../class-contact-form-plugin.php             | 166 ++----
 .../src/contact-form/class-feedback-field.php |   2 +-
 .../forms/src/contact-form/class-feedback.php |  54 +-
 .../php/contact-form/Contact_Form_Test.php    | 539 ++----------------
 4 files changed, 119 insertions(+), 642 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index 11ad30751d100..b553a13ca7cf8 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -2214,141 +2214,65 @@ public function personal_data_search_filter( $search ) {
 	}
 
 	/**
-	 * Prepares feedback post data for CSV export.
+	 * Returns an array of feedback data for export.
 	 *
-	 * @param array $post_ids Post IDs to fetch the data for. These need to be Feedback posts.
+	 * @param array $feedback_ids Array of feedback IDs to fetch the data for.
 	 *
 	 * @return array
 	 */
-	public function get_export_data_for_posts( $post_ids ) {
-
-		$posts_data  = array();
-		$field_names = array();
-		$result      = array();
-
-		/**
-		 * Fetch posts and get the possible field names for later use
-		 */
-		foreach ( $post_ids as $post_id ) {
-
-			/**
-			 * Fetch post main data, because we need the subject and author data for the feedback form.
-			 */
-			$post_real_data = $this->get_parsed_field_contents_of_post( $post_id );
-
-			/**
-			 * Whether the feedback post has JSON data or not.
-			 * This is used as optional parameter on legacy functions.
-			 */
-			$post_has_json_data = $this->has_json_data( $post_id );
-
-			/**
-			 * If `$post_real_data` is not an array or there is no `_feedback_subject` set,
-			 * then something must be wrong with the feedback post. Skip it.
-			 */
-			if ( ! is_array( $post_real_data ) || ! isset( $post_real_data['_feedback_subject'] ) ) {
-				continue;
-			}
+	public static function get_export_feedback_data( $feedback_ids ) {
+		$feedback_data = array();
+		$field_names   = array();
+		$results       = array();
 
-			/**
-			 * Fetch main post comment. This is from the default textarea fields.
-			 * If it is non-empty, then we add it to data, otherwise skip it.
-			 */
-			$post_comment_content = $this->get_post_content_for_csv_export( $post_id );
-			if ( ! empty( $post_comment_content ) ) {
-				$post_real_data['_feedback_main_comment'] = $post_comment_content;
-			}
-
-			/**
-			 * Map parsed fields to proper field names
-			 */
-			$mapped_fields = $this->map_parsed_field_contents_of_post_to_field_names( $post_real_data, ! $post_has_json_data );
-
-			/**
-			 * Fetch post meta data.
-			 */
-			$post_meta_data = $this->get_post_meta_for_csv_export( $post_id, $post_has_json_data );
-
-			/**
-			 * If `$post_meta_data` is not an array or if it is empty, then there is no
-			 * extra feedback to work with. Create an empty array.
-			 */
-			if ( ! is_array( $post_meta_data ) || empty( $post_meta_data ) ) {
-				$post_meta_data = array();
-			}
-
-			/**
-			 * Prepend the feedback subject to the list of fields.
-			 */
-			$post_meta_data = array_merge(
-				$mapped_fields,
-				$post_meta_data
-			);
-
-			/**
-			 * Save post metadata for later usage.
-			 */
-			$posts_data[ $post_id ] = $post_meta_data;
-
-			/**
-			 * Save field names, so we can use them as header fields later in the CSV.
-			 */
-			$field_names = array_merge( $field_names, array_keys( $post_meta_data ) );
+		foreach ( $feedback_ids as $feedback_id ) {
+			$feedback_data[ $feedback_id ] = Feedback::get( $feedback_id );
+			$field_names                   = array_merge( $field_names, $feedback_data[ $feedback_id ]->get_csv_field_names() );
 		}
 
 		/**
 		 * Make sure the field names are unique, because we don't want duplicate data.
 		 */
 		$field_names = array_unique( $field_names );
+		foreach ( $feedback_data as $feedback_id => $feedback ) {
 
-		/**
-		 * Sort the field names by the field id number
-		 */
-		sort( $field_names, SORT_NUMERIC );
-
-		$well_known_column_names = $this->get_well_known_column_names();
-		$result                  = array();
-
-		/**
-		 * Loop through every post, which is essentially CSV row.
-		 */
-		foreach ( $posts_data as $post_id => $single_post_data ) {
+			if ( ! $feedback instanceof Feedback ) {
+				continue; // Skip if the feedback is not an instance of Feedback.
+			}
+			$results[ __( 'ID', 'jetpack-forms' ) ][]     = $feedback_id;
+			$results[ __( 'Date', 'jetpack-forms' ) ][]   = $feedback->get_time();
+			$results[ __( 'Title', 'jetpack-forms' ) ][]  = $feedback->get_entry_title();
+			$results[ __( 'Source', 'jetpack-forms' ) ][] = $feedback->get_entry_short_permalink();
 			/**
 			 * Go through all the possible fields and check if the field is available
-			 * in the current post.
+			 * in the current feedback.
 			 *
 			 * If it is - add the data as a value.
 			 * If it is not - add an empty string, which is just a placeholder in the CSV.
 			 */
 			foreach ( $field_names as $single_field_name ) {
-				$renamed_field = isset( $well_known_column_names[ $single_field_name ] )
-					? $well_known_column_names[ $single_field_name ]
-					: $single_field_name;
-
-				/**
-				 * Remove the numeral prefix -3_, 1_, 2_, etc, only for export results.
-				 * Prefixes can be both positive and negative numeral values, functional to the SORT_NUMERIC above.
-				 * TODO: to return fieldnames based on field label, we need to work both field names and post data:
-				 * unique -> sort -> unique/rename
-				 * $renamed_field = preg_replace( '/^(-?\d{1,2}_)/', '', $renamed_field );
-				 */
-
-				if ( ! isset( $result[ $renamed_field ] ) ) {
-					$result[ $renamed_field ] = array();
-				}
-
-				if (
-					isset( $single_post_data[ $single_field_name ] )
-					&& ! empty( $single_post_data[ $single_field_name ] )
-				) {
-					$result[ $renamed_field ][] = trim( $single_post_data[ $single_field_name ] );
-				} else {
-					$result[ $renamed_field ][] = '';
+				if ( ! isset( $results[ $single_field_name ] ) ) {
+					$results[ $single_field_name ] = array();
 				}
+				$results[ $single_field_name ][] = $feedback->get_field_value_by_label( $single_field_name );
 			}
+
+			$results[ __( 'Consent', 'jetpack-forms' ) ][]    = $feedback->has_consent() ? __( 'Yes', 'jetpack-forms' ) : __( 'No', 'jetpack-forms' );
+			$results[ __( 'IP Address', 'jetpack-forms' ) ][] = $feedback->get_ip_address();
+
 		}
+		return $results;
+	}
 
-		return $result;
+	/**
+	 * Prepares feedback post data for CSV export.
+	 *
+	 * @param array $post_ids Post IDs to fetch the data for. These need to be Feedback posts.
+	 *
+	 * @return array
+	 */
+	public function get_export_data_for_posts( $post_ids ) {
+		return self::get_export_feedback_data( $post_ids );
 	}
 
 	/**
@@ -2440,23 +2364,7 @@ function ( $selected ) {
 
 		$feedbacks = get_posts( $args );
 
-		if ( empty( $feedbacks ) ) {
-			return;
-		}
-
-		/**
-		 * Prepare data for export.
-		 */
-		$data = $this->get_export_data_for_posts( $feedbacks );
-
-		/**
-		 * If `$data` is empty, there's nothing we can do below.
-		 */
-		if ( ! is_array( $data ) || empty( $data ) ) {
-			return;
-		}
-
-		return $data;
+		return self::get_export_feedback_data( $feedbacks );
 	}
 
 	/**
diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 5c4d8cce1cdfc..bd3150fc55e10 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -60,7 +60,7 @@ class Feedback_Field {
 	 */
 	public function __construct( $key, $label, $value, $type = 'basic', $meta = array() ) {
 		$this->key   = $key;
-		$this->label = $label;
+		$this->label = mb_convert_encoding( $label, 'UTF-8', 'HTML-ENTITIES' );
 		$this->value = $value;
 		$this->type  = $type;
 		$this->meta  = $meta;
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 3ca2cef2a4148..b8d3fd86766b4 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -287,6 +287,23 @@ private function get_field_value( $key, $post_data ) {
 		}
 		return '';
 	}
+
+	/**
+	 * Get the computed fields from the post data.
+	 *
+	 * @param string $label The label of the field to look for.
+	 *
+	 * @return string The Value of the field.
+	 */
+	public function get_field_value_by_label( $label ) {
+		// This method is used to get the value of a field by its label.
+		foreach ( $this->fields as $field ) {
+			if ( $field->get_label() === $label ) {
+				return $field->get_render_value();
+			}
+		}
+		return '';
+	}
 	/**
 	 * Get the value of the field based on the first type found.
 	 *
@@ -332,9 +349,6 @@ public function get_fields() {
 	private function get_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Feedback_Field ) {
-				continue;
-			}
 			if ( $field->get_meta( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
@@ -343,6 +357,22 @@ private function get_all_values() {
 		return $values;
 	}
 
+	/**
+	 * Get the field name for the CSV export.
+	 *
+	 * @return array An array of field names.
+	 */
+	public function get_csv_field_names() {
+		$values = array();
+		foreach ( $this->fields as $field ) {
+			if ( $field->get_meta( 'render' ) === false ) {
+				continue; // Skip fields that are not meant to be rendered.
+			}
+			$values[] = $field->get_label();
+		}
+		return $values;
+	}
+
 	/**
 	 * Get the values related to where the form was submitted from.
 	 *
@@ -395,9 +425,6 @@ public function get_api_fields_values() {
 	public function get_compiled_fields() {
 		$compiled_fields = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Feedback_Field ) {
-				continue;
-			}
 			if ( $field->get_meta( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
@@ -415,9 +442,6 @@ public function get_compiled_fields() {
 	private function get_api_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Feedback_Field ) {
-				continue;
-			}
 			if ( $field->get_meta( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
@@ -652,6 +676,18 @@ public function get_entry_title() {
 	public function get_entry_permalink() {
 		return $this->entry_permalink;
 	}
+	/**
+	 * Get the short permalink of a post.
+	 *
+	 * @return string
+	 */
+	public function get_entry_short_permalink() {
+		// This is a convenience method to get the short permalink of the entry.
+		if ( ! empty( $this->entry_permalink ) ) {
+			return wp_make_link_relative( $this->entry_permalink );
+		}
+		return '';
+	}
 	/**
 	 * Save the feedback entry to the database.
 	 *
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index 58c03b2566cb8..588838490be25 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -15,7 +15,6 @@
 use PHPUnit\Framework\Attributes\Before;
 use PHPUnit\Framework\Attributes\BeforeClass;
 use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\Group;
 use WorDBless\BaseTestCase;
 use WorDBless\Posts;
 use WP_Block;
@@ -1791,508 +1790,6 @@ public function test_parse_contact_field_trims_content() {
 		$this->assertEquals( '[contact-field id="1" required]adsasd[/contact-field]', $html );
 	}
 
-	/**
-	 * Test get_export_data_for_posts with fully vaid data input.
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_get_export_data_for_posts_fully_valid_data() {
-		/**
-		 * Contact_Form_Plugin mock object.
-		 *
-		 * @var Contact_Form_Plugin $mock
-		 */
-		$mock = $this->getMockBuilder( Contact_Form_Plugin::class )
-			->onlyMethods(
-				array(
-					'get_post_meta_for_csv_export',
-					'get_parsed_field_contents_of_post',
-					'get_post_content_for_csv_export',
-					'map_parsed_field_contents_of_post_to_field_names',
-					'has_json_data',
-				)
-			)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$get_post_meta_for_csv_export_map = array(
-			array(
-				15,
-				false,
-				array(
-					'key1' => 'value1',
-					'key2' => 'value2',
-					'key3' => 'value3',
-					'key4' => 'value4',
-
-				),
-			),
-			array(
-				16,
-				false,
-				array(
-					'key3' => 'value3',
-					'key4' => 'value4',
-					'key5' => 'value5',
-					'key6' => 'value6',
-				),
-			),
-		);
-
-		$get_parsed_field_contents_of_post_map = array(
-			array( 15, array( '_feedback_subject' => 'subj1' ) ),
-			array( 16, array( '_feedback_subject' => 'subj2' ) ),
-		);
-
-		$get_post_content_for_csv_export_map = array(
-			array( 15, 'This is my test 15' ),
-			array( 16, 'This is my test 16' ),
-		);
-
-		$mapped_fields_contents_map = array(
-			array(
-				array(
-					'_feedback_subject'      => 'subj1',
-					'_feedback_main_comment' => 'This is my test 15',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj1',
-					'4_Comment'    => 'This is my test 15',
-				),
-			),
-			array(
-				array(
-					'_feedback_subject'      => 'subj2',
-					'_feedback_main_comment' => 'This is my test 16',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj2',
-					'4_Comment'    => 'This is my test 16',
-				),
-			),
-		);
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_meta_for_csv_export' )
-			->willReturnMap( $get_post_meta_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_parsed_field_contents_of_post' )
-			->willReturnMap( $get_parsed_field_contents_of_post_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_content_for_csv_export' )
-			->willReturnMap( $get_post_content_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'map_parsed_field_contents_of_post_to_field_names' )
-			->willReturnMap( $mapped_fields_contents_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'has_json_data' )
-			->willReturn( false );
-
-		$result = $mock->get_export_data_for_posts( array( 15, 16 ) );
-
-		$expected_result = array(
-			'Contact Form' => array( 'subj1', 'subj2' ),
-			'key1'         => array( 'value1', '' ),
-			'key2'         => array( 'value2', '' ),
-			'key3'         => array( 'value3', 'value3' ),
-			'key4'         => array( 'value4', 'value4' ),
-			'key5'         => array( '', 'value5' ),
-			'key6'         => array( '', 'value6' ),
-			'4_Comment'    => array( 'This is my test 15', 'This is my test 16' ),
-		);
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
-	/**
-	 * Test get_export_data_for_posts with single invalid entry for post meta
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_get_export_data_for_posts_invalid_single_entry_meta() {
-		/**
-		 * Contact_Form_Plugin mock object.
-		 *
-		 * @var Contact_Form_Plugin $mock
-		 * */
-		$mock = $this->getMockBuilder( Contact_Form_Plugin::class )
-			->onlyMethods(
-				array(
-					'get_post_meta_for_csv_export',
-					'get_parsed_field_contents_of_post',
-					'get_post_content_for_csv_export',
-					'map_parsed_field_contents_of_post_to_field_names',
-				)
-			)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$get_post_meta_for_csv_export_map = array(
-			array( 15, false, null ),
-			array(
-				16,
-				false,
-				array(
-					'key3' => 'value3',
-					'key4' => 'value4',
-					'key5' => 'value5',
-					'key6' => 'value6',
-				),
-			),
-		);
-
-		$get_parsed_field_contents_of_post_map = array(
-			array( 15, array( '_feedback_subject' => 'subj1' ) ),
-			array( 16, array( '_feedback_subject' => 'subj2' ) ),
-		);
-
-		$get_post_content_for_csv_export_map = array(
-			array( 15, 'This is my test 15' ),
-			array( 16, 'This is my test 16' ),
-		);
-
-		$mapped_fields_contents_map = array(
-			array(
-				array(
-					'_feedback_subject'      => 'subj1',
-					'_feedback_main_comment' => 'This is my test 15',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj1',
-					'Comment'      => 'This is my test 15',
-				),
-			),
-			array(
-				array(
-					'_feedback_subject'      => 'subj2',
-					'_feedback_main_comment' => 'This is my test 16',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj2',
-					'Comment'      => 'This is my test 16',
-				),
-			),
-		);
-
-		// Even though there is no post meta for the first, we don't stop the cycle
-		// and each mock expects two calls.
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_meta_for_csv_export' )
-			->willReturnMap( $get_post_meta_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_parsed_field_contents_of_post' )
-			->willReturnMap( $get_parsed_field_contents_of_post_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_content_for_csv_export' )
-			->willReturnMap( $get_post_content_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'map_parsed_field_contents_of_post_to_field_names' )
-			->willReturnMap( $mapped_fields_contents_map );
-
-		$result = $mock->get_export_data_for_posts( array( 15, 16 ) );
-
-		$expected_result = array(
-			'Contact Form' => array( 'subj1', 'subj2' ),
-			'key3'         => array( '', 'value3' ),
-			'key4'         => array( '', 'value4' ),
-			'key5'         => array( '', 'value5' ),
-			'key6'         => array( '', 'value6' ),
-			'Comment'      => array( 'This is my test 15', 'This is my test 16' ),
-		);
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
-	/**
-	 * Test get_export_data_for_posts with invalid all entries for post meta
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_get_export_data_for_posts_invalid_all_entries_meta() {
-		/**
-		 * Contact_Form_Plugin mock object.
-		 *
-		 * @var Contact_Form_Plugin $mock
-		 */
-		$mock = $this->getMockBuilder( Contact_Form_Plugin::class )
-			->onlyMethods(
-				array(
-					'get_post_meta_for_csv_export',
-					'get_parsed_field_contents_of_post',
-					'get_post_content_for_csv_export',
-					'map_parsed_field_contents_of_post_to_field_names',
-				)
-			)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$get_post_meta_for_csv_export_map = array(
-			array( 15, false, null ),
-			array( 16, false, null ),
-		);
-
-		$get_parsed_field_contents_of_post_map = array(
-			array( 15, array( '_feedback_subject' => 'subj1' ) ),
-			array( 16, array( '_feedback_subject' => 'subj2' ) ),
-		);
-
-		$get_post_content_for_csv_export_map = array(
-			array( 15, 'This is my test 15' ),
-			array( 16, 'This is my test 16' ),
-		);
-
-		$mapped_fields_contents_map = array(
-			array(
-				array(
-					'_feedback_subject'      => 'subj1',
-					'_feedback_main_comment' => 'This is my test 15',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj1',
-					'Comment'      => 'This is my test 15',
-				),
-			),
-			array(
-				array(
-					'_feedback_subject'      => 'subj2',
-					'_feedback_main_comment' => 'This is my test 16',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj2',
-					'Comment'      => 'This is my test 16',
-				),
-			),
-		);
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_meta_for_csv_export' )
-			->willReturnMap( $get_post_meta_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_parsed_field_contents_of_post' )
-			->willReturnMap( $get_parsed_field_contents_of_post_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_post_content_for_csv_export' )
-			->willReturnMap( $get_post_content_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'map_parsed_field_contents_of_post_to_field_names' )
-			->willReturnMap( $mapped_fields_contents_map );
-
-		$result = $mock->get_export_data_for_posts( array( 15, 16 ) );
-
-		$expected_result = array(
-			'Contact Form' => array( 'subj1', 'subj2' ),
-			'Comment'      => array( 'This is my test 15', 'This is my test 16' ),
-		);
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
-	/**
-	 * Test get_export_data_for_posts with single invalid entry for parsed fields.
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_get_export_data_for_posts_single_invalid_entry_for_parse_fields() {
-		/**
-		 * Contact_Form_Plugin mock object.
-		 *
-		 * @var Contact_Form_Plugin $mock
-		 * */
-		$mock = $this->getMockBuilder( Contact_Form_Plugin::class )
-			->onlyMethods(
-				array(
-					'get_post_meta_for_csv_export',
-					'get_parsed_field_contents_of_post',
-					'get_post_content_for_csv_export',
-					'map_parsed_field_contents_of_post_to_field_names',
-				)
-			)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$get_post_meta_for_csv_export_map = array(
-			array(
-				15,
-				false,
-				array(
-					'key1' => 'value1',
-					'key2' => 'value2',
-					'key3' => 'value3',
-					'key4' => 'value4',
-
-				),
-			),
-			array(
-				16,
-				false,
-				array(
-					'key3' => 'value3',
-					'key4' => 'value4',
-					'key5' => 'value5',
-					'key6' => 'value6',
-				),
-			),
-		);
-
-		$get_parsed_field_contents_of_post_map = array(
-			array( 15, array() ),
-			array( 16, array( '_feedback_subject' => 'subj2' ) ),
-		);
-
-		$get_post_content_for_csv_export_map = array(
-			array( 15, 'This is my test 15' ),
-			array( 16, 'This is my test 16' ),
-		);
-
-		$mapped_fields_contents_map = array(
-			array(
-				array(
-					'_feedback_subject'      => 'subj1',
-					'_feedback_main_comment' => 'This is my test 15',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj1',
-					'Comment'      => 'This is my test 15',
-				),
-			),
-			array(
-				array(
-					'_feedback_subject'      => 'subj2',
-					'_feedback_main_comment' => 'This is my test 16',
-				),
-				true,
-				array(
-					'Contact Form' => 'subj2',
-					'Comment'      => 'This is my test 16',
-				),
-			),
-		);
-
-		$mock->expects( $this->once() )
-			->method( 'get_post_meta_for_csv_export' )
-			->willReturnMap( $get_post_meta_for_csv_export_map );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_parsed_field_contents_of_post' )
-			->willReturnMap( $get_parsed_field_contents_of_post_map );
-
-		$mock->expects( $this->once() )
-			->method( 'get_post_content_for_csv_export' )
-			->willReturnMap( $get_post_content_for_csv_export_map );
-
-		$mock->expects( $this->once() )
-			->method( 'map_parsed_field_contents_of_post_to_field_names' )
-			->willReturnMap( $mapped_fields_contents_map );
-
-		$result = $mock->get_export_data_for_posts( array( 15, 16 ) );
-
-		$expected_result = array(
-			'Contact Form' => array( 'subj2' ),
-			'key3'         => array( 'value3' ),
-			'key4'         => array( 'value4' ),
-			'key5'         => array( 'value5' ),
-			'key6'         => array( 'value6' ),
-			'Comment'      => array( 'This is my test 16' ),
-		);
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
-	/**
-	 * Test get_export_data_for_posts with all entries for parsed fields invalid.
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_get_export_data_for_posts_all_entries_for_parse_fields_invalid() {
-		/**
-		 * Contact_Form_Plugin mock object.
-		 *
-		 * @var Contact_Form_Plugin $mock
-		 */
-		$mock = $this->getMockBuilder( Contact_Form_Plugin::class )
-			->onlyMethods(
-				array(
-					'get_post_meta_for_csv_export',
-					'get_parsed_field_contents_of_post',
-					'get_post_content_for_csv_export',
-					'map_parsed_field_contents_of_post_to_field_names',
-				)
-			)
-			->disableOriginalConstructor()
-			->getMock();
-
-		$get_parsed_field_contents_of_post_map = array(
-			array( 15, array() ),
-			array( 16, array() ),
-		);
-
-		$mock->expects( $this->never() )
-			->method( 'get_post_meta_for_csv_export' );
-
-		$mock->expects( $this->exactly( 2 ) )
-			->method( 'get_parsed_field_contents_of_post' )
-			->willReturnMap( $get_parsed_field_contents_of_post_map );
-
-		$result = $mock->get_export_data_for_posts( array( 15, 16 ) );
-
-		$expected_result = array();
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
-	/**
-	 * Test map_parsed_field_contents_of_post_to_field_names
-	 *
-	 * @group csvexport
-	 */
-	#[Group( 'csvexport' )]
-	public function test_map_parsed_field_contents_of_post_to_field_names() {
-
-		$input_data = array(
-			'test_field'             => 'moonstruck',
-			'_feedback_subject'      => 'This is my form',
-			'_feedback_author_email' => '',
-			'_feedback_author'       => 'John Smith',
-			'_feedback_author_url'   => 'http://example.com',
-			'_feedback_main_comment' => 'This is my comment!',
-			'another_field'          => 'thunderstruck',
-		);
-
-		$plugin = Contact_Form_Plugin::init();
-
-		$result = $plugin->map_parsed_field_contents_of_post_to_field_names( $input_data );
-
-		$expected_result = array(
-			'1_Name'    => 'John Smith',
-			'3_Website' => 'http://example.com',
-			'4_Comment' => 'This is my comment!',
-		);
-
-		$this->assertEquals( $expected_result, $result );
-	}
-
 	/**
 	 * Tests the functionality of 'Contact_Form_Plugin::personal_data_exporter'.
 	 *
@@ -2360,6 +1857,42 @@ function ( $id ) {
 		}
 	}
 
+	public function test_export_legacy_data() {
+		global $post;
+		$post_ids        = array();
+		$post_ids[]      = Utility::create_legacy_feedback(
+			array(
+				'1_field_A' => 'value1',
+				'2_field_B' => 'value2',
+			)
+		);
+		$post_ids[]      = Utility::create_legacy_feedback(
+			array(
+				'1_field_A' => 'value1',
+				'2_field_C' => 'value2',
+			)
+		);
+		$current_time    = current_time( 'mysql' );
+		$default_consent = 'No';
+		$ip              = 'https://127.0.0.1';
+
+		$this->assertEquals(
+			array(
+				'ID'         => array( $post_ids[0], $post_ids[1] ),
+				'Date'       => array( $current_time, $current_time ),
+				'Title'      => array( $post->post_title, $post->post_title ),
+				'field_A'    => array( 'value1', 'value1' ),
+				'field_B'    => array( 'value2', '' ),
+				'field_C'    => array( '', 'value2' ),
+				'Source'     => array( '/?p=' . $post->ID, '/?p=' . $post->ID ),
+				'Consent'    => array( $default_consent, $default_consent ),
+				'IP Address' => array( $ip, $ip ),
+
+			),
+			Contact_Form_Plugin::get_export_feedback_data( $post_ids )
+		);
+	}
+
 	/**
 	 * Tests the functionality of 'Contact_Form_Plugin::personal_data_eraser'.
 	 *

From ac6da7680c6acd18e2ceb905f4798f1e870cd790 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:10:45 -0700
Subject: [PATCH 14/48] minor update test method name

---
 .../packages/forms/tests/php/contact-form/Contact_Form_Test.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index 588838490be25..b1ba79333eaea 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -1857,7 +1857,7 @@ function ( $id ) {
 		}
 	}
 
-	public function test_export_legacy_data() {
+	public function test_export_csv_legacy_data() {
 		global $post;
 		$post_ids        = array();
 		$post_ids[]      = Utility::create_legacy_feedback(

From c14389e4a4e561b7e4a55fc65c02e174bc42882d Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:39:02 -0700
Subject: [PATCH 15/48] Minor fixes

---
 .../src/contact-form/class-contact-form.php   |  2 +-
 .../src/contact-form/class-feedback-field.php | 29 +++++++++++--------
 .../forms/src/contact-form/class-feedback.php |  8 ++---
 .../php/contact-form/Feedback_Field_Test.php  |  4 +--
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index 366034f9d735a..fedf2a8ed408c 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -839,7 +839,7 @@ public static function success_message( $feedback_id, $form ) {
 			);
 			$message      = wp_kses( $raw_message, $allowed_html );
 		} else {
-			$compiled_form = self::get_compiled_form( $feedback_id, $form );
+			$compiled_form = self::get_compiled_form( $feedback_id );
 			$message       = '<p>' . implode( '</p><p>', $compiled_form ) . '</p>';
 		}
 
diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index bd3150fc55e10..35148f462ef9d 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -115,7 +115,7 @@ public function get_render_value() {
 					// this shouldn't happen, todo: log this
 					continue;
 				}
-				$file_name = isset( $file['name'] ) ? $file['name'] : __( 'Attached file', 'jetpack-forms' );
+				$file_name = $file['name'] ?? __( 'Attached file', 'jetpack-forms' );
 				$file_size = isset( $file['size'] ) ? size_format( $file['size'] ) : '';
 				$files[]   = $file_name . ' (' . $file_size . ')';
 			}
@@ -205,21 +205,26 @@ public function get_type() {
 	}
 
 	/**
-	 * Get the meta of the field.
+	 * Get the meta array of the field.
 	 *
-	 * @param string|null $meta_key The key of the meta to retrieve. If null, returns all meta.
-	 *
-	 * @return string
+	 * @return array
 	 */
-	public function get_meta( $meta_key = null ) {
+	public function get_meta() {
+		return $this->meta;
+	}
 
-		if ( $meta_key ) {
-			if ( isset( $this->meta[ $meta_key ] ) ) {
-				return $this->meta[ $meta_key ];
-			}
-			return null;
+	/**
+	 * Get a specific meta value by key.
+	 *
+	 * @param string $meta_key The key of the meta to retrieve.
+	 *
+	 * @return mixed|null Returns the value of the meta key if it exists, null otherwise.
+	 */
+	public function get_meta_key_value( $meta_key ) {
+		if ( isset( $this->meta[ $meta_key ] ) ) {
+			return $this->meta[ $meta_key ];
 		}
-		return $this->meta;
+		return null;
 	}
 
 	/**
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index b8d3fd86766b4..a8850fc22141d 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -349,7 +349,7 @@ public function get_fields() {
 	private function get_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta( 'render' ) === false ) {
+			if ( $field->get_meta_key_value( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
 			$values[ $field->get_key() ] = $field->get_render_value();
@@ -365,7 +365,7 @@ private function get_all_values() {
 	public function get_csv_field_names() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta( 'render' ) === false ) {
+			if ( $field->get_meta_key_value( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
 			$values[] = $field->get_label();
@@ -425,7 +425,7 @@ public function get_api_fields_values() {
 	public function get_compiled_fields() {
 		$compiled_fields = array();
 		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta( 'render' ) === false ) {
+			if ( $field->get_meta_key_value( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
 			$compiled_fields[ $field->get_key() ] = array(
@@ -442,7 +442,7 @@ public function get_compiled_fields() {
 	private function get_api_all_values() {
 		$values = array();
 		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta( 'render' ) === false ) {
+			if ( $field->get_meta_key_value( 'render' ) === false ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
 			$values[ $field->get_key() ] = $field->get_render_api_value();
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 0d915ecd89c2d..9c633e68c71e4 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -47,8 +47,8 @@ public function test_Feedback_Field_with_additional_parameters() {
 		$this->assertEquals( 'test_value', $field->get_value() );
 		$this->assertEquals( 'text', $field->get_type() );
 		$this->assertEquals( array( 'meta_key' => 'meta_value' ), $field->get_meta() );
-		$this->assertEquals( 'meta_value', $field->get_meta( 'meta_key' ) );
-		$this->assertNull( $field->get_meta( 'non_existant' ) );
+		$this->assertEquals( 'meta_value', $field->get_meta_key_value( 'meta_key' ) );
+		$this->assertNull( $field->get_meta_key_value( 'non_existant' ) );
 	}
 
 	/**

From ace74d4021819db53707d1a71c269766a2714a6c Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:48:47 -0700
Subject: [PATCH 16/48] Add reprecation

---
 .../forms/src/contact-form/class-contact-form-plugin.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index b553a13ca7cf8..293bec5bb58d3 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -2267,6 +2267,9 @@ public static function get_export_feedback_data( $feedback_ids ) {
 	/**
 	 * Prepares feedback post data for CSV export.
 	 *
+	 * @deprecated since $$next-version$$
+	 *
+	 * @see get_export_feedback_data()
 	 * @param array $post_ids Post IDs to fetch the data for. These need to be Feedback posts.
 	 *
 	 * @return array
@@ -2282,6 +2285,8 @@ public function get_export_data_for_posts( $post_ids ) {
 	 * - Positive values render AFTER any form field/value column: 1, 30, 93...
 	 *   Mind using high numbering on these ones as the prefix is used on regular inputs: 1_Name, 2_Email, etc
 	 *
+	 * @deprecated since $$next-version$$
+	 *
 	 * @return array
 	 */
 	public function get_well_known_column_names() {

From 2a9ff6d5a1fe3085edeafd531cbeed112db9d7d9 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:51:58 -0700
Subject: [PATCH 17/48] Update the code coverage

---
 projects/packages/forms/changelog/update-form-response-storage | 3 ++-
 .../forms/tests/php/contact-form/Feedback_Field_Test.php       | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/packages/forms/changelog/update-form-response-storage b/projects/packages/forms/changelog/update-form-response-storage
index bc56c7d94b590..20f6fcff76668 100644
--- a/projects/packages/forms/changelog/update-form-response-storage
+++ b/projects/packages/forms/changelog/update-form-response-storage
@@ -1,4 +1,5 @@
 Significance: patch
 Type: fixed
 
-Forms: Adds a new Form_Responses class that keeps consistency between DB form response and the one before we submit it
+Forms: Adds a new Feedback and Feedback_Field class that keeps consistency between DB form response and the one before we submit it.
+
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 9c633e68c71e4..8561b95d12358 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -17,10 +17,8 @@
  *
  * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback_Field
  * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback
- * @covers \Automattic\Jetpack\Forms\ContactForm\Form_Response
  */
 #[CoversClass( Feedback_Field::class )]
-#[CoversClass( Form_Response::class )]
 #[CoversClass( Feedback::class )]
 class Feedback_Field_Test extends BaseTestCase {
 	/**

From f279dbb882f846984a5e5bb6d57f009e85d5c89c Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Fri, 11 Jul 2025 15:59:25 -0700
Subject: [PATCH 18/48] minor: test fixes

---
 .../packages/forms/tests/php/contact-form/Feedback_Test.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index ebaf0303ab3eb..6d130069e9c34 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -112,6 +112,9 @@ public function test_feedback_is_matches_submission_data() {
 		$this->assertEquals( $name, $response->get_fields()['1_Name']->get_value(), 'Response field value should match' );
 		$this->assertEquals( $name, $saved_response->get_fields()['1_Name']->get_value(), 'Saved response field value should match' );
 
+		$this->assertEquals( $name, $response->get_field_value_by_label( 'Name' ), 'Response field value should match' );
+		$this->assertEquals( $name, $saved_response->get_field_value_by_label( 'Name' ), 'Saved response field value should match' );
+
 		$this->assertEquals( 'Name', $response->get_fields()['1_Name']->get_label(), 'Name response field label should match' );
 		$this->assertEquals( 'Name', $saved_response->get_fields()['1_Name']->get_label(), 'Saved response field label should match' );
 		$this->assertEquals( 'name', $response->get_fields()['1_Name']->get_type(), 'Response field type should match' );

From 9a9e2eecac4784129470e272011b4a9782e534bc Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Tue, 15 Jul 2025 17:42:55 -0700
Subject: [PATCH 19/48] Introduce Feedback_Entry class

---
 .../src/contact-form/class-feedback-entry.php | 151 +++++++++
 .../forms/src/contact-form/class-feedback.php | 118 +++----
 .../php/contact-form/Contact_Form_Test.php    |   4 +-
 .../php/contact-form/Feedback_Entry_Test.php  | 296 ++++++++++++++++++
 .../tests/php/contact-form/Feedback_Test.php  |  77 ++---
 .../tests/php/contact-form/class-utility.php  |  33 ++
 6 files changed, 539 insertions(+), 140 deletions(-)
 create mode 100644 projects/packages/forms/src/contact-form/class-feedback-entry.php
 create mode 100644 projects/packages/forms/tests/php/contact-form/Feedback_Entry_Test.php

diff --git a/projects/packages/forms/src/contact-form/class-feedback-entry.php b/projects/packages/forms/src/contact-form/class-feedback-entry.php
new file mode 100644
index 0000000000000..f97f49bb262db
--- /dev/null
+++ b/projects/packages/forms/src/contact-form/class-feedback-entry.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Feedback Entry
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+/**
+ * Class Feedback_Entry
+ *
+ * Represents where a feedback was created from, feedback entry with an ID, title, permalink, and page number.
+ */
+class Feedback_Entry {
+
+	/**
+	 * The ID of the post or page that the feedback was created on.
+	 *
+	 * @var int
+	 */
+	private $id = 0;
+
+	/**
+	 * The title of the  post or page that the feedback was created on.
+	 *
+	 * @var string
+	 */
+	private $title = '';
+
+	/**
+	 * The permalink of the feedback entry.
+	 *
+	 * @var string
+	 */
+	private $permalink = '';
+
+	/**
+	 * The page number of the feedback post or page that the feedback was created on.
+	 * This is used to determine the page number in a paginated view of page or post.
+	 *
+	 * @var int
+	 */
+	private $page_number = 1;
+
+	/**
+	 * Constructor for Feedback_Entry.
+	 *
+	 * @param int    $id          The ID of the feedback entry.
+	 * @param string $title       The title of the feedback entry.
+	 * @param int    $page_number The page number of the feedback entry, default is 1.
+	 */
+	public function __construct( $id, $title, $page_number = 1 ) {
+
+		$this->id          = $id > 0 ? (int) $id : 0;
+		$this->title       = $title;
+		$this->page_number = $page_number;
+		$this->permalink   = '';
+
+		if ( $id <= 0 ) {
+			return;
+		}
+
+		$entry_post = get_post( $id );
+
+		if ( $entry_post && $entry_post->post_status === 'publish' ) {
+			$this->permalink = get_permalink( $entry_post );
+			$this->title     = get_the_title( $entry_post );
+		}
+	}
+
+	/**
+	 * Creates a Feedback_Entry instance from a submission.
+	 *
+	 * @param \WP_Post|null $current_post The current post object.
+	 * @param int           $current_page_number The current page number, default is 1.
+	 * @return Feedback_Entry Returns an instance of Feedback_Entry.
+	 */
+	public static function from_submission( $current_post, int $current_page_number = 1 ) {
+		$id = isset( $current_post->ID ) ? (int) $current_post->ID : 0;
+
+		if ( ! $current_post instanceof \WP_Post || $id === 0 ) {
+			return new self( 0, '', $current_page_number );
+		}
+
+		$title = isset( $current_post->post_title ) ? $current_post->post_title : '';
+
+		return new self( $id, $title, $current_page_number, $current_post );
+	}
+
+	/**
+	 * Get the permalink of the feedback entry.
+	 *
+	 * @return string The permalink of the feedback entry.
+	 */
+	public function get_permalink() {
+		if ( $this->page_number > 1 && ! empty( $this->permalink ) ) {
+			return add_query_arg( 'page', $this->page_number, $this->permalink );
+		}
+		return $this->permalink;
+	}
+
+	/**
+	 * Get the relative permalink of the feedback entry.
+	 *
+	 * @return string The relative permalink of the feedback entry.
+	 */
+	public function get_relative_permalink() {
+		if ( ! empty( $this->permalink ) ) {
+			return wp_make_link_relative( $this->get_permalink() );
+		}
+		return '';
+	}
+
+	/**
+	 * Get the page number of the feedback entry.
+	 *
+	 * @return int The page number of the feedback entry.
+	 */
+	public function get_page_number() {
+		return $this->page_number;
+	}
+	/**
+	 * Get the title of the feedback entry.
+	 *
+	 * @return string The title of the feedback entry.
+	 */
+	public function get_title() {
+		return $this->title;
+	}
+	/**
+	 * Get the post id of the feedback entry.
+	 *
+	 * @return int The ID of the feedback entry.
+	 */
+	public function get_id() {
+		return $this->id;
+	}
+
+	/**
+	 * Get the page number of the enrty title.
+	 *
+	 * @return array
+	 */
+	public function serialize() {
+		return array(
+			'entry_title' => $this->title,
+			'entry_page'  => $this->page_number,
+		);
+	}
+}
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index a8850fc22141d..0ec9e4a94284d 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -151,33 +151,13 @@ class Feedback {
 	protected $has_consent = false;
 
 	/**
-	 * The entry ID of the post that the feedback was submitted from.
+	 * The entry object of the post that the feedback was submitted from.
 	 *
-	 * @var int
-	 */
-	protected $entry_id = 0;
-
-	/**
-	 * The entry title of the post that the feedback was submitted from.
-	 *
-	 * @var string
-	 */
-	protected $entry_title = '';
-
-	/**
-	 * The permalink of the post or page that the feedback was submitted from.
-	 * This is a computed value based on the current post.
-	 *
-	 * @var string
-	 */
-	protected $entry_permalink = '';
-
-	/**
-	 * The page number associated with the feedback entry submission.
+	 * This is used to store the entry object of the post that the feedback was submitted from.
 	 *
-	 * @var int
+	 * @var Feedback_Entry
 	 */
-	protected $entry_page = 1;
+	protected $entry;
 
 	/**
 	 * Constructor.
@@ -190,6 +170,8 @@ class Feedback {
 	 */
 	public function __construct( $feedback_post = null, $form = null, $post_data = null, $current_post = null, $current_page_number = 1 ) {
 
+		$this->entry = new Feedback_Entry( 0, '' );
+
 		$this->feedback_post = $feedback_post;
 		$this->form          = $form;
 
@@ -197,11 +179,16 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 
 			$parsed_content = $this->parse_content( $this->feedback_post->post_content, $this->feedback_post->post_mime_type );
 
-			$this->status        = $this->feedback_post->post_status;
-			$this->feedback_id   = $this->feedback_post->post_name;
-			$this->entry_id      = $this->feedback_post->post_parent ? (int) $this->feedback_post->post_parent : 0;
+			$this->status      = $this->feedback_post->post_status;
+			$this->feedback_id = $this->feedback_post->post_name;
+
 			$this->feedback_time = $this->feedback_post->post_date;
-			$current_post        = $this->entry_id ? get_post( $this->entry_id ) : null;
+
+			$this->entry = new Feedback_Entry(
+				$this->feedback_post->post_parent,
+				$parsed_content['entry_title'] ?? '',
+				$parsed_content['entry_page'] ?? 1
+			);
 
 			$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
 			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
@@ -211,9 +198,8 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$this->author_url      = $this->get_first_field_of_type( 'url', 'pre_comment_author_url' );
 			$this->comment_content = $this->get_first_field_of_type( 'textarea' );
 			$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
-			$this->entry_title     = isset( $parsed_content['entry_title'] ) ? $parsed_content['entry_title'] : '';
-			$this->entry_page      = isset( $parsed_content['entry_page'] ) ? (int) $parsed_content['entry_page'] : 1;
-			$this->feedback_title  = $this->feedback_post->post_title ? $this->feedback_post->post_title : $this->get_author() . ' - ' . $this->feedback_post->post_date;
+
+			$this->feedback_title = $this->feedback_post->post_title ? $this->feedback_post->post_title : $this->get_author() . ' - ' . $this->feedback_post->post_date;
 
 		} elseif ( is_array( $post_data ) && ! empty( $post_data ) ) {
 
@@ -227,16 +213,13 @@ public function __construct( $feedback_post = null, $form = null, $post_data = n
 			$this->author_url      = $this->get_computer_author_info( $post_data, 'url', 'pre_comment_author_url' );
 			$this->comment_content = $this->get_computed_comment_content( $post_data );
 			$this->has_consent     = $this->get_computed_consent( $post_data );
-			$this->entry_id        = ! empty( $current_post ) ? (int) $current_post->ID : 0;
-			$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : '';
-			$this->entry_page      = $current_page_number;
-			$this->feedback_time   = current_time( 'mysql' );
-			$this->feedback_title  = "{$this->get_author()} - {$this->feedback_time}";
-			$this->feedback_id     = md5( $this->feedback_title );
-		}
 
-		$this->entry_title     = ! empty( $current_post ) ? get_the_title( $current_post ) : $this->entry_title;
-		$this->entry_permalink = ! empty( $current_post ) ? $this->get_computed_entry_permalink( $current_post, $this->entry_page ) : '';
+			$this->entry = Feedback_Entry::from_submission( $current_post, $current_page_number );
+
+			$this->feedback_time  = current_time( 'mysql' );
+			$this->feedback_title = "{$this->get_author()} - {$this->feedback_time}";
+			$this->feedback_id    = md5( $this->feedback_title );
+		}
 	}
 
 	/**
@@ -382,13 +365,13 @@ private function get_entry_values() {
 		// This is a convenience method to get the entry values in a simple array format.
 		$entry_values = array(
 			'email_marketing_consent' => (string) $this->has_consent,
-			'entry_title'             => $this->entry_title,
-			'entry_permalink'         => $this->entry_permalink,
+			'entry_title'             => $this->entry->get_title(),
+			'entry_permalink'         => $this->entry->get_permalink(),
 			'feedback_id'             => $this->feedback_id,
 		);
 
-		if ( $this->entry_page > 1 ) {
-			$entry_values['entry_page'] = $this->entry_page;
+		if ( $this->entry->get_page_number() > 1 ) {
+			$entry_values['entry_page'] = $this->entry->get_page_number();
 		}
 		return $entry_values;
 	}
@@ -653,7 +636,7 @@ public function set_status( $status ) {
 	 * @return int|null
 	 */
 	public function get_entry_id() {
-		return $this->entry_id;
+		return $this->entry->get_id();
 	}
 
 	/**
@@ -664,7 +647,7 @@ public function get_entry_id() {
 	 * @return string
 	 */
 	public function get_entry_title() {
-		return $this->entry_title;
+		return $this->entry->get_title();
 	}
 
 	/**
@@ -674,7 +657,7 @@ public function get_entry_title() {
 	 * @return string
 	 */
 	public function get_entry_permalink() {
-		return $this->entry_permalink;
+		return $this->entry->get_permalink();
 	}
 	/**
 	 * Get the short permalink of a post.
@@ -682,11 +665,7 @@ public function get_entry_permalink() {
 	 * @return string
 	 */
 	public function get_entry_short_permalink() {
-		// This is a convenience method to get the short permalink of the entry.
-		if ( ! empty( $this->entry_permalink ) ) {
-			return wp_make_link_relative( $this->entry_permalink );
-		}
-		return '';
+		return $this->entry->get_relative_permalink();
 	}
 	/**
 	 * Save the feedback entry to the database.
@@ -703,7 +682,7 @@ public function save() {
 				'post_name'      => $this->feedback_id,
 				'post_content'   => $this->serialize(),
 				'post_mime_type' => 'v2', // a way to help us identify what version of the data this is.
-				'post_parent'    => $this->entry_id,
+				'post_parent'    => $this->entry->get_id(),
 			)
 		);
 
@@ -718,11 +697,12 @@ public function save() {
 	 */
 	public function serialize() {
 
-		$fields_to_serialize = array(
-			'subject'     => $this->subject,
-			'entry_title' => $this->entry_title,
-			'entry_page'  => $this->entry_page,
-			'ip'          => $this->ip_address,
+		$fields_to_serialize = array_merge(
+			array(
+				'subject' => $this->subject,
+				'ip'      => $this->ip_address,
+			),
+			$this->entry->serialize()
 		);
 
 		$fields_to_serialize['fields'] = array();
@@ -1044,26 +1024,4 @@ private function get_computed_consent( $post_data ) {
 
 		return false;
 	}
-
-	/**
-	 * Gets the permalink of post parent associated with the feedback.
-	 *
-	 * So that we can link the user to the URL that the feedback was created from.
-	 *
-	 * @param WP_Post|null $current_post The current post object, if available.
-	 * @param int          $current_page_number The current page number associated with the current post.
-	 *
-	 * @return string The permalink of the post or page that the feedback was submitted from.
-	 */
-	private function get_computed_entry_permalink( $current_post = null, $current_page_number = 1 ) {
-
-		if ( $current_post instanceof WP_Post ) {
-			$permalink = get_the_permalink( $current_post );
-			if ( $current_page_number > 1 ) {
-				$permalink = add_query_arg( 'page', $current_page_number, $permalink );
-			}
-			return $permalink;
-		}
-		return '';
-	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index b1ba79333eaea..288031575aa2f 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -1859,6 +1859,7 @@ function ( $id ) {
 
 	public function test_export_csv_legacy_data() {
 		global $post;
+		$current_post    = Utility::create_post_context();
 		$post_ids        = array();
 		$post_ids[]      = Utility::create_legacy_feedback(
 			array(
@@ -1880,7 +1881,7 @@ public function test_export_csv_legacy_data() {
 			array(
 				'ID'         => array( $post_ids[0], $post_ids[1] ),
 				'Date'       => array( $current_time, $current_time ),
-				'Title'      => array( $post->post_title, $post->post_title ),
+				'Title'      => array( $current_post->post_title, $current_post->post_title ),
 				'field_A'    => array( 'value1', 'value1' ),
 				'field_B'    => array( 'value2', '' ),
 				'field_C'    => array( '', 'value2' ),
@@ -1891,6 +1892,7 @@ public function test_export_csv_legacy_data() {
 			),
 			Contact_Form_Plugin::get_export_feedback_data( $post_ids )
 		);
+		Utility::destroy_post_context();
 	}
 
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Entry_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Entry_Test.php
new file mode 100644
index 0000000000000..1c9085b19f588
--- /dev/null
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Entry_Test.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Unit Tests for Automattic\Jetpack\Forms\Contact_Form.
+ *
+ * To run the test visit the packages/forms directory and run composer test-php
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use WorDBless\BaseTestCase;
+
+/**
+ * Test class for Feedback_Entry
+ *
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback_Entry
+ */
+#[CoversClass( Feedback_Entry::class )]
+class Feedback_Entry_Test extends BaseTestCase {
+	/**
+	 * Test constructor with invalid ID (0 or negative)
+	 */
+	public function test_constructor_with_invalid_id() {
+		$entry = new Feedback_Entry( 0, 'Test Title', 2 );
+
+		$this->assertSame( 0, $entry->get_id() );
+		$this->assertEquals( 'Test Title', $entry->get_title() );
+		$this->assertEquals( 2, $entry->get_page_number() );
+		$this->assertSame( '', $entry->get_permalink() );
+	}
+
+	/**
+	 * Test constructor with negative ID
+	 */
+	public function test_constructor_with_negative_id() {
+		$entry = new Feedback_Entry( -5, 'Test Title' );
+
+		$this->assertSame( 0, $entry->get_id() );
+		$this->assertEquals( 'Test Title', $entry->get_title() );
+		$this->assertSame( 1, $entry->get_page_number() );
+		$this->assertSame( '', $entry->get_permalink() );
+	}
+
+	/**
+	 * Test constructor with valid ID but non-existent post
+	 */
+	public function test_constructor_with_nonexistent_post() {
+		$entry = new Feedback_Entry( 999999, 'Fallback Title' );
+
+		$this->assertSame( 999999, $entry->get_id() );
+		$this->assertEquals( 'Fallback Title', $entry->get_title() );
+		$this->assertSame( 1, $entry->get_page_number() );
+		$this->assertSame( '', $entry->get_permalink() );
+	}
+
+	/**
+	 * Test constructor with valid public post
+	 */
+	public function test_constructor_with_valid_public_post() {
+		// Create a public post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Public Post Title',
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry = new Feedback_Entry( $post_id, 'Fallback Title', 3 );
+
+		$this->assertEquals( $post_id, $entry->get_id() );
+		$this->assertEquals( 'Public Post Title', $entry->get_title() );
+		$this->assertEquals( 3, $entry->get_page_number() );
+		$this->assertNotEmpty( $entry->get_permalink() );
+	}
+
+	/**
+	 * Test constructor with draft post (non-public)
+	 */
+	public function test_constructor_with_draft_post() {
+		// Create a draft post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Draft Post Title',
+				'post_status' => 'draft',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry = new Feedback_Entry( $post_id, 'Fallback Title' );
+
+		$this->assertSame( $post_id, $entry->get_id() );
+		$this->assertEquals( 'Fallback Title', $entry->get_title() );
+		$this->assertSame( 1, $entry->get_page_number() );
+		$this->assertSame( '', $entry->get_permalink() );
+	}
+
+	/**
+	 * Test from_submission with post missing ID
+	 */
+	public function test_from_submission_with_missing_id() {
+		$post = new \WP_Post(
+			(object) array(
+				'post_title' => 'No ID Post',
+			)
+		);
+
+		$entry = Feedback_Entry::from_submission( $post );
+
+		$this->assertSame( 0, $entry->get_id() );
+		$this->assertSame( '', $entry->get_title() );
+		$this->assertSame( 1, $entry->get_page_number() );
+	}
+
+	/**
+	 * Test from_submission with post missing title
+	 */
+	public function test_from_submission_with_missing_title() {
+		$post = new \WP_Post(
+			(object) array(
+				'ID' => 456,
+			)
+		);
+
+		$entry = Feedback_Entry::from_submission( $post, 3 );
+
+		$this->assertEquals( 456, $entry->get_id() );
+		$this->assertSame( '', $entry->get_title() );
+		$this->assertEquals( 3, $entry->get_page_number() );
+	}
+
+	/**
+	 * Test from_submission with empty post object
+	 */
+	public function test_from_submission_with_empty_post() {
+		$post = new \WP_Post( (object) array() );
+
+		$entry = Feedback_Entry::from_submission( $post );
+
+		$this->assertSame( 0, $entry->get_id() );
+		$this->assertSame( '', $entry->get_title() );
+		$this->assertSame( 1, $entry->get_page_number() );
+	}
+
+	/**
+	 * Test get_permalink with page number 1
+	 */
+	public function test_get_permalink_with_page_one() {
+		// Create a public post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Test Post',
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry     = new Feedback_Entry( $post_id, 'Test', 1 );
+		$permalink = $entry->get_permalink();
+
+		$this->assertNotEmpty( $permalink );
+		$this->assertStringNotContainsString( 'page=', $permalink );
+	}
+
+	/**
+	 * Test get_permalink with page number greater than 1
+	 */
+	public function test_get_permalink_with_page_greater_than_one() {
+		// Create a public post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Test Post',
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry     = new Feedback_Entry( $post_id, 'Test', 3 );
+		$permalink = $entry->get_permalink();
+
+		$this->assertStringContainsString( 'page=3', $permalink );
+	}
+
+	/**
+	 * Test get_permalink with no valid post
+	 */
+	public function test_get_permalink_with_no_post() {
+		$entry = new Feedback_Entry( 0, 'Test' );
+
+		$this->assertSame( '', $entry->get_permalink() );
+	}
+
+	/**
+	 * Test get_relative_permalink with valid permalink
+	 */
+	public function test_get_relative_permalink_with_valid_permalink() {
+		// Create a public post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Test Post',
+				'post_status' => 'publish',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry              = new Feedback_Entry( $post_id, 'Test' );
+		$relative_permalink = $entry->get_relative_permalink();
+
+		$this->assertNotEmpty( $relative_permalink );
+		$this->assertStringStartsNotWith( 'http', $relative_permalink );
+	}
+
+	/**
+	 * Test get_relative_permalink with empty permalink
+	 */
+	public function test_get_relative_permalink_with_empty_permalink() {
+		$entry = new Feedback_Entry( 0, 'Test' );
+
+		$this->assertSame( '', $entry->get_relative_permalink() );
+	}
+
+	/**
+	 * Test all getter methods
+	 */
+	public function test_getter_methods() {
+		$entry = new Feedback_Entry( 0, 'Test Title', 5 );
+
+		$this->assertSame( 0, $entry->get_id() );
+		$this->assertEquals( 'Test Title', $entry->get_title() );
+		$this->assertEquals( 5, $entry->get_page_number() );
+	}
+
+	/**
+	 * Test serialize method
+	 */
+	public function test_serialize() {
+		$entry      = new Feedback_Entry( 0, 'Serialized Title', 2 );
+		$serialized = $entry->serialize();
+
+		$expected = array(
+			'entry_title' => 'Serialized Title',
+			'entry_page'  => 2,
+		);
+
+		$this->assertEquals( $expected, $serialized );
+		$this->assertIsArray( $serialized );
+		$this->assertArrayHasKey( 'entry_title', $serialized );
+		$this->assertArrayHasKey( 'entry_page', $serialized );
+	}
+
+	/**
+	 * Test serialize with empty title
+	 */
+	public function test_serialize_with_empty_title() {
+		$entry      = new Feedback_Entry( 0, '', 1 );
+		$serialized = $entry->serialize();
+
+		$expected = array(
+			'entry_title' => '',
+			'entry_page'  => 1,
+		);
+
+		$this->assertEquals( $expected, $serialized );
+	}
+
+	/**
+	 * Test default page number
+	 */
+	public function test_default_page_number() {
+		$entry = new Feedback_Entry( 0, 'Test' );
+
+		$this->assertSame( 1, $entry->get_page_number() );
+	}
+
+	/**
+	 * Test constructor overwrites ID when post is not public
+	 */
+	public function test_constructor_overwrites_id_for_non_public_post() {
+		// Create a private post
+		$post_id = wp_insert_post(
+			array(
+				'post_title'  => 'Private Post',
+				'post_status' => 'private',
+				'post_type'   => 'post',
+			)
+		);
+
+		$entry = new Feedback_Entry( $post_id, 'Fallback Title' );
+
+		// ID should be reset to 0 for non-public posts
+		$this->assertSame( $post_id, $entry->get_id() );
+		$this->assertEquals( 'Fallback Title', $entry->get_title() );
+	}
+}
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 6d130069e9c34..63409551abeab 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -873,58 +873,17 @@ public function test_empty_consent() {
 		$this->assertFalse( $saved_response->has_consent(), 'Has consent should match the saved form submission' );
 	}
 
-	/**
-	 * Helper function for creating the post context.
-	 * This is helpful for testing the post context.
-	 **/
-	private function create_post_context() {
-		$author_id = wp_insert_user(
-			array(
-				'user_email' => 'john@example.com',
-				'user_login' => 'test_user',
-				'user_pass'  => 'abc123',
-			)
-		);
-
-		$post_id = wp_insert_post(
-			array(
-				'post_title'   => 'POST TITLE ' . microtime(),
-				'post_content' => 'POST CONTENT',
-				'post_status'  => 'publish',
-				'post_author'  => $author_id,
-			),
-			true
-		);
-
-		global $post;
-		$post = get_post( $post_id );
-		return $post;
-	}
-
-	/**
-	 * Helper function for destroying the post context.
-	 * This is helpful cleaning up the post context after the test.
-	 **/
-	private function destroy_post_context() {
-		global $post;
-		if ( $post ) {
-			wp_delete_user( $post->post_author, true );
-			wp_delete_post( $post->ID, true );
-			$post = null;
-		}
-	}
-
 	public function test_compute_entry_ID_legacy() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$post_id      = Utility::create_legacy_feedback();
-		$this->destroy_post_context();
-
+		Utility::destroy_post_context();
 		$saved_response = Feedback::get( $post_id );
-		$this->assertEquals( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
+
+		$this->assertSame( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
 	}
 
 	public function test_compute_entry_ID() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -945,7 +904,7 @@ public function test_compute_entry_ID() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 
 		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $current_post->ID, $response->get_entry_id(), 'Entry_ID should match the form submission' );
@@ -953,7 +912,7 @@ public function test_compute_entry_ID() {
 	}
 
 	public function test_compute_entry_title() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -975,14 +934,14 @@ public function test_compute_entry_title() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 
 		$this->assertEquals( $current_post->post_title, $response->get_entry_title(), 'Post title should match the form submission' );
 		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post title should match the saved form submission' );
 	}
 
 	public function test_compute_entry_title_updated() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -1013,13 +972,13 @@ public function test_compute_entry_title_updated() {
 		);
 
 		$saved_response = Feedback::get( $post_id );
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 
 		$this->assertEquals( $update_title, $saved_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
 	}
 
 	public function test_compute_entry_title_deleted() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -1039,7 +998,7 @@ public function test_compute_entry_title_deleted() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 
 		$this->assertSame( '', get_the_title( $current_post->ID ), 'Post title should not be available after the post is deleted' );
 		// At this point we should have a deleted post.
@@ -1050,7 +1009,7 @@ public function test_compute_entry_title_deleted() {
 	}
 
 	public function test_compute_entry_permalink() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -1072,7 +1031,7 @@ public function test_compute_entry_permalink() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 		$current_permalink = get_the_permalink( $current_post );
 		$this->assertEquals( $current_permalink, $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 
@@ -1080,7 +1039,7 @@ public function test_compute_entry_permalink() {
 	}
 
 	public function test_compute_entry_permalink_deleted_post() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -1100,13 +1059,13 @@ public function test_compute_entry_permalink_deleted_post() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		$this->destroy_post_context(); // Destroy the post context to simulate a deleted post.
+		Utility::destroy_post_context(); // Destroy the post context to simulate a deleted post.
 		$saved_response = Feedback::get( $post_id );
 		$this->assertEmpty( $saved_response->get_entry_permalink(), 'Post permalink should match the form submission' );
 	}
 
 	public function test_compute_entry_permalink_with_page_number() {
-		$current_post = $this->create_post_context();
+		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();
 		// Create a form submission
 		$_post_data = Utility::get_post_request(
@@ -1128,7 +1087,7 @@ public function test_compute_entry_permalink_with_page_number() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		$this->destroy_post_context();
+		Utility::destroy_post_context();
 
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 		$this->assertStringContainsString( 'page=999', $saved_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
diff --git a/projects/packages/forms/tests/php/contact-form/class-utility.php b/projects/packages/forms/tests/php/contact-form/class-utility.php
index 3f8653696a058..6145096188dd4 100644
--- a/projects/packages/forms/tests/php/contact-form/class-utility.php
+++ b/projects/packages/forms/tests/php/contact-form/class-utility.php
@@ -134,4 +134,37 @@ public static function get_post_request( $values, $form_id = null, $post_id = 0
 		}
 		return $post_data;
 	}
+
+	public static function create_post_context() {
+		$author_id = wp_insert_user(
+			array(
+				'user_email' => 'john@example.com',
+				'user_login' => 'test_user',
+				'user_pass'  => 'abc123',
+			)
+		);
+
+		$post_id = wp_insert_post(
+			array(
+				'post_title'   => 'POST TITLE ' . microtime(),
+				'post_content' => 'POST CONTENT',
+				'post_status'  => 'publish',
+				'post_author'  => $author_id,
+			),
+			true
+		);
+
+		global $post;
+		$post = get_post( $post_id );
+		return $post;
+	}
+
+	public static function destroy_post_context() {
+		global $post;
+		if ( $post ) {
+			wp_delete_user( $post->post_author, true );
+			wp_delete_post( $post->ID, true );
+			$post = null;
+		}
+	}
 }

From 61435b82aebaacb9e1895f41088c14e1e1c5f2ae Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Tue, 15 Jul 2025 18:38:02 -0700
Subject: [PATCH 20/48] split constructore up, refactor form

---
 .../forms/src/contact-form/class-feedback.php | 191 +++++++++---------
 1 file changed, 91 insertions(+), 100 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 0ec9e4a94284d..a9c9afb36f1d4 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -17,13 +17,6 @@ class Feedback {
 
 	const POST_TYPE = 'feedback';
 
-	/**
-	 * The Post Object of the feedback entry.
-	 *
-	 * @var WP_Post|null
-	 */
-	protected $feedback_post;
-
 	/**
 	 * The form field values.
 	 *
@@ -38,13 +31,6 @@ class Feedback {
 	 */
 	protected $has_file = false;
 
-	/**
-	 * The original Contact_Form object, if available.
-	 *
-	 * @var Contact_Form|null
-	 */
-	protected $form;
-
 	/**
 	 * The current post object, if available.
 	 *
@@ -159,69 +145,6 @@ class Feedback {
 	 */
 	protected $entry;
 
-	/**
-	 * Constructor.
-	 *
-	 * @param WP_Post|null      $feedback_post The post object representing the feedback.
-	 * @param Contact_Form|null $form  The form object.
-	 * @param array|null        $post_data The $_POST recieved during the form submission.
-	 * @param WP_Post|null      $current_post The current post object, if available.
-	 * @param int               $current_page_number The current page number associated with the current post object entry.
-	 */
-	public function __construct( $feedback_post = null, $form = null, $post_data = null, $current_post = null, $current_page_number = 1 ) {
-
-		$this->entry = new Feedback_Entry( 0, '' );
-
-		$this->feedback_post = $feedback_post;
-		$this->form          = $form;
-
-		if ( $this->feedback_post instanceof WP_Post ) {
-
-			$parsed_content = $this->parse_content( $this->feedback_post->post_content, $this->feedback_post->post_mime_type );
-
-			$this->status      = $this->feedback_post->post_status;
-			$this->feedback_id = $this->feedback_post->post_name;
-
-			$this->feedback_time = $this->feedback_post->post_date;
-
-			$this->entry = new Feedback_Entry(
-				$this->feedback_post->post_parent,
-				$parsed_content['entry_title'] ?? '',
-				$parsed_content['entry_page'] ?? 1
-			);
-
-			$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
-			$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
-			$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
-			$this->author          = $this->get_first_field_of_type( 'name', 'pre_comment_author_name' );
-			$this->author_email    = $this->get_first_field_of_type( 'email', 'pre_comment_author_email' );
-			$this->author_url      = $this->get_first_field_of_type( 'url', 'pre_comment_author_url' );
-			$this->comment_content = $this->get_first_field_of_type( 'textarea' );
-			$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
-
-			$this->feedback_title = $this->feedback_post->post_title ? $this->feedback_post->post_title : $this->get_author() . ' - ' . $this->feedback_post->post_date;
-
-		} elseif ( is_array( $post_data ) && ! empty( $post_data ) ) {
-
-			// If post_data is provided, use it to populate fields.
-			$this->status          = $this->status;
-			$this->fields          = $this->get_computed_fields( $post_data );
-			$this->ip_address      = Contact_Form_Plugin::get_ip_address();
-			$this->subject         = $this->get_computed_subject( $post_data );
-			$this->author          = $this->get_computer_author_info( $post_data, 'name', 'pre_comment_author_name' );
-			$this->author_email    = $this->get_computer_author_info( $post_data, 'email', 'pre_comment_author_email' );
-			$this->author_url      = $this->get_computer_author_info( $post_data, 'url', 'pre_comment_author_url' );
-			$this->comment_content = $this->get_computed_comment_content( $post_data );
-			$this->has_consent     = $this->get_computed_consent( $post_data );
-
-			$this->entry = Feedback_Entry::from_submission( $current_post, $current_page_number );
-
-			$this->feedback_time  = current_time( 'mysql' );
-			$this->feedback_title = "{$this->get_author()} - {$this->feedback_time}";
-			$this->feedback_id    = md5( $this->feedback_title );
-		}
-	}
-
 	/**
 	 * Create a response object from a feedback post ID.
 	 *
@@ -235,7 +158,40 @@ public static function get( $feedback_post_id ) {
 			return null;
 		}
 
-		return new static( $feedback_post );
+		$instance = new self();
+		$instance->load_from_post( $feedback_post );
+		return $instance;
+	}
+
+	/**
+	 * Create a Feedback object from a feedback post.
+	 *
+	 * @param WP_Post $feedback_post The feedback post object.
+	 */
+	private function load_from_post( WP_Post $feedback_post ) {
+
+		$parsed_content = $this->parse_content( $feedback_post->post_content, $feedback_post->post_mime_type );
+
+		$this->status        = $feedback_post->post_status;
+		$this->feedback_id   = $feedback_post->post_name;
+		$this->feedback_time = $feedback_post->post_date;
+
+		$this->entry = new Feedback_Entry(
+			$feedback_post->post_parent,
+			$parsed_content['entry_title'] ?? '',
+			$parsed_content['entry_page'] ?? 1
+		);
+
+		$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
+		$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
+		$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
+		$this->author          = $this->get_first_field_of_type( 'name', 'pre_comment_author_name' );
+		$this->author_email    = $this->get_first_field_of_type( 'email', 'pre_comment_author_email' );
+		$this->author_url      = $this->get_first_field_of_type( 'url', 'pre_comment_author_url' );
+		$this->comment_content = $this->get_first_field_of_type( 'textarea' );
+		$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
+
+		$this->feedback_title = $feedback_post->post_title ? $feedback_post->post_title : $this->get_author() . ' - ' . $feedback_post->post_date;
 	}
 
 	/**
@@ -249,7 +205,36 @@ public static function get( $feedback_post_id ) {
 	 * @return static
 	 */
 	public static function from_submission( $post_data, $form, $current_post = null, $current_page_number = 1 ) {
-		return new static( null, $form, $post_data, $current_post, $current_page_number );
+		$instance = new self();
+		$instance->load_from_submission( $post_data, $form, $current_post, $current_page_number );
+		return $instance;
+	}
+
+	/**
+	 * Load from Form Submission.
+	 *
+	 * @param array        $post_data The $_POST recieved during the form submission.
+	 * @param Contact_Form $form  The form object.
+	 * @param WP_Post|null $current_post The current post object, if available.
+	 * @param int          $current_page_number The current page number associated with the current post object entry.
+	 */
+	private function load_from_submission( $post_data, $form, $current_post = null, $current_page_number = 1 ) {
+
+		$this->entry = Feedback_Entry::from_submission( $current_post, $current_page_number );
+		// If post_data is provided, use it to populate fields.
+		$this->status          = $this->status;
+		$this->fields          = $this->get_computed_fields( $post_data, $form );
+		$this->ip_address      = Contact_Form_Plugin::get_ip_address();
+		$this->subject         = $this->get_computed_subject( $post_data, $form );
+		$this->author          = $this->get_computer_author_info( $post_data, 'name', 'pre_comment_author_name', $form );
+		$this->author_email    = $this->get_computer_author_info( $post_data, 'email', 'pre_comment_author_email', $form );
+		$this->author_url      = $this->get_computer_author_info( $post_data, 'url', 'pre_comment_author_url', $form );
+		$this->comment_content = $this->get_computed_comment_content( $post_data, $form );
+		$this->has_consent     = $this->get_computed_consent( $post_data, $form );
+
+		$this->feedback_time  = current_time( 'mysql' );
+		$this->feedback_title = "{$this->get_author()} - {$this->feedback_time}";
+		$this->feedback_id    = md5( $this->feedback_title );
 	}
 
 	/**
@@ -686,8 +671,8 @@ public function save() {
 			)
 		);
 
-		$this->feedback_post = get_post( $post_id );
-		return $this->feedback_post ? $this->feedback_post->ID : 0;
+		$feedback_post = get_post( $post_id );
+		return $feedback_post ?? 0;
 	}
 
 	/**
@@ -914,18 +899,19 @@ public static function strip_tags( $data_with_tags ) {
 	/**
 	 * Get all the fields of the response, computed from the post data.
 	 *
-	 * @param array $post_data The post data from the form submission.
+	 * @param array        $post_data The post data from the form submission.
+	 * @param Contact_Form $form The form object.
 	 * @return array An array of Feedback_Field objects.
 	 */
-	private function get_computed_fields( $post_data ) {
+	private function get_computed_fields( $post_data, $form ) {
 
 		$fields = array();
 
-		$field_ids = $this->form->get_field_ids();
+		$field_ids = $form->get_field_ids();
 		// For all fields, grab label and value
 		$i = 1;
 		foreach ( $field_ids['all'] as $field_id ) {
-			$field = $this->form->fields[ $field_id ];
+			$field = $form->fields[ $field_id ];
 			$type  = $field->get_attribute( 'type' );
 			if ( ! $field->is_field_renderable( $type ) ) {
 				continue;
@@ -948,13 +934,14 @@ private function get_computed_fields( $post_data ) {
 	/**
 	 * Gets the computed subject.
 	 *
-	 * @param array $post_data The post data from the form submission.
+	 * @param array        $post_data The post data from the form submission.
+	 * @param Contact_Form $form The form object.
 	 * @return string
 	 */
-	private function get_computed_subject( $post_data ) {
+	private function get_computed_subject( $post_data, $form ) {
 
-		$contact_form_subject = $this->form->get_attribute( 'subject' );
-		$field_ids            = $this->form->get_field_ids();
+		$contact_form_subject = $form->get_attribute( 'subject' );
+		$field_ids            = $form->get_field_ids();
 
 		if ( isset( $field_ids['subject'] ) ) {
 			$value = $this->get_field_value( $field_ids['subject'], $post_data );
@@ -965,16 +952,18 @@ private function get_computed_subject( $post_data ) {
 
 		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
 	}
+
 	/**
 	 * Gets the computed author.
 	 *
-	 * @param array       $post_data The post data from the form submission.
-	 * @param string      $type The type of author information to retrieve (e.g., 'name', 'email', 'url').
-	 * @param string|null $filter Optional filter to apply to the value.
+	 * @param array        $post_data The post data from the form submission.
+	 * @param string       $type The type of author information to retrieve (e.g., 'name', 'email', 'url').
+	 * @param string|null  $filter Optional filter to apply to the value.
+	 * @param Contact_Form $form The form object.
 	 * @return string
 	 */
-	private function get_computer_author_info( $post_data, $type, $filter = null ) {
-		$field_ids = $this->form->get_field_ids();
+	private function get_computer_author_info( $post_data, $type, $filter, $form ) {
+		$field_ids = $form->get_field_ids();
 		if ( isset( $field_ids[ $type ] ) ) {
 			$value = $this->get_field_value( $field_ids[ $type ], $post_data );
 			if ( is_string( $value ) ) {
@@ -995,11 +984,12 @@ private function get_computer_author_info( $post_data, $type, $filter = null ) {
 	/**
 	 * Gets the computed comment content.
 	 *
-	 * @param array $post_data The post data from the form submission.
+	 * @param array        $post_data The post data from the form submission.
+	 * @param Contact_Form $form The form object.
 	 * @return string
 	 */
-	private function get_computed_comment_content( $post_data ) {
-		$field_ids = $this->form->get_field_ids();
+	private function get_computed_comment_content( $post_data, $form ) {
+		$field_ids = $form->get_field_ids();
 		if ( isset( $field_ids['textarea'] ) ) {
 			$value = $this->get_field_value( $field_ids['textarea'], $post_data );
 			if ( is_string( $value ) ) {
@@ -1012,11 +1002,12 @@ private function get_computed_comment_content( $post_data ) {
 	/**
 	 * Gets the computed consent.
 	 *
-	 * @param array $post_data The post data from the form submission.
+	 * @param array        $post_data The post data from the form submission.
+	 * @param Contact_Form $form The form object.
 	 * @return string
 	 */
-	private function get_computed_consent( $post_data ) {
-		$field_ids = $this->form->get_field_ids();
+	private function get_computed_consent( $post_data, $form ) {
+		$field_ids = $form->get_field_ids();
 
 		if ( isset( $field_ids['email_marketing_consent_field'] ) && $field_ids['email_marketing_consent_field'] !== null ) {
 			return (bool) $this->get_field_value( $field_ids['email_marketing_consent_field'], $post_data );

From f3e21241aef86d1113031eeac85609847e3fd6fe Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 07:38:09 -0700
Subject: [PATCH 21/48] Add Feedback_Author Class

---
 .../contact-form/class-feedback-author.php    | 148 ++++++++++++++++++
 .../forms/src/contact-form/class-feedback.php | 115 +++-----------
 2 files changed, 171 insertions(+), 92 deletions(-)
 create mode 100644 projects/packages/forms/src/contact-form/class-feedback-author.php

diff --git a/projects/packages/forms/src/contact-form/class-feedback-author.php b/projects/packages/forms/src/contact-form/class-feedback-author.php
new file mode 100644
index 0000000000000..1ced9af71293d
--- /dev/null
+++ b/projects/packages/forms/src/contact-form/class-feedback-author.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Feedback class.
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+/**
+ * Class Feedback_Author
+ *
+ * Represents the author of a feedback entry, including their name, email, and URL.
+ */
+class Feedback_Author {
+
+	/**
+	 * The name of the author.
+	 *
+	 * @var string
+	 */
+	private $name;
+
+	/**
+	 * The email of the author.
+	 *
+	 * @var string
+	 */
+	private $email;
+
+	/**
+	 * The url of the author.
+	 *
+	 * @var string
+	 */
+	private $url;
+
+	/**
+	 * Constructor for Feedback_Author.
+	 *
+	 * @param string $name  The name of the author.
+	 * @param string $email The email of the author.
+	 * @param string $url   The URL of the author.
+	 */
+	public function __construct( $name = '', $email = '', $url = '' ) {
+		$this->name  = $name;
+		$this->email = $email;
+		$this->url   = $url;
+	}
+
+	/**
+	 * Create a Feedback_Author instance from the submission data.
+	 *
+	 * @param array        $post_data The post data from the form submission.
+	 * @param Contact_Form $form      The form object.
+	 * @return Feedback_Author The Feedback_Author instance.
+	 */
+	public static function from_submission( $post_data, $form ) {
+		return new self(
+			self::get_computer_author_info( $post_data, 'name', 'pre_comment_author_name', $form ),
+			self::get_computer_author_info( $post_data, 'email', 'pre_comment_author_email', $form ),
+			self::get_computer_author_info( $post_data, 'url', 'pre_comment_author_url', $form )
+		);
+	}
+
+	/**
+	 * Gets the computed author.
+	 *
+	 * @param array        $post_data The post data from the form submission.
+	 * @param string       $type The type of author information to retrieve (e.g., 'name', 'email', 'url').
+	 * @param string       $filter Optional filter to apply to the value.
+	 * @param Contact_Form $form The form object.
+	 *
+	 * @return string Filter value for the author information.
+	 */
+	private static function get_computer_author_info( $post_data, $type, $filter, $form ) {
+		$field_ids = $form->get_field_ids();
+		if ( isset( $field_ids[ $type ] ) ) {
+			$key   = $field_ids[ $type ];
+			$value = isset( $post_data[ $key ] ) ? sanitize_text_field( wp_unslash( $post_data[ $key ] ) ) : '';
+			if ( is_string( $value ) ) {
+				return Contact_Form_Plugin::strip_tags(
+					stripslashes(
+						/**
+						 *
+						 * Listed to help search find the filters.
+						 * apply_filters( ''pre_comment_author_name', $value )
+						 * apply_filters( ''pre_comment_author_email', $value )
+						 * apply_filters( ''pre_comment_author_url', $value )
+						*/
+						apply_filters( $filter, addslashes( $value ) )
+					)
+				);
+
+			}
+		}
+		return '';
+	}
+
+	/**
+	 * Get the display name of the author.
+	 *
+	 * If the name is not set, it will return the email.
+	 *
+	 * @return string The display name of the author.
+	 */
+	public function get_display_name(): string {
+		return empty( $this->name ) ? $this->email : $this->name;
+	}
+
+	/**
+	 * Get the avatar URL of the author.
+	 *
+	 * If the email is not set, it will return an empty string.
+	 *
+	 * @return string The avatar URL of the author.
+	 */
+	public function get_avatar_url(): string {
+		return ! empty( $this->email ) ? get_avatar_url( $this->email ) : '';
+	}
+
+	/**
+	 * Get the name of the author.
+	 *
+	 * @return string The name of the author.
+	 */
+	public function get_name() {
+		return $this->name;
+	}
+
+	/**
+	 * Get the email of the author.
+	 *
+	 * @return string The email of the author.
+	 */
+	public function get_email() {
+		return $this->email;
+	}
+
+	/**
+	 * Get the URL of the author.
+	 *
+	 * @return string The URL of the author.
+	 */
+	public function get_url() {
+		return $this->url;
+	}
+}
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index a9c9afb36f1d4..29d886ac9dc63 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -31,26 +31,6 @@ class Feedback {
 	 */
 	protected $has_file = false;
 
-	/**
-	 * The current post object, if available.
-	 *
-	 * Usallyt this is accostied with the global $post object.
-	 *
-	 * @var WP_Post|null
-	 */
-	protected $current_post;
-
-	/**
-	 * The current page number associated with the feedback entry.
-	 *
-	 * This is used to track the page number of the form that the feedback was submitted from.
-	 *
-	 * Usally this is accosited with the global $page number varieble.
-	 *
-	 * @var int
-	 */
-	protected $current_page_number = 1;
-
 	/**
 	 * The status of the feedback entry.
 	 *
@@ -102,25 +82,11 @@ class Feedback {
 	protected $feedback_time = '';
 
 	/**
-	 * The author of the feedback entry.
-	 *
-	 * @var string
-	 */
-	protected $author = '';
-
-	/**
-	 * The author email of the feedback entry.
+	 * The Feedback_Author of the feedback entry.
 	 *
-	 * @var string
+	 * @var Feedback_Author
 	 */
-	protected $author_email = '';
-
-	/**
-	 * The author url of the feedback entry.
-	 *
-	 * @var string
-	 */
-	protected $author_url = '';
+	protected $author_data;
 
 	/**
 	 * The comment content of the feedback entry.
@@ -176,18 +142,23 @@ private function load_from_post( WP_Post $feedback_post ) {
 		$this->feedback_id   = $feedback_post->post_name;
 		$this->feedback_time = $feedback_post->post_date;
 
+		$this->fields = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
+
 		$this->entry = new Feedback_Entry(
 			$feedback_post->post_parent,
 			$parsed_content['entry_title'] ?? '',
 			$parsed_content['entry_page'] ?? 1
 		);
 
-		$this->fields          = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
-		$this->ip_address      = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
-		$this->subject         = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
-		$this->author          = $this->get_first_field_of_type( 'name', 'pre_comment_author_name' );
-		$this->author_email    = $this->get_first_field_of_type( 'email', 'pre_comment_author_email' );
-		$this->author_url      = $this->get_first_field_of_type( 'url', 'pre_comment_author_url' );
+		$this->ip_address = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
+		$this->subject    = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
+
+		$this->author_data = new Feedback_Author(
+			$this->get_first_field_of_type( 'name', 'pre_comment_author_name' ),
+			$this->get_first_field_of_type( 'email', 'pre_comment_author_email' ),
+			$this->get_first_field_of_type( 'url', 'pre_comment_author_url' )
+		);
+
 		$this->comment_content = $this->get_first_field_of_type( 'textarea' );
 		$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
 
@@ -226,9 +197,7 @@ private function load_from_submission( $post_data, $form, $current_post = null,
 		$this->fields          = $this->get_computed_fields( $post_data, $form );
 		$this->ip_address      = Contact_Form_Plugin::get_ip_address();
 		$this->subject         = $this->get_computed_subject( $post_data, $form );
-		$this->author          = $this->get_computer_author_info( $post_data, 'name', 'pre_comment_author_name', $form );
-		$this->author_email    = $this->get_computer_author_info( $post_data, 'email', 'pre_comment_author_email', $form );
-		$this->author_url      = $this->get_computer_author_info( $post_data, 'url', 'pre_comment_author_url', $form );
+		$this->author_data     = Feedback_Author::from_submission( $post_data, $form );
 		$this->comment_content = $this->get_computed_comment_content( $post_data, $form );
 		$this->has_consent     = $this->get_computed_consent( $post_data, $form );
 
@@ -295,7 +264,7 @@ private function get_first_field_of_type( $type, $filter = null ) {
 				return $field->get_render_value();
 			}
 		}
-		return null;
+		return '';
 	}
 
 	/**
@@ -458,9 +427,9 @@ public function get_time() {
 	 */
 	public function get_akismet_vars() {
 		$akismet_vars = array(
-			'comment_author'       => $this->author,
-			'comment_author_email' => $this->get_author_email(),
-			'comment_author_url'   => $this->get_author_url(),
+			'comment_author'       => $this->author_data->get_name(),
+			'comment_author_email' => $this->author_data->get_email(),
+			'comment_author_url'   => $this->author_data->get_url(),
 			'contact_form_subject' => $this->get_subject(),
 			'comment_author_ip'    => $this->get_ip_address(),
 			'comment_content'      => empty( $this->get_comment_content() ) ? null : $this->get_comment_content(),
@@ -507,13 +476,7 @@ public function get_akismet_vars() {
 	 * @return string
 	 */
 	public function get_author() {
-		if ( ! empty( $this->author ) ) {
-			return $this->author;
-		}
-		if ( ! empty( $this->author_email ) ) {
-			return $this->author_email;
-		}
-		return '';
+		return $this->author_data->get_display_name();
 	}
 
 	/**
@@ -522,7 +485,7 @@ public function get_author() {
 	 * @return string
 	 */
 	public function get_author_email() {
-		return $this->author_email;
+		return $this->author_data->get_email();
 	}
 
 	/**
@@ -533,11 +496,7 @@ public function get_author_email() {
 	 * @return string
 	 */
 	public function get_author_avatar() {
-		// This is a convenience method to get the author's gravatar URL.
-		if ( ! empty( $this->author_email ) ) {
-			return get_avatar_url( $this->author_email );
-		}
-		return '';
+		return $this->author_data->get_avatar_url();
 	}
 
 	/**
@@ -546,7 +505,7 @@ public function get_author_avatar() {
 	 * @return string
 	 */
 	public function get_author_url() {
-		return $this->author_url;
+		return $this->author_data->get_url();
 	}
 
 	/**
@@ -953,34 +912,6 @@ private function get_computed_subject( $post_data, $form ) {
 		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
 	}
 
-	/**
-	 * Gets the computed author.
-	 *
-	 * @param array        $post_data The post data from the form submission.
-	 * @param string       $type The type of author information to retrieve (e.g., 'name', 'email', 'url').
-	 * @param string|null  $filter Optional filter to apply to the value.
-	 * @param Contact_Form $form The form object.
-	 * @return string
-	 */
-	private function get_computer_author_info( $post_data, $type, $filter, $form ) {
-		$field_ids = $form->get_field_ids();
-		if ( isset( $field_ids[ $type ] ) ) {
-			$value = $this->get_field_value( $field_ids[ $type ], $post_data );
-			if ( is_string( $value ) ) {
-				if ( ! empty( $filter ) ) {
-					return self::strip_tags(
-						stripslashes(
-							/** This filter is already documented in core/wp-includes/comment-functions.php */
-							apply_filters( $filter, addslashes( $value ) )
-						)
-					);
-				}
-				return self::strip_tags( stripslashes( $value ) );
-			}
-		}
-		return '';
-	}
-
 	/**
 	 * Gets the computed comment content.
 	 *

From 923ea28bf990c9bece166df2b623e5cb4529e100 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 17:55:11 -0700
Subject: [PATCH 22/48] Fix phan issue

---
 .../forms/src/contact-form/class-contact-form.php         | 8 ++++++--
 .../forms/src/contact-form/class-feedback-entry.php       | 4 ++--
 .../forms/src/contact-form/class-feedback-field.php       | 4 ++--
 .../packages/forms/src/contact-form/class-feedback.php    | 8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index fedf2a8ed408c..5da39c198478f 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -895,7 +895,7 @@ public static function get_compiled_form( $feedback_id, $form = null ) {
 	 * Returns the JSON data for the form submission.
 	 *
 	 * @param int $feedback_id - the feedback ID.
-	 *
+	 * @param Contact_Form|null $form - the contact form object. This parameter is deprecated and no longer used.
 	 *
 	 * @return array $json_data
 	 */
@@ -916,7 +916,11 @@ public static function get_json_data( $feedback_id, $form = null ) {
 	 *
 	 * @return array $raw_data Associative array where keys are field_index and values are arrays with 'label' and 'value'.
 	 */
-	private static function get_raw_compiled_form_data( $feedback_id ) {
+	private static function get_raw_compiled_form_data( $feedback_id, $form = null ) {
+		if ( $form ) {
+			// you are doing it wring, the $form parameter is deprecated and no longer used.
+			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
+		}
 		$response = Feedback::get( $feedback_id );
 		return $response->get_compiled_fields();
 	}
diff --git a/projects/packages/forms/src/contact-form/class-feedback-entry.php b/projects/packages/forms/src/contact-form/class-feedback-entry.php
index f97f49bb262db..e7d2b7b0a1d47 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-entry.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-entry.php
@@ -83,9 +83,9 @@ public static function from_submission( $current_post, int $current_page_number
 			return new self( 0, '', $current_page_number );
 		}
 
-		$title = isset( $current_post->post_title ) ? $current_post->post_title : '';
+		$title = $current_post->post_title ?? '';
 
-		return new self( $id, $title, $current_page_number, $current_post );
+		return new self( $id, $title, $current_page_number );
 	}
 
 	/**
diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 35148f462ef9d..35e7b9ce59714 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -257,8 +257,8 @@ public static function from_serialized( $data ) {
 			$data['key'],
 			$data['label'],
 			$data['value'],
-			isset( $data['type'] ) ? $data['type'] : 'basic',
-			isset( $data['meta'] ) ? $data['meta'] : array()
+			$data['type'] ?? 'basic',
+			$data['meta'] ?? array()
 		);
 	}
 
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 29d886ac9dc63..264f8459d3a0c 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -142,7 +142,7 @@ private function load_from_post( WP_Post $feedback_post ) {
 		$this->feedback_id   = $feedback_post->post_name;
 		$this->feedback_time = $feedback_post->post_date;
 
-		$this->fields = isset( $parsed_content['fields'] ) ? $parsed_content['fields'] : array();
+		$this->fields = $parsed_content['fields'] ?? array();
 
 		$this->entry = new Feedback_Entry(
 			$feedback_post->post_parent,
@@ -150,8 +150,8 @@ private function load_from_post( WP_Post $feedback_post ) {
 			$parsed_content['entry_page'] ?? 1
 		);
 
-		$this->ip_address = isset( $parsed_content['ip'] ) ? $parsed_content['ip'] : $this->get_first_field_of_type( 'ip' );
-		$this->subject    = isset( $parsed_content['subject'] ) ? $parsed_content['subject'] : $this->get_first_field_of_type( 'subject' );
+		$this->ip_address = $parsed_content['ip'] ?? $this->get_first_field_of_type( 'ip' );
+		$this->subject    = $parsed_content['subject'] ?? $this->get_first_field_of_type( 'subject' );
 
 		$this->author_data = new Feedback_Author(
 			$this->get_first_field_of_type( 'name', 'pre_comment_author_name' ),
@@ -160,7 +160,7 @@ private function load_from_post( WP_Post $feedback_post ) {
 		);
 
 		$this->comment_content = $this->get_first_field_of_type( 'textarea' );
-		$this->has_consent     = $this->get_first_field_of_type( 'consent' ) === 'Yes' ? true : false;
+		$this->has_consent     = ( $this->get_first_field_of_type( 'consent' ) === 'Yes' );
 
 		$this->feedback_title = $feedback_post->post_title ? $feedback_post->post_title : $this->get_author() . ' - ' . $feedback_post->post_date;
 	}

From 1f2b68950180f227c22f2d95577393ae05a9bbfd Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 18:09:31 -0700
Subject: [PATCH 23/48] Add tests for Feedback_Author

---
 .../php/contact-form/Feedback_Author_Test.php | 176 ++++++++++++++++++
 1 file changed, 176 insertions(+)
 create mode 100644 projects/packages/forms/tests/php/contact-form/Feedback_Author_Test.php

diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Author_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Author_Test.php
new file mode 100644
index 0000000000000..560086eea4507
--- /dev/null
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Author_Test.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Unit Tests for Automattic\Jetpack\Forms\Contact_Form.
+ *
+ * To run the test visit the packages/forms directory and run composer test-php
+ *
+ * @package automattic/jetpack-forms
+ */
+
+namespace Automattic\Jetpack\Forms\ContactForm;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use WorDBless\BaseTestCase;
+
+/**
+ * Test class for Feedback_Author
+ *
+ * @covers \Automattic\Jetpack\Forms\ContactForm\Feedback_Author
+ */
+#[CoversClass( Feedback_Author::class )]
+class Feedback_Author_Test extends BaseTestCase {
+
+	/**
+	 * Test constructor with all parameters.
+	 */
+	public function test_constructor_with_all_parameters() {
+		$author = new Feedback_Author( 'John Doe', 'john@example.com', 'https://example.com' );
+
+		$this->assertEquals( 'John Doe', $author->get_name() );
+		$this->assertEquals( 'john@example.com', $author->get_email() );
+		$this->assertEquals( 'https://example.com', $author->get_url() );
+	}
+
+	/**
+	 * Test constructor with default parameters.
+	 */
+	public function test_constructor_with_default_parameters() {
+		$author = new Feedback_Author();
+
+		$this->assertSame( '', $author->get_name() );
+		$this->assertSame( '', $author->get_email() );
+		$this->assertSame( '', $author->get_url() );
+	}
+
+	/**
+	 * Test get_display_name when name is set.
+	 */
+	public function test_get_display_name_with_name() {
+		$author = new Feedback_Author( 'John Doe', 'john@example.com' );
+
+		$this->assertEquals( 'John Doe', $author->get_display_name() );
+	}
+
+	/**
+	 * Test get_display_name when name is empty, falls back to email.
+	 */
+	public function test_get_display_name_without_name() {
+		$author = new Feedback_Author( '', 'john@example.com' );
+
+		$this->assertEquals( 'john@example.com', $author->get_display_name() );
+	}
+
+	/**
+	 * Test get_display_name when both name and email are empty.
+	 */
+	public function test_get_display_name_empty() {
+		$author = new Feedback_Author();
+
+		$this->assertSame( '', $author->get_display_name() );
+	}
+
+	/**
+	 * Test get_avatar_url with email.
+	 */
+	public function test_get_avatar_url_with_email() {
+		$author = new Feedback_Author( 'John Doe', 'john@example.com' );
+
+		$this->assertNotEmpty( $author->get_avatar_url() );
+		$this->assertStringContainsString( 'gravatar', $author->get_avatar_url() );
+	}
+
+	/**
+	 * Test get_avatar_url without email.
+	 */
+	public function test_get_avatar_url_without_email() {
+		$author = new Feedback_Author( 'John Doe' );
+
+		$this->assertSame( '', $author->get_avatar_url() );
+	}
+
+	/**
+	 * Test from_submission method.
+	 */
+	public function test_from_submission() {
+		$form = $this->createMock( Contact_Form::class );
+		$form->method( 'get_field_ids' )
+			->willReturn(
+				array(
+					'name'  => 'g1-name',
+					'email' => 'g1-email',
+					'url'   => 'g1-url',
+				)
+			);
+
+		$post_data = array(
+			'g1-name'  => 'John Doe',
+			'g1-email' => 'john@example.com',
+			'g1-url'   => 'https://example.com',
+		);
+
+		$author = Feedback_Author::from_submission( $post_data, $form );
+
+		$this->assertInstanceOf( Feedback_Author::class, $author );
+	}
+
+	public function test_from_submission_with_mock_data() {
+		$author_name = 'Mikey Mouse';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$_post_data = Utility::get_post_request(
+			array(
+				'name'    => $author_name,
+				'email'   => 'email@email.com',
+				'message' => 'Test message',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/][contact-field label='Message' type='textarea' required='1'/]"
+		);
+
+		$author = Feedback_Author::from_submission( $_post_data, $form );
+		$this->assertEquals( $author_name, $author->get_name() );
+		$this->assertEquals( 'email@email.com', $author->get_email() );
+	}
+
+	/**
+	 * Test from_submission with missing fields.
+	 */
+	public function test_from_submission_missing_fields() {
+		$form = $this->createMock( Contact_Form::class );
+		$form->method( 'get_field_ids' )
+			->willReturn(
+				array(
+					'name' => 'g1-name',
+				)
+			);
+
+		$post_data = array(
+			'g1-other' => 'some value',
+		);
+
+		$author = Feedback_Author::from_submission( $post_data, $form );
+
+		$this->assertInstanceOf( Feedback_Author::class, $author );
+	}
+
+	/**
+	 * Test getters return correct types.
+	 */
+	public function test_getters_return_strings() {
+		$author = new Feedback_Author( 'John', 'john@test.com', 'http://test.com' );
+
+		$this->assertIsString( $author->get_name() );
+		$this->assertIsString( $author->get_email() );
+		$this->assertIsString( $author->get_url() );
+		$this->assertIsString( $author->get_display_name() );
+		$this->assertIsString( $author->get_avatar_url() );
+	}
+}

From ce815738b70c8436ec52e650d9f227762a0cd329 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 18:23:08 -0700
Subject: [PATCH 24/48] Fix tests

---
 .../forms/src/contact-form/class-feedback.php   |  3 +--
 .../php/contact-form/Feedback_Field_Test.php    |  4 ----
 .../tests/php/contact-form/class-utility.php    | 17 +++++++++--------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 264f8459d3a0c..5a3f207f27398 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -193,7 +193,6 @@ private function load_from_submission( $post_data, $form, $current_post = null,
 
 		$this->entry = Feedback_Entry::from_submission( $current_post, $current_page_number );
 		// If post_data is provided, use it to populate fields.
-		$this->status          = $this->status;
 		$this->fields          = $this->get_computed_fields( $post_data, $form );
 		$this->ip_address      = Contact_Form_Plugin::get_ip_address();
 		$this->subject         = $this->get_computed_subject( $post_data, $form );
@@ -935,7 +934,7 @@ private function get_computed_comment_content( $post_data, $form ) {
 	 *
 	 * @param array        $post_data The post data from the form submission.
 	 * @param Contact_Form $form The form object.
-	 * @return string
+	 * @return bool
 	 */
 	private function get_computed_consent( $post_data, $form ) {
 		$field_ids = $form->get_field_ids();
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 8561b95d12358..b506b657345a7 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -88,10 +88,6 @@ public function test_response_from_serialized_is_null() {
 
 		$this->assertNull( $unserialized );
 
-		$unserialized = Feedback_Field::from_serialized( 'howdy' );
-
-		$this->assertNull( $unserialized );
-
 		$unserialized = Feedback_Field::from_serialized( array( 'value' => 'test_value' ) );
 
 		$this->assertNull( $unserialized );
diff --git a/projects/packages/forms/tests/php/contact-form/class-utility.php b/projects/packages/forms/tests/php/contact-form/class-utility.php
index 6145096188dd4..9fa60be0a700f 100644
--- a/projects/packages/forms/tests/php/contact-form/class-utility.php
+++ b/projects/packages/forms/tests/php/contact-form/class-utility.php
@@ -11,14 +11,15 @@ class Utility {
 	 *
 	 * This function creates a mock feedback post in the legacy format used by Jetpack Contact Form.
 	 *
-	 * @param array  $all_values               An associative array of field values.
-	 * @param string $comment_content          The content of the comment.
-	 * @param string $comment_author           The name of the comment author.
-	 * @param string $comment_author_email     The email of the comment author.
-	 * @param string $comment_author_url       The URL of the comment author.
-	 * @param string $comment_ip_text          The IP address of the comment author.
-	 * @param string $subject                  The subject of the feedback.
-	 * @param string $status                   The status of the post (default is 'publish').
+	 * @param array       $all_values               An associative array of field values.
+	 * @param string|null $comment_content          The content of the comment.
+	 * @param string|null $comment_author           The name of the comment author.
+	 * @param string|null $comment_author_email     The email of the comment author.
+	 * @param string|null $comment_author_url       The URL of the comment author.
+	 * @param string|null $comment_ip_text          The IP address of the comment author.
+	 * @param string|null $subject                  The subject of the feedback.
+	 * @param string|null $status                   The status of the post (default is 'publish').
+	 *
 	 * @return int|WP_Error The ID of the created post on success, or a WP_Error object on failure.
 	 */
 	public static function create_legacy_feedback(

From 0fd15da9192e4fd262a17ba35a1bdd6598f70c7f Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 18:32:01 -0700
Subject: [PATCH 25/48] minor refactor

---
 .../forms/src/contact-form/class-feedback.php | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 5a3f207f27398..08b1c5c21d520 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -673,27 +673,48 @@ public function serialize() {
 	 */
 	private function parse_content( $post_content = '', $version = null ) {
 		if ( $version === 'v2' ) {
-			$decoded_content = json_decode( $post_content, true );
-			if ( $decoded_content === null ) {
-				// If JSON decoding fails, try to decode the second try with stripslashes and trim.
-				// This is a workaround for some cases where the JSON data is not properly formatted.
-				$decoded_content = json_decode( stripslashes( trim( $post_content ) ), true );
-			}
+			return $this->parse_content_v2( $post_content );
+		}
+		return $this->parse_legacy_content( $post_content );
+	}
 
-			if ( $decoded_content === null ) {
-				return array();
-			}
-			$fields = array();
-			foreach ( $decoded_content['fields'] as $field ) {
-				$fields[ $field['key'] ] = Feedback_Field::from_serialized( $field );
-				if ( ! $this->has_file && $fields[ $field['key'] ]->has_file() ) {
-					$this->has_file = true;
-				}
+	/**
+	 * Parse the content in the v2 format.
+	 *
+	 * @param string $post_content The post content to parse.
+	 *
+	 * @return array Parsed fields.
+	 */
+	private function parse_content_v2( $post_content = '' ) {
+		$decoded_content = json_decode( $post_content, true );
+		if ( $decoded_content === null ) {
+			// If JSON decoding fails, try to decode the second try with stripslashes and trim.
+			// This is a workaround for some cases where the JSON data is not properly formatted.
+			$decoded_content = json_decode( stripslashes( trim( $post_content ) ), true );
+		}
+
+		if ( $decoded_content === null ) {
+			return array();
+		}
+		$fields = array();
+		foreach ( $decoded_content['fields'] as $field ) {
+			$fields[ $field['key'] ] = Feedback_Field::from_serialized( $field );
+			if ( ! $this->has_file && $fields[ $field['key'] ]->has_file() ) {
+				$this->has_file = true;
 			}
-			$decoded_content['fields'] = $fields;
-			return $decoded_content;
 		}
+		$decoded_content['fields'] = $fields;
+		return $decoded_content;
+	}
 
+	/**
+	 * Parse the legacy content format.
+	 *
+	 * @param string $post_content The post content to parse.
+	 *
+	 * @return array Parsed fields.
+	 */
+	private function parse_legacy_content( $post_content = '' ) {
 		// parse_feedback_content
 		$all_values      = array();
 		$content         = explode( '<!--more-->', $post_content );

From e9673f02a552c962484379a08fa797a3c945e3e9 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 16 Jul 2025 18:51:01 -0700
Subject: [PATCH 26/48] Refactor legacy content parsing in Feedback class

Modularized the parse_legacy_content method by extracting logic into helper methods for splitting content, extracting values and lines, parsing JSON and array formats, and processing fields. This improves readability, maintainability, and separation of concerns in legacy feedback parsing.
---
 .../forms/src/contact-form/class-feedback.php | 201 ++++++++++++++----
 1 file changed, 155 insertions(+), 46 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 08b1c5c21d520..22c3fcc571ebc 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -715,46 +715,136 @@ private function parse_content_v2( $post_content = '' ) {
 	 * @return array Parsed fields.
 	 */
 	private function parse_legacy_content( $post_content = '' ) {
-		// parse_feedback_content
-		$all_values      = array();
+		$content_parts   = $this->split_legacy_content( $post_content );
+		$comment_content = $content_parts['comment_content'];
+		$field_content   = $content_parts['field_content'];
+
+		$all_values = $this->extract_legacy_values( $field_content );
+		$lines      = $this->extract_legacy_lines( $field_content );
+
+		$decoded_fields           = array();
+		$decoded_fields['fields'] = array();
+
+		// Process lines for specific field types
+		$this->process_legacy_lines( $lines, $decoded_fields );
+
+		// Process all other values
+		$this->process_legacy_values( $all_values, $decoded_fields );
+
+		// Add comment content field
+		$this->add_comment_content_field( $comment_content, $decoded_fields );
+
+		return $decoded_fields;
+	}
+
+	/**
+	 * Split legacy content into comment and field sections.
+	 *
+	 * @param string $post_content The post content to parse.
+	 * @return array Array with 'comment_content' and 'field_content' keys.
+	 */
+	private function split_legacy_content( $post_content ) {
 		$content         = explode( '<!--more-->', $post_content );
-		$lines           = array();
 		$comment_content = '';
+		$field_content   = '';
+
 		if ( count( $content ) > 1 ) {
 			$comment_content = $content[0];
-			$content         = str_ireplace( array( '<br />', ')</p>' ), '', $content[1] );
+			$field_content   = str_ireplace( array( '<br />', ')</p>' ), '', $content[1] );
+		}
+
+		return array(
+			'comment_content' => $comment_content,
+			'field_content'   => $field_content,
+		);
+	}
+
+	/**
+	 * Extract values from legacy field content.
+	 *
+	 * @param string $field_content The field content to parse.
+	 * @return array Extracted values.
+	 */
+	private function extract_legacy_values( $field_content ) {
+		$all_values = array();
 
-			if ( str_contains( $content, 'JSON_DATA' ) ) {
-				$chunks = explode( "\nJSON_DATA", $content );
+		if ( str_contains( $field_content, 'JSON_DATA' ) ) {
+			$all_values = $this->parse_json_data( $field_content );
+		} else {
+			$all_values = $this->parse_array_format( $field_content );
+		}
 
-				$all_values = json_decode( $chunks[1], true );
+		// Ensure all_values is always an array
+		if ( ! is_array( $all_values ) ) {
+			$all_values = array();
+		}
 
-				if ( $all_values === null ) {
-					// If JSON decoding fails, try to decode the second try with stripslashes and trim.
-					// This is a workaround for some cases where the JSON data is not properly formatted.
-					$all_values = json_decode( stripslashes( trim( $chunks[1] ) ), true );
-				}
-				$lines = array_filter( explode( "\n", $chunks[0] ) );
-			} else {
-				$fields_array = preg_replace( '/.*Array\s\( (.*)\)/msx', '$1', $content );
-
-				// This line of code is used to parse a string containing key-value pairs formatted as [Key] => Value and extract the keys and values into an array.
-				// The regular expression ensures that each key-value pair is correctly identified and captured.
-				// Given an input string
-				// [Key1] => Value1
-				// [Key2] => Value2
-				// it  $matches[1]: The keys (e.g., Key1, Key2 ).
-				// and $matches[2]: The values (e.g., Value1, Value2 ).
-				preg_match_all( '/^\s*\[([^\]]+)\] =\&gt\; (.*)(?=^\s*(\[[^\]]+\] =\&gt\;)|\z)/msU', $fields_array, $matches );
-
-				if ( count( $matches ) > 1 ) {
-					$all_values = array_combine( array_map( 'trim', $matches[1] ), array_map( 'trim', $matches[2] ) );
-				}
+		return $all_values;
+	}
 
-				$lines = array_filter( explode( "\n", $content ) );
-			}
+	/**
+	 * Extract lines from legacy field content.
+	 *
+	 * @param string $field_content The field content to parse.
+	 * @return array Filtered lines.
+	 */
+	private function extract_legacy_lines( $field_content ) {
+		if ( str_contains( $field_content, 'JSON_DATA' ) ) {
+			$chunks = explode( "\nJSON_DATA", $field_content );
+			return array_filter( explode( "\n", $chunks[0] ) );
+		} else {
+			return array_filter( explode( "\n", $field_content ) );
+		}
+	}
+
+	/**
+	 * Parse JSON data from field content.
+	 *
+	 * @param string $field_content The field content containing JSON data.
+	 * @return array Parsed JSON data.
+	 */
+	private function parse_json_data( $field_content ) {
+		$chunks    = explode( "\nJSON_DATA", $field_content );
+		$json_data = $chunks[1];
+
+		$all_values = json_decode( $json_data, true );
+
+		if ( $all_values === null ) {
+			// Fallback for improperly formatted JSON
+			$all_values = json_decode( stripslashes( trim( $json_data ) ), true );
+		}
+
+		return $all_values === null ? array() : $all_values;
+	}
+
+	/**
+	 * Parse array format from field content.
+	 *
+	 * @param string $field_content The field content in array format.
+	 * @return array Parsed array data.
+	 */
+	private function parse_array_format( $field_content ) {
+		$fields_array = preg_replace( '/.*Array\s\( (.*)\)/msx', '$1', $field_content );
+
+		// Parse key-value pairs formatted as [Key] => Value
+		preg_match_all( '/^\s*\[([^\]]+)\] =\&gt\; (.*)(?=^\s*(\[[^\]]+\] =\&gt\;)|\z)/msU', $fields_array, $matches );
+
+		if ( count( $matches ) > 1 ) {
+			return array_combine( array_map( 'trim', $matches[1] ), array_map( 'trim', $matches[2] ) );
 		}
 
+		return array();
+	}
+
+	/**
+	 * Process legacy lines into field objects.
+	 *
+	 * We do this so that we can extract specific fields but we don't display the values in the UI.
+	 *
+	 * @param array $lines The lines to process.
+	 * @param array &$decoded_fields Reference to the decoded fields array.
+	 */
+	private function process_legacy_lines( $lines, &$decoded_fields ) {
 		$var_map = array(
 			'AUTHOR'       => array(
 				'type'  => 'name',
@@ -778,25 +868,37 @@ private function parse_legacy_content( $post_content = '' ) {
 			),
 		);
 
-		$decoded_fields = array();
-
 		foreach ( $lines as $line ) {
+			$line_parts = explode( ': ', $line, 2 );
 
-			list( $key, $value ) = explode( ': ', $line, 2 );
+			if ( count( $line_parts ) !== 2 ) {
+				continue;
+			}
 
-			if ( ! empty( $key ) ) {
-				if ( isset( $var_map[ $key ] ) ) {
-					$map_to_field                     = $var_map[ $key ];
-					$value                            = self::strip_tags( trim( $value ) );
-					$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $map_to_field['label'], $value, $map_to_field['type'], array( 'render' => false ) );
-				}
+			list( $key, $value ) = $line_parts;
+
+			if ( ! empty( $key ) && isset( $var_map[ $key ] ) ) {
+				$map_to_field = $var_map[ $key ];
+				$value        = self::strip_tags( trim( $value ) );
+
+				$decoded_fields['fields'][ $key ] = new Feedback_Field(
+					$key,
+					$map_to_field['label'],
+					$value,
+					$map_to_field['type'],
+					array( 'render' => false )
+				);
 			}
 		}
-		// All fields should always be an array, even if empty.
-		if ( ! is_array( $all_values ) ) {
-			$all_values = array();
-		}
+	}
 
+	/**
+	 * Process legacy values into field objects.
+	 *
+	 * @param array $all_values The values to process.
+	 * @param array &$decoded_fields Reference to the decoded fields array.
+	 */
+	private function process_legacy_values( $all_values, &$decoded_fields ) {
 		$non_user_fields = array(
 			'email_marketing_consent',
 			'entry_title',
@@ -808,18 +910,27 @@ private function parse_legacy_content( $post_content = '' ) {
 		foreach ( $all_values as $key => $value ) {
 			$key   = wp_strip_all_tags( $key );
 			$label = self::extract_label_from_key( $key );
+
 			if ( in_array( $key, $non_user_fields, true ) ) {
 				$decoded_fields[ $key ] = $value;
-				// Skip fields that are not user-submitted.
 				continue;
 			}
+
 			$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $label, $value );
 
 			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->has_file() ) {
 				$this->has_file = true;
 			}
 		}
+	}
 
+	/**
+	 * Add comment content as a field.
+	 *
+	 * @param string $comment_content The comment content.
+	 * @param array  &$decoded_fields Reference to the decoded fields array.
+	 */
+	private function add_comment_content_field( $comment_content, &$decoded_fields ) {
 		$decoded_fields['fields']['comment_content'] = new Feedback_Field(
 			'comment_content',
 			'Comment Content',
@@ -827,8 +938,6 @@ private function parse_legacy_content( $post_content = '' ) {
 			'textarea',
 			array( 'render' => false )
 		);
-
-		return $decoded_fields;
 	}
 
 	/**

From b6126752f1c623d26dcbe64cf378aaf6bf5606fc Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sat, 19 Jul 2025 17:14:54 -0700
Subject: [PATCH 27/48] Refactor feedback field rendering and API output

Refactored Feedback_Field to support context-aware rendering via get_render_value($context), and made get_render_api_value() private. Updated Feedback to allow flexible compiled field output shapes and context. Adjusted endpoint and tests to use the new API, improving clarity and extensibility for field rendering in different contexts.
---
 .../class-contact-form-endpoint.php           |   2 +-
 .../src/contact-form/class-feedback-field.php |  37 ++++-
 .../forms/src/contact-form/class-feedback.php |  58 +++----
 .../php/contact-form/Feedback_Field_Test.php  |   6 +-
 .../tests/php/contact-form/Feedback_Test.php  | 144 ++++++++++++++++++
 5 files changed, 204 insertions(+), 43 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
index c8fb8ad22b26d..2a72686894d78 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-endpoint.php
@@ -564,7 +564,7 @@ public function prepare_item_for_response( $item, $request ) {
 			$data['subject'] = $response->get_subject();
 		}
 		if ( rest_is_field_included( 'fields', $fields ) ) {
-			$data['fields'] = $response->get_api_fields_values();
+			$data['fields'] = $response->get_compiled_fields( 'api', 'key-value' );
 		}
 
 		if ( rest_is_field_included( 'has_file', $fields ) ) {
diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 35e7b9ce59714..46c56dbdffbad 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -105,9 +105,26 @@ public function render_value() {
 	/**
 	 * Get the value of the field for rendering.
 	 *
+	 * @param string $context The context in which the value is being rendered (default is 'default').
+	 *
 	 * @return string
 	 */
-	public function get_render_value() {
+	public function get_render_value( $context = 'default' ) {
+		switch ( $context ) {
+			case 'api':
+				return $this->get_render_api_value();
+			case 'default':
+			default:
+				return $this->get_render_default_value();
+		}
+	}
+
+	/**
+	 * Get the default value of the field for rendering.
+	 *
+	 * @return string
+	 */
+	private function get_render_default_value() {
 		if ( $this->is_file_field() ) {
 			$files = array();
 			foreach ( $this->value['files'] as &$file ) {
@@ -119,14 +136,13 @@ public function get_render_value() {
 				$file_size = isset( $file['size'] ) ? size_format( $file['size'] ) : '';
 				$files[]   = $file_name . ' (' . $file_size . ')';
 			}
-			$this->value = $files;
-			// If the value is a file field, we can return it as a JSON string
+			return implode( ', ', $files );
 		}
+
 		if ( is_array( $this->value ) ) {
-			// If the value is an array, we can return it as a JSON string.
 			return implode( ', ', $this->value );
 		}
-		// This method is deprecated, use render_value instead.
+
 		return $this->value;
 	}
 
@@ -135,7 +151,7 @@ public function get_render_value() {
 	 *
 	 * @return string
 	 */
-	public function get_render_api_value() {
+	private function get_render_api_value() {
 
 		if ( $this->is_file_field() ) {
 			$files = array();
@@ -182,6 +198,15 @@ public function is_file_field() {
 		return false;
 	}
 
+	/**
+	 * Check if the field should be compiled.
+	 *
+	 * @return bool
+	 */
+	public function compile_field() {
+		return $this->get_meta_key_value( 'render' ) === false;
+	}
+
 	/**
 	 * Check if the field has a file
 	 *
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 22c3fcc571ebc..802fcc4abdac1 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -341,49 +341,41 @@ public function get_old_all_values() {
 	}
 
 	/**
-	 * Get the field values for the API Response.
+	 * Return the compiled fields for the given context.
 	 *
-	 * @return array
-	 */
-	public function get_api_fields_values() {
-		// This is a legacy method to maintain compatibility with older code.
-		// It returns the same values as get_all_values() but is kept for backward compatibility.
-		return array_merge( $this->get_api_all_values() );
-	}
-
-	/**
-	 * Get the computed fields
-	 *
-	 * Computed fields is an array of fields that have a label and a value.
+	 * @param string $context The context in which the fields are compiled.
+	 * @param string $array_shape The shape of the array to return. Can be 'all', 'value', 'label', or 'key-value'.
 	 *
-	 * @return array
+	 * @return array An array of compiled fields with labels and values.
 	 */
-	public function get_compiled_fields() {
+	public function get_compiled_fields( $context = 'default', $array_shape = 'all' ) {
 		$compiled_fields = array();
 		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta_key_value( 'render' ) === false ) {
+			if ( $field->compile_field( $context ) ) {
 				continue; // Skip fields that are not meant to be rendered.
 			}
-			$compiled_fields[ $field->get_key() ] = array(
-				'label' => $field->get_label(),
-				'value' => $field->get_render_value(),
-			);
-		}
-		return $compiled_fields;
-	}
 
-	/**
-	 * Get all the values of the response for API.
-	 */
-	private function get_api_all_values() {
-		$values = array();
-		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta_key_value( 'render' ) === false ) {
-				continue; // Skip fields that are not meant to be rendered.
+			// Compile the field based on the requested shape.
+			switch ( $array_shape ) {
+				case 'all':
+					$compiled_fields[ $field->get_key() ] = array(
+						'label' => $field->get_label( $context ),
+						'value' => $field->get_render_value( $context ),
+					);
+					break;
+				case 'value':
+					$compiled_fields[] = $field->get_render_value( $context );
+					break;
+				case 'label':
+					$compiled_fields[] = $field->get_label( $context );
+					break;
+				case 'key-value':
+					$compiled_fields[ $field->get_key() ] = $field->get_render_value( $context );
+					break;
 			}
-			$values[ $field->get_key() ] = $field->get_render_api_value();
 		}
-		return $values;
+
+		return $compiled_fields;
 	}
 
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index b506b657345a7..18548fd349ad1 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -162,10 +162,10 @@ public function test_has_file() {
 
 	public function test_get_render_api_value() {
 		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
-		$this->assertEquals( 'test_value', $field->get_render_api_value() );
+		$this->assertEquals( 'test_value', $field->get_render_value( 'api' ) );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
-		$this->assertEquals( 'value1, value2', $field->get_render_api_value() );
+		$this->assertEquals( 'value1, value2', $field->get_render_value( 'api' ) );
 
 		$expected = array(
 			'files' => array(
@@ -193,7 +193,7 @@ public function test_get_render_api_value() {
 		);
 
 		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
-		$this->assertSame( $expected, $field->get_render_api_value() );
+		$this->assertSame( $expected, $field->get_render_value( 'api' ) );
 		remove_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
 	}
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 63409551abeab..7915a6430bb2f 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -12,6 +12,7 @@
 require_once __DIR__ . '/class-utility.php'; // phpcs:ignore WordPressVIPMinimum.Files.IncludingFile.NotAbsolutePath
 
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 use WorDBless\BaseTestCase;
 
 /**
@@ -1309,4 +1310,147 @@ public function test_strip_tags_handles_mixed_array() {
 		$this->assertEquals( 'Test & case', $result['array']['nested_string'] );
 		$this->assertSame( '3.14', $result['array']['nested_number'] );
 	}
+
+	/**
+	 * ======================================================
+	 * Tests for the get_compiled_fields method in Feedback class.
+	 * ======================================================
+	 *
+	 * Test that get_compiled_fields returns empty array for feedback without fields.
+	 */
+	public function test_get_compiled_fields_returns_default_fields_for_empty_form() {
+		// default form will have email, name, url, message fields
+		$form       = new Contact_Form( array() );
+		$_post_data = array();
+		$response   = Feedback::from_submission( $_post_data, $form );
+
+		$compiled_fields = $response->get_compiled_fields();
+
+		$default_form = array(
+			'1_Name'    => array(
+				'label' => 'Name',
+				'value' => '',
+			),
+			'2_Email'   => array(
+				'label' => 'Email',
+				'value' => '',
+			),
+			'3_Website' => array(
+				'label' => 'Website',
+				'value' => '',
+			),
+			'4_Message' => array(
+				'label' => 'Message',
+				'value' => '',
+			),
+		);
+
+		$this->assertEquals( $default_form, $compiled_fields );
+	}
+
+	/**
+	 * Data provider for get_compiled_fields test cases.
+	 *
+	 * @return array Test data with different field format expectations.
+	 */
+	public static function get_compiled_fields_data_provider() {
+		$test_name    = 'John Smith';
+		$test_email   = 'john.smith@example.com';
+		$test_website = 'https://johnsmith.dev';
+		$test_message = 'Hello, this is a test message from our contact form.';
+
+		return array(
+			'all_format'       => array(
+				'format'   => 'all',
+				'expected' => array(
+					'1_Name'    => array(
+						'label' => 'Name',
+						'value' => $test_name,
+					),
+					'2_Email'   => array(
+						'label' => 'Email',
+						'value' => $test_email,
+					),
+					'3_Website' => array(
+						'label' => 'Website',
+						'value' => $test_website,
+					),
+					'4_Message' => array(
+						'label' => 'Message',
+						'value' => $test_message,
+					),
+				),
+				'message'  => 'Compiled fields should match the default form structure with all field data.',
+			),
+			'key_value_format' => array(
+				'format'   => 'key-value',
+				'expected' => array(
+					'1_Name'    => $test_name,
+					'2_Email'   => $test_email,
+					'3_Website' => $test_website,
+					'4_Message' => $test_message,
+				),
+				'message'  => 'Compiled fields should return key-value pairs only.',
+			),
+			'value_format'     => array(
+				'format'   => 'value',
+				'expected' => array(
+					$test_name,
+					$test_email,
+					$test_website,
+					$test_message,
+				),
+				'message'  => 'Compiled fields should return only values as indexed array.',
+			),
+			'label_format'     => array(
+				'format'   => 'label',
+				'expected' => array(
+					'Name',
+					'Email',
+					'Website',
+					'Message',
+				),
+				'message'  => 'Compiled fields should return only labels as indexed array.',
+			),
+		);
+	}
+
+	/**
+	 * Test get_compiled_fields with different output formats.
+	 *
+	 * @dataProvider get_compiled_fields_data_provider
+	 *
+	 * @param string $format   The format parameter for get_compiled_fields.
+	 * @param array  $expected The expected output.
+	 * @param string $message  The assertion message.
+	 */
+	#[DataProvider( 'get_compiled_fields_data_provider' )]
+	public function test_get_compiled_fields_shapes( $format, $expected, $message ) {
+		// Test data
+		$test_name    = 'John Smith';
+		$test_email   = 'john.smith@example.com';
+		$test_website = 'https://johnsmith.dev';
+		$test_message = 'Hello, this is a test message from our contact form.';
+
+		$form_id = Utility::get_form_id();
+		// Create a form submission
+		$_post_data = Utility::get_post_request(
+			array(
+				'name'    => $test_name,
+				'email'   => $test_email,
+				'website' => $test_website,
+				'message' => $test_message,
+			),
+			'g' . $form_id
+		);
+
+		// Test that get_compiled_fields returns the correct structure for a default form
+		$form     = new Contact_Form( array() );
+		$response = Feedback::from_submission( $_post_data, $form );
+
+		// Test the specified format
+		$compiled_fields = $response->get_compiled_fields( 'default', $format );
+
+		$this->assertEquals( $expected, $compiled_fields, $message );
+	}
 }

From b66d8f9ac995822b9910ee4fe0bda5b04a712516 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 08:12:33 -0700
Subject: [PATCH 28/48] Add context csv

---
 .../forms/src/contact-form/class-contact-form-plugin.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index 293bec5bb58d3..d0b54af96a437 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -2254,7 +2254,7 @@ public static function get_export_feedback_data( $feedback_ids ) {
 				if ( ! isset( $results[ $single_field_name ] ) ) {
 					$results[ $single_field_name ] = array();
 				}
-				$results[ $single_field_name ][] = $feedback->get_field_value_by_label( $single_field_name );
+				$results[ $single_field_name ][] = $feedback->get_field_value_by_label( $single_field_name, 'csv' );
 			}
 
 			$results[ __( 'Consent', 'jetpack-forms' ) ][]    = $feedback->has_consent() ? __( 'Yes', 'jetpack-forms' ) : __( 'No', 'jetpack-forms' );

From 6abcaa7abb409e2a49b16e301ab46e63d0437472 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 08:13:24 -0700
Subject: [PATCH 29/48] Add more context

---
 .../forms/src/contact-form/class-feedback.php | 52 ++++++-------------
 1 file changed, 15 insertions(+), 37 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 802fcc4abdac1..9446f60495161 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -228,14 +228,15 @@ private function get_field_value( $key, $post_data ) {
 	 * Get the computed fields from the post data.
 	 *
 	 * @param string $label The label of the field to look for.
+	 * @param string $context The context in which the value is being rendered (default is 'default').
 	 *
 	 * @return string The Value of the field.
 	 */
-	public function get_field_value_by_label( $label ) {
+	public function get_field_value_by_label( $label, $context = 'default' ) {
 		// This method is used to get the value of a field by its label.
 		foreach ( $this->fields as $field ) {
 			if ( $field->get_label() === $label ) {
-				return $field->get_render_value();
+				return $field->get_render_value( $context );
 			}
 		}
 		return '';
@@ -245,10 +246,11 @@ public function get_field_value_by_label( $label ) {
 	 *
 	 * @param string      $type The type of the field to look for.
 	 * @param string|null $filter Optional filter to apply to the value.
+	 * @param string      $context The context in which the value is being rendered (default is 'default').
 	 *
 	 * @return string The value of the first field of the specified type, or an empty string if not found.
 	 */
-	private function get_first_field_of_type( $type, $filter = null ) {
+	private function get_first_field_of_type( $type, $filter = null, $context = 'default' ) {
 		// This method is used to get the first field of a specific type.
 		foreach ( $this->fields as $field ) {
 			if ( $field->get_type() === $type ) {
@@ -256,11 +258,11 @@ private function get_first_field_of_type( $type, $filter = null ) {
 					return self::strip_tags(
 						stripslashes(
 							/** This filter is already documented in core/wp-includes/comment-functions.php */
-							\apply_filters( $filter, addslashes( $field->get_render_value() ) )
+							\apply_filters( $filter, addslashes( $field->get_render_value( $context ) ) )
 						)
 					);
 				}
-				return $field->get_render_value();
+				return $field->get_render_value( $context );
 			}
 		}
 		return '';
@@ -273,26 +275,6 @@ public function get_fields() {
 		return $this->fields;
 	}
 
-	/**
-	 * Get all the values of the response.
-	 *
-	 * This is a convenience method to get all values in a simple array format.
-	 *
-	 * This is done for backwards compatibility. Use `get_fields()` instead.
-	 *
-	 * @return array
-	 */
-	private function get_all_values() {
-		$values = array();
-		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta_key_value( 'render' ) === false ) {
-				continue; // Skip fields that are not meant to be rendered.
-			}
-			$values[ $field->get_key() ] = $field->get_render_value();
-		}
-		return $values;
-	}
-
 	/**
 	 * Get the field name for the CSV export.
 	 *
@@ -332,12 +314,11 @@ private function get_entry_values() {
 	/**
 	 * Get all values of the response.
 	 *
-	 * @return array
+	 * @return array An array of all values, including fields and entry values.
 	 */
-	public function get_old_all_values() {
+	public function get_all_values() {
 		// This is a legacy method to maintain compatibility with older code.
-		// It returns the same values as get_all_values() but is kept for backward compatibility.
-		return array_merge( $this->get_all_values(), $this->get_entry_values() );
+		return array_merge( $this->get_compiled_fields( 'default', 'key-value' ), $this->get_entry_values() );
 	}
 
 	/**
@@ -426,14 +407,11 @@ public function get_akismet_vars() {
 			'comment_content'      => empty( $this->get_comment_content() ) ? null : $this->get_comment_content(),
 		);
 
-		$field_ids = $this->form->get_field_ids();
-
-		foreach ( array_merge( $field_ids['all'], $field_ids['extra'] ) as $field_id ) {
-			$field = $this->form->fields[ $field_id ];
+		foreach ( $this->fields as $field ) {
 
 			// Skip any fields that are just a choice from a pre-defined list. They wouldn't have any value
 			// from a spam-filtering point of view.
-			if ( in_array( $field->get_attribute( 'type' ), array( 'select', 'checkbox', 'checkbox-multiple', 'radio', 'file' ), true ) ) {
+			if ( in_array( $field->get_type(), array( 'select', 'checkbox', 'checkbox-multiple', 'radio', 'file' ), true ) ) {
 				continue;
 			}
 
@@ -442,12 +420,12 @@ public function get_akismet_vars() {
 				preg_replace(   // Normalize everything to a-z0-9_-
 					'/[^a-z0-9_]+/',
 					'-',
-					strtolower( $field->get_attribute( 'label' ) ) // Lowercase
+					strtolower( $field->get_label() ) // Lowercase
 				),
 				'-'
 			);
 
-			$field_value = ( is_array( $field->value ) ) ? trim( implode( ', ', $field->value ) ) : trim( $field->value );
+			$field_value = $field->get_render_value( 'akismet' );
 
 			// Skip any values that are already in the array we're sending.
 			if ( $field_value && in_array( $field_value, $akismet_vars, true ) ) {
@@ -1030,7 +1008,7 @@ private function get_computed_subject( $post_data, $form ) {
 			}
 		}
 
-		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
+		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_compiled_fields( 'default', 'key-value' ) );
 	}
 
 	/**

From 7f539634fe193c94ae044a57152e63a863842c95 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 08:51:27 -0700
Subject: [PATCH 30/48] Fixing php phan issues

---
 .../src/contact-form/class-contact-form.php   |  2 +-
 .../forms/src/contact-form/class-feedback.php |  2 +-
 .../php/contact-form/Contact_Form_Test.php    |  6 ++--
 .../tests/php/contact-form/Feedback_Test.php  | 18 +++++------
 .../tests/php/contact-form/class-utility.php  | 31 ++++++++++++-------
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index 5da39c198478f..f42e416f28ae6 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -894,7 +894,7 @@ public static function get_compiled_form( $feedback_id, $form = null ) {
 	/**
 	 * Returns the JSON data for the form submission.
 	 *
-	 * @param int $feedback_id - the feedback ID.
+	 * @param int               $feedback_id - the feedback ID.
 	 * @param Contact_Form|null $form - the contact form object. This parameter is deprecated and no longer used.
 	 *
 	 * @return array $json_data
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 9446f60495161..53abc4724472d 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -294,7 +294,7 @@ public function get_csv_field_names() {
 	/**
 	 * Get the values related to where the form was submitted from.
 	 *
-	 * @return $array
+	 * @return array An array of entry values.
 	 */
 	private function get_entry_values() {
 		// This is a convenience method to get the entry values in a simple array format.
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index 288031575aa2f..ca08f354985fa 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -1858,7 +1858,7 @@ function ( $id ) {
 	}
 
 	public function test_export_csv_legacy_data() {
-		global $post;
+
 		$current_post    = Utility::create_post_context();
 		$post_ids        = array();
 		$post_ids[]      = Utility::create_legacy_feedback(
@@ -1885,14 +1885,14 @@ public function test_export_csv_legacy_data() {
 				'field_A'    => array( 'value1', 'value1' ),
 				'field_B'    => array( 'value2', '' ),
 				'field_C'    => array( '', 'value2' ),
-				'Source'     => array( '/?p=' . $post->ID, '/?p=' . $post->ID ),
+				'Source'     => array( '/?p=' . $current_post->ID, '/?p=' . $current_post->ID ),
 				'Consent'    => array( $default_consent, $default_consent ),
 				'IP Address' => array( $ip, $ip ),
 
 			),
 			Contact_Form_Plugin::get_export_feedback_data( $post_ids )
 		);
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 	}
 
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 7915a6430bb2f..abb46cf912115 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -414,7 +414,7 @@ public function test_computed_form_subject_field_overwrites_filter() {
 		$response       = Feedback::from_submission( $_post_data, $form );
 		$post_id        = $response->save();
 		$saved_response = Feedback::get( $post_id );
-		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ), 10, 2 );
+		remove_filter( 'contact_form_subject', array( $this, 'subject_from_filter' ) );
 
 		$this->assertEquals( 'Overwritten Subject (from filter)', $response->get_subject(), 'Subject should match the form submission' );
 		$this->assertEquals( 'Overwritten Subject (from filter)', $saved_response->get_subject(), 'Subject should match the saved form submission' );
@@ -877,7 +877,7 @@ public function test_empty_consent() {
 	public function test_compute_entry_ID_legacy() {
 		$current_post = Utility::create_post_context();
 		$post_id      = Utility::create_legacy_feedback();
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 		$saved_response = Feedback::get( $post_id );
 
 		$this->assertSame( $current_post->ID, $saved_response->get_entry_id(), 'Entry_ID should match the saved form submission' );
@@ -905,7 +905,7 @@ public function test_compute_entry_ID() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 
 		$saved_response = Feedback::get( $post_id );
 		$this->assertEquals( $current_post->ID, $response->get_entry_id(), 'Entry_ID should match the form submission' );
@@ -935,7 +935,7 @@ public function test_compute_entry_title() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 
 		$this->assertEquals( $current_post->post_title, $response->get_entry_title(), 'Post title should match the form submission' );
 		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post title should match the saved form submission' );
@@ -973,7 +973,7 @@ public function test_compute_entry_title_updated() {
 		);
 
 		$saved_response = Feedback::get( $post_id );
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 
 		$this->assertEquals( $update_title, $saved_response->get_entry_title(), 'Post Title should match the new updated title saved form submission' );
 	}
@@ -999,7 +999,7 @@ public function test_compute_entry_title_deleted() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 
 		$this->assertSame( '', get_the_title( $current_post->ID ), 'Post title should not be available after the post is deleted' );
 		// At this point we should have a deleted post.
@@ -1032,7 +1032,7 @@ public function test_compute_entry_permalink() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 		$current_permalink = get_the_permalink( $current_post );
 		$this->assertEquals( $current_permalink, $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 
@@ -1060,7 +1060,7 @@ public function test_compute_entry_permalink_deleted_post() {
 
 		$response = Feedback::from_submission( $_post_data, $form, $current_post );
 		$post_id  = $response->save();
-		Utility::destroy_post_context(); // Destroy the post context to simulate a deleted post.
+		Utility::destroy_post_context( $current_post ); // Destroy the post context to simulate a deleted post.
 		$saved_response = Feedback::get( $post_id );
 		$this->assertEmpty( $saved_response->get_entry_permalink(), 'Post permalink should match the form submission' );
 	}
@@ -1088,7 +1088,7 @@ public function test_compute_entry_permalink_with_page_number() {
 		$post_id  = $response->save();
 
 		$saved_response = Feedback::get( $post_id );
-		Utility::destroy_post_context();
+		Utility::destroy_post_context( $current_post );
 
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 		$this->assertStringContainsString( 'page=999', $saved_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
diff --git a/projects/packages/forms/tests/php/contact-form/class-utility.php b/projects/packages/forms/tests/php/contact-form/class-utility.php
index 9fa60be0a700f..88db3ab097a50 100644
--- a/projects/packages/forms/tests/php/contact-form/class-utility.php
+++ b/projects/packages/forms/tests/php/contact-form/class-utility.php
@@ -20,7 +20,7 @@ class Utility {
 	 * @param string|null $subject                  The subject of the feedback.
 	 * @param string|null $status                   The status of the post (default is 'publish').
 	 *
-	 * @return int|WP_Error The ID of the created post on success, or a WP_Error object on failure.
+	 * @return int|\WP_Error The ID of the created post on success, or a WP_Error object on failure.
 	 */
 	public static function create_legacy_feedback(
 		$all_values = array(),
@@ -93,8 +93,18 @@ public static function add_post_request( $values, $form_id = null, $post_id = 0
 		}
 	}
 
+	/**
+	 * Gets the form ID from the attributes.
+	 *
+	 * @param array $attributes The form attributes.
+	 * @return string The form ID.
+	 */
 	public static function get_form_id( $attributes = array() ) {
 		global $post, $page;
+		// Ensure 'id' exists in $attributes before trying to use it
+		if ( ! isset( $attributes['id'] ) ) {
+			$attributes['id'] = '';
+		}
 
 		$count = Contact_Form::get_forms_count();
 
@@ -110,11 +120,6 @@ public static function get_form_id( $attributes = array() ) {
 		}
 
 		if ( $count ) {
-			// Ensure 'id' exists in $attributes before trying to modify it
-			if ( ! isset( $attributes['id'] ) ) {
-				$attributes['id'] = '';
-			}
-
 			// When submitting the page number is not always set, so we need to handle that: TODO: This is a hack, we need to find a better way to handle form identification
 			$page_num = max( 1, intval( $page ) );
 
@@ -159,13 +164,17 @@ public static function create_post_context() {
 		$post = get_post( $post_id );
 		return $post;
 	}
-
-	public static function destroy_post_context() {
-		global $post;
+	/**
+	 * Destroys the post context.
+	 *
+	 * @param \WP_Post $post The post object to destroy.
+	 */
+	public static function destroy_post_context( $post ) {
 		if ( $post ) {
-			wp_delete_user( $post->post_author, true );
+			if ( is_int( $post->post_author ) ) {
+				wp_delete_user( (int) $post->post_author );
+			}
 			wp_delete_post( $post->ID, true );
-			$post = null;
 		}
 	}
 }

From 1e414becf28e99efef07dd35e0411f5ce405e62d Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 09:21:56 -0700
Subject: [PATCH 31/48] Improve test coverage

---
 .../class-contact-form-plugin.php             |  2 +-
 .../forms/src/contact-form/class-feedback.php | 19 -------------------
 .../tests/php/contact-form/Feedback_Test.php  |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index d0b54af96a437..8ac695c0f3193 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -2227,7 +2227,7 @@ public static function get_export_feedback_data( $feedback_ids ) {
 
 		foreach ( $feedback_ids as $feedback_id ) {
 			$feedback_data[ $feedback_id ] = Feedback::get( $feedback_id );
-			$field_names                   = array_merge( $field_names, $feedback_data[ $feedback_id ]->get_csv_field_names() );
+			$field_names                   = array_merge( $field_names, $feedback_data[ $feedback_id ]->get_compiled_fields( 'csv', 'label' ) );
 		}
 
 		/**
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 53abc4724472d..faaa055d46c2a 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -275,22 +275,6 @@ public function get_fields() {
 		return $this->fields;
 	}
 
-	/**
-	 * Get the field name for the CSV export.
-	 *
-	 * @return array An array of field names.
-	 */
-	public function get_csv_field_names() {
-		$values = array();
-		foreach ( $this->fields as $field ) {
-			if ( $field->get_meta_key_value( 'render' ) === false ) {
-				continue; // Skip fields that are not meant to be rendered.
-			}
-			$values[] = $field->get_label();
-		}
-		return $values;
-	}
-
 	/**
 	 * Get the values related to where the form was submitted from.
 	 *
@@ -620,9 +604,6 @@ public function serialize() {
 
 		$fields_to_serialize['fields'] = array();
 		foreach ( $this->fields as $field ) {
-			if ( ! $field instanceof Feedback_Field ) {
-				continue;
-			}
 			$fields_to_serialize['fields'][] = $field->serialize();
 		}
 
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index abb46cf912115..18a61ba16a8b4 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -1092,6 +1092,7 @@ public function test_compute_entry_permalink_with_page_number() {
 
 		$this->assertStringContainsString( 'page=999', $response->get_entry_permalink(), 'Post permalink should match the form submission' );
 		$this->assertStringContainsString( 'page=999', $saved_response->get_entry_permalink(), 'Post permalink should match the saved form submission' );
+		$this->assertStringContainsString( 'page=999', $saved_response->get_entry_short_permalink(), 'Post short relative path permalink should match the saved form submission' );
 	}
 
 	public function test_feedback_title() {

From fb3dc00908da6f97a1d56fd4f791756bff05e590 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 09:30:06 -0700
Subject: [PATCH 32/48] Fix typo in method name for author info retrieval

Renamed get_computer_author_info to get_computed_author_info in Feedback_Author to correct a typo and ensure consistency in method naming.
---
 .../forms/src/contact-form/class-feedback-author.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback-author.php b/projects/packages/forms/src/contact-form/class-feedback-author.php
index 1ced9af71293d..25d0614fd5721 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-author.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-author.php
@@ -57,9 +57,9 @@ public function __construct( $name = '', $email = '', $url = '' ) {
 	 */
 	public static function from_submission( $post_data, $form ) {
 		return new self(
-			self::get_computer_author_info( $post_data, 'name', 'pre_comment_author_name', $form ),
-			self::get_computer_author_info( $post_data, 'email', 'pre_comment_author_email', $form ),
-			self::get_computer_author_info( $post_data, 'url', 'pre_comment_author_url', $form )
+			self::get_computed_author_info( $post_data, 'name', 'pre_comment_author_name', $form ),
+			self::get_computed_author_info( $post_data, 'email', 'pre_comment_author_email', $form ),
+			self::get_computed_author_info( $post_data, 'url', 'pre_comment_author_url', $form )
 		);
 	}
 
@@ -73,7 +73,7 @@ public static function from_submission( $post_data, $form ) {
 	 *
 	 * @return string Filter value for the author information.
 	 */
-	private static function get_computer_author_info( $post_data, $type, $filter, $form ) {
+	private static function get_computed_author_info( $post_data, $type, $filter, $form ) {
 		$field_ids = $form->get_field_ids();
 		if ( isset( $field_ids[ $type ] ) ) {
 			$key   = $field_ids[ $type ];

From 9de7a06f13e6f200001f5951c0df3cbc7e727d94 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 09:41:15 -0700
Subject: [PATCH 33/48] Rename legacy feedback properties in Feedback class

Renamed $feedback_id and $feedback_title to $legacy_feedback_id and $legacy_feedback_title throughout the Feedback class to clarify their legacy status and indicate they are not used in the new feedback system. Updated all references, getters, and related logic accordingly.
---
 .../forms/src/contact-form/class-feedback.php | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index faaa055d46c2a..1bf9cc8ec1c2a 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -57,20 +57,20 @@ class Feedback {
 	/**
 	 * Feedback ID of the feedback entry.
 	 *
-	 * @todo: figure out how this is used if at all.
+	 * Marked as legacy because it is not used in the new feedback system.
 	 *
 	 * @var string
 	 */
-	protected $feedback_id = '';
+	protected $legacy_feedback_id = '';
 
 	/**
 	 * The title of the feedback entry.
 	 *
-	 * This is used to store the title of the feedback entry.
+	 * Marked as legacy because it is not used in the new feedback system.
 	 *
 	 * @var string
 	 */
-	protected $feedback_title = '';
+	protected $legacy_feedback_title = '';
 
 	/**
 	 * The time of the feedback entry.
@@ -138,9 +138,9 @@ private function load_from_post( WP_Post $feedback_post ) {
 
 		$parsed_content = $this->parse_content( $feedback_post->post_content, $feedback_post->post_mime_type );
 
-		$this->status        = $feedback_post->post_status;
-		$this->feedback_id   = $feedback_post->post_name;
-		$this->feedback_time = $feedback_post->post_date;
+		$this->status             = $feedback_post->post_status;
+		$this->legacy_feedback_id = $feedback_post->post_name;
+		$this->feedback_time      = $feedback_post->post_date;
 
 		$this->fields = $parsed_content['fields'] ?? array();
 
@@ -162,7 +162,7 @@ private function load_from_post( WP_Post $feedback_post ) {
 		$this->comment_content = $this->get_first_field_of_type( 'textarea' );
 		$this->has_consent     = ( $this->get_first_field_of_type( 'consent' ) === 'Yes' );
 
-		$this->feedback_title = $feedback_post->post_title ? $feedback_post->post_title : $this->get_author() . ' - ' . $feedback_post->post_date;
+		$this->legacy_feedback_title = $feedback_post->post_title ? $feedback_post->post_title : $this->get_author() . ' - ' . $feedback_post->post_date;
 	}
 
 	/**
@@ -200,9 +200,9 @@ private function load_from_submission( $post_data, $form, $current_post = null,
 		$this->comment_content = $this->get_computed_comment_content( $post_data, $form );
 		$this->has_consent     = $this->get_computed_consent( $post_data, $form );
 
-		$this->feedback_time  = current_time( 'mysql' );
-		$this->feedback_title = "{$this->get_author()} - {$this->feedback_time}";
-		$this->feedback_id    = md5( $this->feedback_title );
+		$this->feedback_time         = current_time( 'mysql' );
+		$this->legacy_feedback_title = "{$this->get_author()} - {$this->feedback_time}";
+		$this->legacy_feedback_id    = md5( $this->legacy_feedback_title );
 	}
 
 	/**
@@ -286,7 +286,7 @@ private function get_entry_values() {
 			'email_marketing_consent' => (string) $this->has_consent,
 			'entry_title'             => $this->entry->get_title(),
 			'entry_permalink'         => $this->entry->get_permalink(),
-			'feedback_id'             => $this->feedback_id,
+			'feedback_id'             => $this->legacy_feedback_id,
 		);
 
 		if ( $this->entry->get_page_number() > 1 ) {
@@ -351,7 +351,7 @@ public function get_compiled_fields( $context = 'default', $array_shape = 'all'
 	 * @return string
 	 */
 	public function get_feedback_id() {
-		return $this->feedback_id;
+		return $this->legacy_feedback_id;
 	}
 
 	/**
@@ -362,7 +362,7 @@ public function get_feedback_id() {
 	 * @return string
 	 */
 	public function get_title() {
-		return $this->feedback_title;
+		return $this->legacy_feedback_title;
 	}
 
 	/**
@@ -574,9 +574,9 @@ public function save() {
 			array(
 				'post_type'      => self::POST_TYPE,
 				'post_status'    => $this->status,
-				'post_title'     => $this->feedback_title,
+				'post_title'     => $this->legacy_feedback_title,
 				'post_date'      => $this->feedback_time,
-				'post_name'      => $this->feedback_id,
+				'post_name'      => $this->legacy_feedback_id,
 				'post_content'   => $this->serialize(),
 				'post_mime_type' => 'v2', // a way to help us identify what version of the data this is.
 				'post_parent'    => $this->entry->get_id(),

From fe12680eab5649e3a35b37050236e9369d7e7541 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 10:12:42 -0700
Subject: [PATCH 34/48] Add more Feedback tests

---
 .../forms/src/contact-form/class-feedback.php |   2 +-
 .../tests/php/contact-form/Feedback_Test.php  | 154 ++++++++++++++++++
 2 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 1bf9cc8ec1c2a..26c92764556af 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -989,7 +989,7 @@ private function get_computed_subject( $post_data, $form ) {
 			}
 		}
 
-		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_compiled_fields( 'default', 'key-value' ) );
+		return apply_filters( 'contact_form_subject', $contact_form_subject, $this->get_all_values() );
 	}
 
 	/**
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 18a61ba16a8b4..bda2e0b938063 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -1009,6 +1009,160 @@ public function test_compute_entry_title_deleted() {
 		$this->assertEquals( $current_post->post_title, $saved_response->get_entry_title(), 'Post Title should match the saved form submission Original post title' );
 	}
 
+	public function test_get_all_values() {
+		// Test that the get_all_values method returns all values from the form submission.
+
+		$current_post = Utility::create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$_post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response            = Feedback::from_submission( $_post_data, $form, $current_post );
+		$post_id             = $response->save();
+		$response_all_values = $response->get_all_values();
+		$saved_response      = Feedback::get( $post_id );
+		Utility::destroy_post_context( $current_post );
+		$saved_all_values = $saved_response->get_all_values();
+
+		$this->assertEquals(
+			$response_all_values,
+			$saved_all_values,
+			'All values from the form submission should match the saved form submission'
+		);
+
+		$keys = array(
+			'1_Email',
+			'email_marketing_consent',
+			'entry_title',
+			'entry_permalink',
+			'feedback_id',
+		);
+
+		foreach ( $keys as $key ) {
+			$this->assertArrayHasKey( $key, $response_all_values, "Key '$key' should be present in the all values array" );
+			$this->assertArrayHasKey( $key, $saved_all_values, "Key '$key' should be present in the saved all values array" );
+		}
+		$this->assertArrayNotHasKey( 'entry_page', $response_all_values, 'Key entry_page should not be present in the all values array' );
+	}
+
+	public function test_get_all_values_with_page_number() {
+		// Test that the get_all_values method returns all values from the form submission.
+
+		$current_post = Utility::create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$_post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response            = Feedback::from_submission( $_post_data, $form, $current_post, 888 );
+		$post_id             = $response->save();
+		$response_all_values = $response->get_all_values();
+		$saved_response      = Feedback::get( $post_id );
+		Utility::destroy_post_context( $current_post );
+		$saved_all_values = $saved_response->get_all_values();
+
+		$this->assertEquals(
+			$response_all_values,
+			$saved_all_values,
+			'All values from the form submission should match the saved form submission'
+		);
+
+		$keys = array(
+			'1_Email',
+			'email_marketing_consent',
+			'entry_title',
+			'entry_permalink',
+			'feedback_id',
+			'entry_page',
+		);
+
+		foreach ( $keys as $key ) {
+			$this->assertArrayHasKey( $key, $response_all_values, "Key '$key' should be present in the all values array" );
+			$this->assertArrayHasKey( $key, $saved_all_values, "Key '$key' should be present in the saved all values array" );
+		}
+		$this->assertEquals( 888, $response_all_values['entry_page'], 'Key entry_page should be present in the all values array' );
+		$this->assertEquals( 888, $saved_all_values['entry_page'], 'Key entry_page should be present in the saved all values array' );
+
+		$this->assertStringContainsString(
+			'page=888',
+			$response_all_values['entry_permalink'],
+			'Entry permalink should contain the page number'
+		);
+	}
+
+	public function test_get_akismet_vars() {
+		// Test that the get_akismet_vars method returns the correct variables for Akismet.
+
+		$current_post = Utility::create_post_context();
+		$form_id      = Utility::get_form_id();
+		// Create a form submission
+		$_post_data = Utility::get_post_request(
+			array(
+				'email' => 'email@email.com',
+				'name'  => 'Test User',
+				'text'  => 'This is a test message.',
+				'url'   => 'https://www.example.com',
+			),
+			'g' . $form_id
+		);
+
+		$form = new Contact_Form(
+			array(
+				'title'       => 'Test Form',
+				'description' => 'This is a test form.',
+			),
+			"[contact-field label='Url' type='url' required='1'/][contact-field label='Text' type='text' required='1'/][contact-field label='Name' type='name' required='1'/][contact-field label='Email' type='email' required='1'/]"
+		);
+
+		$response = Feedback::from_submission( $_post_data, $form, $current_post );
+		$post_id  = $response->save();
+
+		$saved_response = Feedback::get( $post_id );
+		Utility::destroy_post_context( $current_post );
+
+		$this->assertNotEmpty( $response->get_akismet_vars(), 'Akismet vars should not be empty for the form submission' );
+		$this->assertEquals( $saved_response->get_akismet_vars(), $response->get_akismet_vars(), 'Post ID should match the form submission' );
+		$assert_keys = array(
+			'comment_author',
+			'comment_author_email',
+			'comment_author_url',
+			'contact_form_subject',
+			'comment_author_ip',
+			'comment_content',
+			'contact_form_field_text',
+		);
+
+		foreach ( $assert_keys as $key ) {
+			$this->assertArrayHasKey( $key, $response->get_akismet_vars(), "Akismet vars should contain '$key'" );
+			$this->assertArrayHasKey( $key, $saved_response->get_akismet_vars(), "Akismet vars should contain '$key'" );
+		}
+	}
+
 	public function test_compute_entry_permalink() {
 		$current_post = Utility::create_post_context();
 		$form_id      = Utility::get_form_id();

From 6d69cbbcd9aa5013c1411f8f2bc58a2f74a7297d Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 10:18:44 -0700
Subject: [PATCH 35/48] Add form count test

---
 .../forms/tests/php/contact-form/Contact_Form_Test.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index ca08f354985fa..035206ae275fc 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -2527,4 +2527,14 @@ public function test_get_instance_from_jwt_returns_null_for_invalid_jwt() {
 
 		Constants::clear_single_constant( 'JETPACK_BLOG_TOKEN' );
 	}
+
+	public function test_get_forms_count() {
+
+		$count = Contact_Form::get_forms_count();
+		// Create a new form.
+		new Contact_Form( array() );
+		$new_count = Contact_Form::get_forms_count();
+
+		$this->assertEquals( $count + 1, $new_count, 'The count should increase by 1 after creating a new form.' );
+	}
 } // end class

From d4a59723b88e00107b9ed1c5dff183e057f005dc Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 10:21:20 -0700
Subject: [PATCH 36/48] Move the test

---
 .../contact-form/Contact_Form_Plugin_Test.php | 38 +++++++++++++++++++
 .../php/contact-form/Contact_Form_Test.php    | 38 -------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
index 20fc6e9a4f610..cef0573cbc42d 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
@@ -594,4 +594,42 @@ private function teardown_post_for_test( $previous_post ) {
 	public function return_error_for_test() {
 		return new WP_Error( 'check_spam', 'check_spam form submission.' );
 	}
+
+	public function test_export_csv_legacy_data() {
+
+		$current_post    = Utility::create_post_context();
+		$post_ids        = array();
+		$post_ids[]      = Utility::create_legacy_feedback(
+			array(
+				'1_field_A' => 'value1',
+				'2_field_B' => 'value2',
+			)
+		);
+		$post_ids[]      = Utility::create_legacy_feedback(
+			array(
+				'1_field_A' => 'value1',
+				'2_field_C' => 'value2',
+			)
+		);
+		$current_time    = current_time( 'mysql' );
+		$default_consent = 'No';
+		$ip              = 'https://127.0.0.1';
+
+		$this->assertEquals(
+			array(
+				'ID'         => array( $post_ids[0], $post_ids[1] ),
+				'Date'       => array( $current_time, $current_time ),
+				'Title'      => array( $current_post->post_title, $current_post->post_title ),
+				'field_A'    => array( 'value1', 'value1' ),
+				'field_B'    => array( 'value2', '' ),
+				'field_C'    => array( '', 'value2' ),
+				'Source'     => array( '/?p=' . $current_post->ID, '/?p=' . $current_post->ID ),
+				'Consent'    => array( $default_consent, $default_consent ),
+				'IP Address' => array( $ip, $ip ),
+
+			),
+			Contact_Form_Plugin::get_export_feedback_data( $post_ids )
+		);
+		Utility::destroy_post_context( $current_post );
+	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index 035206ae275fc..b5e03b5eb0ba4 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -1857,44 +1857,6 @@ function ( $id ) {
 		}
 	}
 
-	public function test_export_csv_legacy_data() {
-
-		$current_post    = Utility::create_post_context();
-		$post_ids        = array();
-		$post_ids[]      = Utility::create_legacy_feedback(
-			array(
-				'1_field_A' => 'value1',
-				'2_field_B' => 'value2',
-			)
-		);
-		$post_ids[]      = Utility::create_legacy_feedback(
-			array(
-				'1_field_A' => 'value1',
-				'2_field_C' => 'value2',
-			)
-		);
-		$current_time    = current_time( 'mysql' );
-		$default_consent = 'No';
-		$ip              = 'https://127.0.0.1';
-
-		$this->assertEquals(
-			array(
-				'ID'         => array( $post_ids[0], $post_ids[1] ),
-				'Date'       => array( $current_time, $current_time ),
-				'Title'      => array( $current_post->post_title, $current_post->post_title ),
-				'field_A'    => array( 'value1', 'value1' ),
-				'field_B'    => array( 'value2', '' ),
-				'field_C'    => array( '', 'value2' ),
-				'Source'     => array( '/?p=' . $current_post->ID, '/?p=' . $current_post->ID ),
-				'Consent'    => array( $default_consent, $default_consent ),
-				'IP Address' => array( $ip, $ip ),
-
-			),
-			Contact_Form_Plugin::get_export_feedback_data( $post_ids )
-		);
-		Utility::destroy_post_context( $current_post );
-	}
-
 	/**
 	 * Tests the functionality of 'Contact_Form_Plugin::personal_data_eraser'.
 	 *

From eafcde5e7e43b1967e86180be6dab494de60d5bc Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 10:39:17 -0700
Subject: [PATCH 37/48] More tests and phan fixes

---
 .../forms/tests/php/contact-form/Contact_Form_Test.php      | 6 ++++--
 .../packages/forms/tests/php/contact-form/Feedback_Test.php | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index b5e03b5eb0ba4..56a92b3a026b2 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -2494,9 +2494,11 @@ public function test_get_forms_count() {
 
 		$count = Contact_Form::get_forms_count();
 		// Create a new form.
-		new Contact_Form( array() );
-		$new_count = Contact_Form::get_forms_count();
+		$form = new Contact_Form( array() );
+		$id   = $form->get_attribute( 'id' ); // This will ensure the form is created and saved.
 
+		$new_count = Contact_Form::get_forms_count();
+		$this->assertNotEmpty( $id, 'The form ID should not be empty after creation.' );
 		$this->assertEquals( $count + 1, $new_count, 'The count should increase by 1 after creating a new form.' );
 	}
 } // end class
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index bda2e0b938063..4048bc59caa36 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -152,8 +152,10 @@ public function test_handle_previously_saved_response() {
 		$this->assertInstanceOf( Feedback_Field::class, $field );
 		$this->assertEquals( '1_field', $field->get_key() );
 		$this->assertEquals( 'field', $field->get_label() );
-		$this->assertEquals( 'value1', $field->render_value() );
+		$this->assertEquals( 'value1', $field->get_value() );
+
 		$this->assertEquals( 'basic', $field->get_type() ); // Assuming 'basic' is the default type for a simple text field.
+		$this->assertEquals( 'value1', $field->get_render_value() );
 	}
 	/**
 	 * Tests that the feedback ID is computed correctly when saving a from response.

From 8f764011594f3456ef4ecce486d33a6ad4e3ee4e Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 13:18:26 -0700
Subject: [PATCH 38/48] update baseline

---
 projects/packages/forms/.phan/baseline.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/packages/forms/.phan/baseline.php b/projects/packages/forms/.phan/baseline.php
index 2c4f2d21a6532..1db81e8722ec1 100644
--- a/projects/packages/forms/.phan/baseline.php
+++ b/projects/packages/forms/.phan/baseline.php
@@ -15,10 +15,10 @@
     // PhanTypeMismatchArgumentInternal : 6 occurrences
     // PhanTypeMismatchArgumentProbablyReal : 6 occurrences
     // PhanPluginDuplicateAdjacentStatement : 2 occurrences
-    // PhanPluginRedundantAssignment : 2 occurrences
     // PhanTypeConversionFromArray : 2 occurrences
     // PhanTypeMismatchReturn : 2 occurrences
     // PhanPluginMixedKeyNoKey : 1 occurrence
+    // PhanPluginRedundantAssignment : 1 occurrence
     // PhanPossiblyNullTypeMismatchProperty : 1 occurrence
     // PhanTypeArraySuspiciousNullable : 1 occurrence
     // PhanTypeMismatchReturnNullable : 1 occurrence
@@ -28,7 +28,7 @@
     'file_suppressions' => [
         'src/contact-form/class-admin.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeArraySuspiciousNullable', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturn'],
         'src/contact-form/class-contact-form-field.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPossiblyNullTypeMismatchProperty', 'PhanTypeConversionFromArray', 'PhanTypeMismatchArgument', 'PhanTypeMismatchReturnProbablyReal'],
-        'src/contact-form/class-contact-form-plugin.php' => ['PhanPluginDuplicateAdjacentStatement', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginRedundantAssignment', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturnProbablyReal'],
+        'src/contact-form/class-contact-form-plugin.php' => ['PhanPluginDuplicateAdjacentStatement', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchReturnProbablyReal'],
         'src/contact-form/class-contact-form-shortcode.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
         'src/contact-form/class-contact-form.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginRedundantAssignment', 'PhanTypeMismatchArgument', 'PhanTypeMismatchReturnNullable', 'PhanTypeMismatchReturnProbablyReal'],
         'src/dashboard/class-dashboard-view-switch.php' => ['PhanUnreferencedUseNormal'],

From 2e32c6013e7060f1f75b30e4ff0b002c69021a94 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 13:36:39 -0700
Subject: [PATCH 39/48] Add get_value assertions to Feedback_Field tests

Extended the test_get_render_value method to include assertions for the get_value method, ensuring both scalar and array values are correctly returned by Feedback_Field.
---
 .../forms/tests/php/contact-form/Feedback_Field_Test.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 18548fd349ad1..dbe64e3c54e77 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -109,12 +109,18 @@ public function test_response_from_serialized_is_null() {
 	public function test_get_render_value() {
 		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertEquals( 'test_value', $field->get_render_value() );
+		$this->assertEquals( 'test_value', $field->get_value() );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
 		$this->assertEquals( 'value1, value2', $field->get_render_value() );
+		$this->assertEquals( array( 'value1', 'value2' ), $field->get_value() );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
 		$this->assertSame( '', $field->get_render_value() );
+		$this->assertEquals(
+			array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ),
+			$field->get_value()
+		);
 	}
 
 	public function test_is_file_field() {

From f6d2a0fdcdd945eeb184288262787dce86ed7402 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 13:48:05 -0700
Subject: [PATCH 40/48] Add feedback field tests

---
 .../php/contact-form/Feedback_Field_Test.php  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index dbe64e3c54e77..4f381173e79d1 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -123,6 +123,18 @@ public function test_get_render_value() {
 		);
 	}
 
+	public function test_render_file_field() {
+		$file = array(
+			'name'    => 'file1.jpg',
+			'file_id' => 123,
+			'size'    => 123456789,
+		);
+
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( $file ) ), 'file' );
+		$this->assertStringContainsString( $file['name'], $field->get_render_value() );
+		$this->assertStringContainsString( size_format( $file['size'] ), $field->get_render_value() );
+	}
+
 	public function test_is_file_field() {
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
 		$this->assertTrue( $field->is_file_field() );
@@ -201,6 +213,20 @@ public function test_get_render_api_value() {
 		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
 		$this->assertSame( $expected, $field->get_render_value( 'api' ) );
 		remove_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
+
+		$field = new Feedback_Field(
+			'test_key',
+			'test_label',
+			array(
+				'files' => array(
+					array(),
+				),
+			)
+		);
+
+		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
+		$this->assertSame( array( 'files' => array() ), $field->get_render_value( 'api' ) );
+		remove_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
 	}
 	/**
 	 * Helper function to return a URL for the file.

From ef13486ac1b0f160daf668651325886a319cc477 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 14:02:40 -0700
Subject: [PATCH 41/48] remove unused method

---
 .../forms/src/contact-form/class-feedback-field.php      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 46c56dbdffbad..46d31eb3a6e06 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -93,15 +93,6 @@ public function get_value() {
 		return $this->value;
 	}
 
-	/**
-	 * Get the value of the field.
-	 *
-	 * @return mixed
-	 */
-	public function render_value() {
-		return $this->value;
-	}
-
 	/**
 	 * Get the value of the field for rendering.
 	 *

From eac22f46f429f65ec42b2f06f169d21e6f8b9658 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 15:49:59 -0700
Subject: [PATCH 42/48] Refactor file field type handling in feedback forms

Replaces is_file_field() with a more generic is_of_type() method in Feedback_Field, simplifying type checks. Updates legacy file upload handling in Feedback to explicitly set the field type to 'file'. Adjusts and expands related unit tests to cover new logic and ensure correct file field behavior.
---
 .../src/contact-form/class-feedback-field.php | 51 +++++++----------
 .../forms/src/contact-form/class-feedback.php | 32 +++++++++--
 .../php/contact-form/Feedback_Field_Test.php  | 57 ++++++++++++-------
 .../tests/php/contact-form/Feedback_Test.php  | 37 ++++++++++++
 4 files changed, 124 insertions(+), 53 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 46d31eb3a6e06..6ef4e9b41c9a7 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -116,7 +116,7 @@ public function get_render_value( $context = 'default' ) {
 	 * @return string
 	 */
 	private function get_render_default_value() {
-		if ( $this->is_file_field() ) {
+		if ( $this->is_of_type( 'file' ) ) {
 			$files = array();
 			foreach ( $this->value['files'] as &$file ) {
 				if ( ! isset( $file['size'] ) || ! isset( $file['file_id'] ) ) {
@@ -144,7 +144,7 @@ private function get_render_default_value() {
 	 */
 	private function get_render_api_value() {
 
-		if ( $this->is_file_field() ) {
+		if ( $this->is_of_type( 'file' ) ) {
 			$files = array();
 			foreach ( $this->value['files'] as &$file ) {
 				if ( ! isset( $file['size'] ) || ! isset( $file['file_id'] ) ) {
@@ -169,24 +169,15 @@ private function get_render_api_value() {
 		// This method is deprecated, use render_value instead.
 		return $this->value;
 	}
-
 	/**
-	 * Check if the field is a file field.
+	 * Check if the field is of a specific type.
 	 *
-	 * @return bool
+	 * @param string $type The type to check against.
+	 *
+	 * @return bool True if the field is of the specified type, false otherwise.
 	 */
-	public function is_file_field() {
-		if ( 'file' === $this->type ) {
-			return true;
-		}
-		if ( 'basic' === $this->type ) {
-			// If the type is basic, we can check if the value is an array and contains files.
-			if ( is_array( $this->value ) && isset( $this->value['files'] ) && is_array( $this->value['files'] ) ) {
-				return true;
-			}
-		}
-
-		return false;
+	public function is_of_type( $type ) {
+		return $this->type === $type;
 	}
 
 	/**
@@ -198,19 +189,6 @@ public function compile_field() {
 		return $this->get_meta_key_value( 'render' ) === false;
 	}
 
-	/**
-	 * Check if the field has a file
-	 *
-	 * @return bool
-	 */
-	public function has_file() {
-		if ( $this->is_file_field() ) {
-			return count( $this->value['files'] ) > 0;
-		}
-
-		return false;
-	}
-
 	/**
 	 * Get the type of the field.
 	 *
@@ -278,6 +256,19 @@ public static function from_serialized( $data ) {
 		);
 	}
 
+	/**
+	 * Check if the field has a file
+	 *
+	 * @return bool
+	 */
+	public function has_file() {
+		if ( $this->is_of_type( 'file' ) ) {
+			return count( $this->value['files'] ) > 0;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Checks if the file is previewable based on its type or extension.
 	 *
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 26c92764556af..cfe98c80e6334 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -843,6 +843,22 @@ private function process_legacy_lines( $lines, &$decoded_fields ) {
 		}
 	}
 
+	/**
+	 * Check if the field is a legacy file upload.
+	 *
+	 * @param array $field The field to check.
+	 *
+	 * @return bool True if it's a legacy file upload, false otherwise.
+	 */
+	private function is_legacy_file_upload( $field ) {
+		return (
+			is_array( $field ) &&
+			! empty( $field['field_id'] ) &&
+			isset( $field['files'] ) &&
+			is_array( $field['files'] )
+		);
+	}
+
 	/**
 	 * Process legacy values into field objects.
 	 *
@@ -867,10 +883,18 @@ private function process_legacy_values( $all_values, &$decoded_fields ) {
 				continue;
 			}
 
-			$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $label, $value );
-
-			if ( ! $this->has_file && $decoded_fields['fields'][ $key ]->has_file() ) {
-				$this->has_file = true;
+			// check for file upload data and then set it as a file type field.
+			if ( $this->is_legacy_file_upload( $value ) ) {
+				// If the value is a file upload, we need to handle it differently.
+				$decoded_fields['fields'][ $key ] = new Feedback_Field(
+					$key,
+					$label,
+					$value,
+					'file'
+				);
+				$this->has_file                   = ! empty( $value['files'] ); // Set has_file to true if any file upload is found.
+			} else {
+				$decoded_fields['fields'][ $key ] = new Feedback_Field( $key, $label, $value );
 			}
 		}
 	}
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
index 4f381173e79d1..35d869ff0c51d 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Field_Test.php
@@ -115,10 +115,23 @@ public function test_get_render_value() {
 		$this->assertEquals( 'value1, value2', $field->get_render_value() );
 		$this->assertEquals( array( 'value1', 'value2' ), $field->get_value() );
 
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ) );
+		// EMPTY FILE FIELD
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
 		$this->assertSame( '', $field->get_render_value() );
 		$this->assertEquals(
-			array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ),
+			array( 'files' => array() ),
+			$field->get_value()
+		);
+		$file  = array(
+			'name'    => 'file1.jpg',
+			'type'    => 'image/jpeg',
+			'file_id' => 123,
+			'size'    => 123456789,
+		);
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( $file ) ), 'file' );
+		$this->assertSame( 'file1.jpg (118 MB)', $field->get_render_value() );
+		$this->assertEquals(
+			array( 'files' => array( $file ) ),
 			$field->get_value()
 		);
 	}
@@ -135,18 +148,18 @@ public function test_render_file_field() {
 		$this->assertStringContainsString( size_format( $file['size'] ), $field->get_render_value() );
 	}
 
-	public function test_is_file_field() {
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ) );
-		$this->assertTrue( $field->is_file_field() );
-
+	public function test_is_of_type() {
 		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
-		$this->assertFalse( $field->is_file_field() );
+		$this->assertFalse( $field->is_of_type( 'file' ) );
 
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ) );
-		$this->assertTrue( $field->is_file_field() );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
+		$this->assertTrue( $field->is_of_type( 'file' ) );
 
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg', 'file2.jpg' ) ), 'file' );
-		$this->assertTrue( $field->is_file_field() );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'hello' ) );
+		$this->assertTrue(
+			$field->is_of_type( 'basic' ),
+			'Basic field should not be a file field'
+		);
 	}
 
 	public function test_has_file() {
@@ -156,26 +169,27 @@ public function test_has_file() {
 			array(
 				'files' => array(
 					array(
-						'name'    => 'file1.jpg',
+						'name'    => 'file1 . jpg',
 						'file_id' => 123,
 						'size'    => 123456789,
 					),
 				),
-			)
+			),
+			'file'
 		);
 		$this->assertTrue( $field->has_file() );
 
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1.jpg' ) ), 'file' );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array( 'file1 . jpg' ) ), 'file' );
 		$this->assertTrue( $field->has_file() );
 
-		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ) );
+		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
 		$this->assertFalse( $field->has_file() );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', 'test_value' );
 		$this->assertFalse( $field->has_file(), 'basic field should not be a file field' );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'files' => array() ), 'file' );
-		$this->assertFalse( $field->has_file(), 'empty file field should not be non-empty' );
+		$this->assertFalse( $field->has_file(), 'empty file field should not be non - empty' );
 	}
 
 	public function test_get_render_api_value() {
@@ -183,7 +197,10 @@ public function test_get_render_api_value() {
 		$this->assertEquals( 'test_value', $field->get_render_value( 'api' ) );
 
 		$field = new Feedback_Field( 'test_key', 'test_label', array( 'value1', 'value2' ) );
-		$this->assertEquals( 'value1, value2', $field->get_render_value( 'api' ) );
+		$this->assertEquals(
+			'value1, value2',
+			$field->get_render_value( 'api' )
+		);
 
 		$expected = array(
 			'files' => array(
@@ -207,7 +224,8 @@ public function test_get_render_api_value() {
 						'size'    => 123456789,
 					),
 				),
-			)
+			),
+			'file'
 		);
 
 		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
@@ -221,7 +239,8 @@ public function test_get_render_api_value() {
 				'files' => array(
 					array(),
 				),
-			)
+			),
+			'file'
 		);
 
 		add_filter( 'jetpack_unauth_file_download_url', array( $this, 'return_url' ) );
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 4048bc59caa36..4642660844018 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -1610,4 +1610,41 @@ public function test_get_compiled_fields_shapes( $format, $expected, $message )
 
 		$this->assertEquals( $expected, $compiled_fields, $message );
 	}
+
+	/**
+	 *
+	 * Test file uploads in feedback
+	 */
+	public function test_file_uploads() {
+
+		$file = array(
+			'file_id' => 1234,
+			'name'    => 'test-file.txt',
+			'size'    => 1234,
+			'type'    => 'text/plain',
+		);
+
+		$url     = 'https://wordpress.com';
+		$post_id = Utility::create_legacy_feedback(
+			array(
+				'file upload' => array(
+					'field_id' => 'file_upload',
+					'files'    => array( $file ),
+				),
+			),
+			null,
+			null,
+			null,
+			$url
+		);
+
+		$saved_response = Feedback::get( $post_id );
+		$this->assertEquals( 'test-file.txt (1 KB)', $saved_response->get_field_value_by_label( 'file upload' ) );
+
+		foreach ( $saved_response->get_fields() as $field ) {
+			if ( $field->get_label() === 'file upload' ) {
+				$this->assertEquals( 'file', $field->get_type() );
+			}
+		}
+	}
 }

From 0e7bfd198b04176ba3fcf71bcc41101fecb3f943 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 16:00:59 -0700
Subject: [PATCH 43/48] Don't reimplement strip_tags method

---
 .../forms/src/contact-form/class-feedback.php |  37 +----
 .../contact-form/Contact_Form_Plugin_Test.php | 157 ++++++++++++++++++
 .../tests/php/contact-form/Feedback_Test.php  | 157 ------------------
 3 files changed, 161 insertions(+), 190 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index cfe98c80e6334..c20bba1a686c5 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -255,7 +255,7 @@ private function get_first_field_of_type( $type, $filter = null, $context = 'def
 		foreach ( $this->fields as $field ) {
 			if ( $field->get_type() === $type ) {
 				if ( $filter ) {
-					return self::strip_tags(
+					return Contact_Form_Plugin::strip_tags(
 						stripslashes(
 							/** This filter is already documented in core/wp-includes/comment-functions.php */
 							\apply_filters( $filter, addslashes( $field->get_render_value( $context ) ) )
@@ -830,7 +830,7 @@ private function process_legacy_lines( $lines, &$decoded_fields ) {
 
 			if ( ! empty( $key ) && isset( $var_map[ $key ] ) ) {
 				$map_to_field = $var_map[ $key ];
-				$value        = self::strip_tags( trim( $value ) );
+				$value        = Contact_Form_Plugin::strip_tags( trim( $value ) );
 
 				$decoded_fields['fields'][ $key ] = new Feedback_Field(
 					$key,
@@ -909,7 +909,7 @@ private function add_comment_content_field( $comment_content, &$decoded_fields )
 		$decoded_fields['fields']['comment_content'] = new Feedback_Field(
 			'comment_content',
 			'Comment Content',
-			trim( self::strip_tags( $comment_content ) ),
+			trim( Contact_Form_Plugin::strip_tags( $comment_content ) ),
 			'textarea',
 			array( 'render' => false )
 		);
@@ -930,35 +930,6 @@ private static function extract_label_from_key( $key ) {
 		return $key;
 	}
 
-	/**
-	 * Strips HTML tags from input.  Output is NOT HTML safe.
-	 *
-	 * @param mixed $data_with_tags - data we're stripping HTML tags from.
-	 * @return mixed
-	 */
-	public static function strip_tags( $data_with_tags ) {
-		$data_without_tags = array();
-		if ( is_array( $data_with_tags ) ) {
-			foreach ( $data_with_tags as $index => $value ) {
-				if ( is_array( $value ) ) {
-					$data_without_tags[ $index ] = self::strip_tags( $value );
-					continue;
-				}
-
-				$index = sanitize_text_field( (string) $index );
-				$value = wp_kses_post( (string) $value );
-				$value = str_replace( '&amp;', '&', $value ); // undo damage done by wp_kses_normalize_entities()
-
-				$data_without_tags[ $index ] = $value;
-			}
-		} else {
-			$data_without_tags = wp_kses_post( (string) $data_with_tags );
-			$data_without_tags = str_replace( '&amp;', '&', $data_without_tags ); // undo damage done by wp_kses_normalize_entities()
-		}
-
-		return $data_without_tags;
-	}
-
 	/**
 	 * Get all the fields of the response, computed from the post data.
 	 *
@@ -1028,7 +999,7 @@ private function get_computed_comment_content( $post_data, $form ) {
 		if ( isset( $field_ids['textarea'] ) ) {
 			$value = $this->get_field_value( $field_ids['textarea'], $post_data );
 			if ( is_string( $value ) ) {
-				return trim( self::strip_tags( stripslashes( $value ) ) );
+				return trim( Contact_Form_Plugin::strip_tags( stripslashes( $value ) ) );
 			}
 		}
 		return '';
diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
index cef0573cbc42d..ecd53b09afee2 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Plugin_Test.php
@@ -632,4 +632,161 @@ public function test_export_csv_legacy_data() {
 		);
 		Utility::destroy_post_context( $current_post );
 	}
+
+	/**
+	 * ======================================================
+	 * Tests for the strip_tags method in Feedback class.
+	 * ======================================================
+	 *
+	 * Test that strip_tags handles simple string without HTML tags.
+	 */
+	public function test_strip_tags_with_plain_string() {
+		$input    = 'Hello, this is a plain text string.';
+		$expected = 'Hello, this is a plain text string.';
+		$result   = Contact_Form_Plugin::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags removes script tags but keeps the content.
+	 */
+	public function test_strip_tags_removes_script_tags() {
+		$input    = '<script>alert("XSS")</script>Hello <b>world</b>!';
+		$expected = 'alert("XSS")Hello <b>world</b>!';
+		$result   = Contact_Form_Plugin::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags handles HTML entities correctly.
+	 */
+	public function test_strip_tags_handles_html_entities() {
+		$input    = 'Hello &amp; goodbye';
+		$expected = 'Hello & goodbye';
+		$result   = Contact_Form_Plugin::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags handles arrays recursively.
+	 */
+	public function test_strip_tags_handles_arrays() {
+		$input = array(
+			'field1' => 'Hello <script>alert("XSS")</script>world',
+			'field2' => array(
+				'nested' => 'Test <b>bold</b> text',
+				'deep'   => array(
+					'deeper' => 'More &amp; testing',
+				),
+			),
+		);
+
+		$expected = array(
+			'field1' => 'Hello alert("XSS")world',
+			'field2' => array(
+				'nested' => 'Test <b>bold</b> text',
+				'deep'   => array(
+					'deeper' => 'More & testing',
+				),
+			),
+		);
+
+		$result = Contact_Form_Plugin::strip_tags( $input );
+		$this->assertEquals( $expected, $result );
+	}
+
+	/**
+	 * Test that strip_tags sanitizes array keys.
+	 */
+	public function test_strip_tags_sanitizes_array_keys() {
+		$input = array(
+			'<script>key</script>' => 'value1',
+			'normal_key'           => 'value2',
+		);
+
+		$result = Contact_Form_Plugin::strip_tags( $input );
+
+		// Check that the results exist and are correct
+		// We need to check what key actually gets created after sanitization
+		$keys = array_keys( $result );
+		$this->assertCount( 2, $keys );
+		$this->assertEquals( 'value2', $result['normal_key'] );
+
+		// Find the sanitized key (should be the one that's not 'normal_key')
+		$sanitized_key = null;
+		foreach ( $keys as $key ) {
+			if ( $key !== 'normal_key' ) {
+				$sanitized_key = $key;
+				break;
+			}
+		}
+		$this->assertEquals( 'value1', $result[ $sanitized_key ] );
+	}
+
+	/**
+	 * Test that strip_tags handles empty values.
+	 */
+	public function test_strip_tags_handles_empty_values() {
+		$this->assertSame( '', Contact_Form_Plugin::strip_tags( '' ) );
+		$this->assertEquals( array(), Contact_Form_Plugin::strip_tags( array() ) );
+		$this->assertSame( '0', Contact_Form_Plugin::strip_tags( 0 ) );
+		$this->assertSame( '', Contact_Form_Plugin::strip_tags( null ) );
+	}
+
+	/**
+	 * Test that strip_tags handles numeric values.
+	 */
+	public function test_strip_tags_handles_numeric_values() {
+		$this->assertSame( '123', Contact_Form_Plugin::strip_tags( 123 ) );
+		$this->assertSame( '123.45', Contact_Form_Plugin::strip_tags( 123.45 ) );
+	}
+
+	/**
+	 * Test that strip_tags preserves allowed HTML tags as per wp_kses_post.
+	 */
+	public function test_strip_tags_preserves_allowed_html() {
+		$input  = '<p>This is a <strong>test</strong> with <em>emphasis</em> and <a href="http://example.com">links</a>.</p>';
+		$result = Contact_Form_Plugin::strip_tags( $input );
+
+		// wp_kses_post should preserve these tags - let's just verify we get a non-empty string with HTML
+		$this->assertNotEquals( '', $result );
+		$this->assertStringContainsString( 'This is a', $result );
+		$this->assertStringContainsString( 'test', $result );
+	}
+
+	/**
+	 * Test that strip_tags removes dangerous HTML tags.
+	 */
+	public function test_strip_tags_removes_dangerous_html() {
+		$input  = '<script>alert("XSS")</script><iframe src="evil.com"></iframe>Hello world';
+		$result = Contact_Form_Plugin::strip_tags( $input );
+
+		// These dangerous tags should be removed, but content might remain
+		$this->assertStringNotContainsString( '<script>', $result );
+		$this->assertStringNotContainsString( '<iframe>', $result );
+		$this->assertStringContainsString( 'Hello world', $result );
+	}
+
+	/**
+	 * Test that strip_tags handles mixed array with different data types.
+	 */
+	public function test_strip_tags_handles_mixed_array() {
+		$input = array(
+			'string'  => 'Hello <b>world</b>',
+			'number'  => 42,
+			'boolean' => true,
+			'array'   => array(
+				'nested_string' => 'Test &amp; case',
+				'nested_number' => 3.14,
+			),
+		);
+
+		$result = Contact_Form_Plugin::strip_tags( $input );
+
+		$this->assertEquals( 'Hello <b>world</b>', $result['string'] );
+		$this->assertSame( '42', $result['number'] );
+		$this->assertSame( '1', $result['boolean'] ); // true converted to string
+		$this->assertEquals( 'Test & case', $result['array']['nested_string'] );
+		$this->assertSame( '3.14', $result['array']['nested_number'] );
+	}
 }
diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 4642660844018..562202cc532f6 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -1311,163 +1311,6 @@ public function test_feedback_title_time() {
 		$this->assertStringContainsString( $post->post_date, $saved_response->get_time(), 'Feedback submitted time should match the saved form submission' );
 	}
 
-	/**
-	 * ======================================================
-	 * Tests for the strip_tags method in Feedback class.
-	 * ======================================================
-	 *
-	 * Test that strip_tags handles simple string without HTML tags.
-	 */
-	public function test_strip_tags_with_plain_string() {
-		$input    = 'Hello, this is a plain text string.';
-		$expected = 'Hello, this is a plain text string.';
-		$result   = Feedback::strip_tags( $input );
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * Test that strip_tags removes script tags but keeps the content.
-	 */
-	public function test_strip_tags_removes_script_tags() {
-		$input    = '<script>alert("XSS")</script>Hello <b>world</b>!';
-		$expected = 'alert("XSS")Hello <b>world</b>!';
-		$result   = Feedback::strip_tags( $input );
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * Test that strip_tags handles HTML entities correctly.
-	 */
-	public function test_strip_tags_handles_html_entities() {
-		$input    = 'Hello &amp; goodbye';
-		$expected = 'Hello & goodbye';
-		$result   = Feedback::strip_tags( $input );
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * Test that strip_tags handles arrays recursively.
-	 */
-	public function test_strip_tags_handles_arrays() {
-		$input = array(
-			'field1' => 'Hello <script>alert("XSS")</script>world',
-			'field2' => array(
-				'nested' => 'Test <b>bold</b> text',
-				'deep'   => array(
-					'deeper' => 'More &amp; testing',
-				),
-			),
-		);
-
-		$expected = array(
-			'field1' => 'Hello alert("XSS")world',
-			'field2' => array(
-				'nested' => 'Test <b>bold</b> text',
-				'deep'   => array(
-					'deeper' => 'More & testing',
-				),
-			),
-		);
-
-		$result = Feedback::strip_tags( $input );
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * Test that strip_tags sanitizes array keys.
-	 */
-	public function test_strip_tags_sanitizes_array_keys() {
-		$input = array(
-			'<script>key</script>' => 'value1',
-			'normal_key'           => 'value2',
-		);
-
-		$result = Feedback::strip_tags( $input );
-
-		// Check that the results exist and are correct
-		// We need to check what key actually gets created after sanitization
-		$keys = array_keys( $result );
-		$this->assertCount( 2, $keys );
-		$this->assertEquals( 'value2', $result['normal_key'] );
-
-		// Find the sanitized key (should be the one that's not 'normal_key')
-		$sanitized_key = null;
-		foreach ( $keys as $key ) {
-			if ( $key !== 'normal_key' ) {
-				$sanitized_key = $key;
-				break;
-			}
-		}
-		$this->assertEquals( 'value1', $result[ $sanitized_key ] );
-	}
-
-	/**
-	 * Test that strip_tags handles empty values.
-	 */
-	public function test_strip_tags_handles_empty_values() {
-		$this->assertSame( '', Feedback::strip_tags( '' ) );
-		$this->assertEquals( array(), Feedback::strip_tags( array() ) );
-		$this->assertSame( '0', Feedback::strip_tags( 0 ) );
-		$this->assertSame( '', Feedback::strip_tags( null ) );
-	}
-
-	/**
-	 * Test that strip_tags handles numeric values.
-	 */
-	public function test_strip_tags_handles_numeric_values() {
-		$this->assertSame( '123', Feedback::strip_tags( 123 ) );
-		$this->assertSame( '123.45', Feedback::strip_tags( 123.45 ) );
-	}
-
-	/**
-	 * Test that strip_tags preserves allowed HTML tags as per wp_kses_post.
-	 */
-	public function test_strip_tags_preserves_allowed_html() {
-		$input  = '<p>This is a <strong>test</strong> with <em>emphasis</em> and <a href="http://example.com">links</a>.</p>';
-		$result = Feedback::strip_tags( $input );
-
-		// wp_kses_post should preserve these tags - let's just verify we get a non-empty string with HTML
-		$this->assertNotEquals( '', $result );
-		$this->assertStringContainsString( 'This is a', $result );
-		$this->assertStringContainsString( 'test', $result );
-	}
-
-	/**
-	 * Test that strip_tags removes dangerous HTML tags.
-	 */
-	public function test_strip_tags_removes_dangerous_html() {
-		$input  = '<script>alert("XSS")</script><iframe src="evil.com"></iframe>Hello world';
-		$result = Feedback::strip_tags( $input );
-
-		// These dangerous tags should be removed, but content might remain
-		$this->assertStringNotContainsString( '<script>', $result );
-		$this->assertStringNotContainsString( '<iframe>', $result );
-		$this->assertStringContainsString( 'Hello world', $result );
-	}
-
-	/**
-	 * Test that strip_tags handles mixed array with different data types.
-	 */
-	public function test_strip_tags_handles_mixed_array() {
-		$input = array(
-			'string'  => 'Hello <b>world</b>',
-			'number'  => 42,
-			'boolean' => true,
-			'array'   => array(
-				'nested_string' => 'Test &amp; case',
-				'nested_number' => 3.14,
-			),
-		);
-
-		$result = Feedback::strip_tags( $input );
-
-		$this->assertEquals( 'Hello <b>world</b>', $result['string'] );
-		$this->assertSame( '42', $result['number'] );
-		$this->assertSame( '1', $result['boolean'] ); // true converted to string
-		$this->assertEquals( 'Test & case', $result['array']['nested_string'] );
-		$this->assertSame( '3.14', $result['array']['nested_number'] );
-	}
-
 	/**
 	 * ======================================================
 	 * Tests for the get_compiled_fields method in Feedback class.

From 89aa584282cda2edb880c90dda07b86aac811fc9 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Sun, 20 Jul 2025 16:44:10 -0700
Subject: [PATCH 44/48] Export personal Data update to use FeedBack Class

---
 .../class-contact-form-plugin.php             | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
index 8ac695c0f3193..0f4a483fb03c7 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form-plugin.php
@@ -2000,33 +2000,42 @@ public function internal_personal_data_exporter( $email, $page = 1, $per_page =
 		$post_ids    = $this->personal_data_post_ids_by_email( $email, $per_page, $page );
 
 		foreach ( $post_ids as $post_id ) {
-			$post_fields = $this->get_parsed_field_contents_of_post( $post_id );
-
-			if ( ! is_array( $post_fields ) || empty( $post_fields['_feedback_subject'] ) ) {
-				continue; // Corrupt data.
-			}
-
-			$post_fields['_feedback_main_comment'] = $this->get_post_content_for_csv_export( $post_id );
-			$post_fields                           = $this->map_parsed_field_contents_of_post_to_field_names( $post_fields );
+			$post_export_data = array();
+			$feedback         = Feedback::get( $post_id );
 
-			if ( ! is_array( $post_fields ) || empty( $post_fields ) ) {
-				continue; // No fields to export.
-			}
+			$fields             = $feedback->get_compiled_fields( 'personal_export', 'all' );
+			$post_export_data[] = array(
+				'name'  => __( 'Date', 'jetpack-forms' ),
+				'value' => $feedback->get_time(),
+			);
 
-			$post_meta = $this->get_post_meta_for_csv_export( $post_id );
-			$post_meta = is_array( $post_meta ) ? $post_meta : array();
+			$post_export_data[] = array(
+				'name'  => __( 'Source Title', 'jetpack-forms' ),
+				'value' => $feedback->get_entry_title(),
+			);
 
-			$post_export_data = array();
-			$post_data        = array_merge( $post_fields, $post_meta );
-			ksort( $post_data );
+			$post_export_data[] = array(
+				'name'  => __( 'Source URL:', 'jetpack-forms' ),
+				'value' => $feedback->get_entry_permalink(),
+			);
 
-			foreach ( $post_data as $post_data_key => $post_data_value ) {
+			foreach ( $fields as $field ) {
 				$post_export_data[] = array(
-					'name'  => preg_replace( '/^[0-9]+_/', '', $post_data_key ),
-					'value' => $post_data_value,
+					'name'  => $field['label'],
+					'value' => $field['value'],
 				);
 			}
 
+			$post_export_data[] = array(
+				'name'  => __( 'Consent', 'jetpack-forms' ),
+				'value' => $feedback->has_consent() ? __( 'Yes', 'jetpack-forms' ) : __( 'No', 'jetpack-forms' ),
+			);
+
+			$post_export_data[] = array(
+				'name'  => __( 'IP Address', 'jetpack-forms' ),
+				'value' => $feedback->get_ip_address(),
+			);
+
 			$export_data[] = array(
 				'group_id'    => 'feedback',
 				'group_label' => __( 'Feedback', 'jetpack-forms' ),

From e1f8381a4bb0a3e32a43c6a3b4b07296de5d5fe9 Mon Sep 17 00:00:00 2001
From: Miguel Lezama <lezama@gmail.com>
Date: Tue, 22 Jul 2025 14:10:23 -0300
Subject: [PATCH 45/48] Fix typos in docblocks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix "lable" → "label" in Feedback_Field class
- Fix "recieved" → "received" in Feedback class
- Fix "invividual" → "individual" in Feedback_Field class
- Complete incomplete class docblock for Feedback_Field
---
 .../forms/src/contact-form/class-feedback-field.php         | 6 +++---
 projects/packages/forms/src/contact-form/class-feedback.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-feedback-field.php b/projects/packages/forms/src/contact-form/class-feedback-field.php
index 6ef4e9b41c9a7..f78f700f77aab 100644
--- a/projects/packages/forms/src/contact-form/class-feedback-field.php
+++ b/projects/packages/forms/src/contact-form/class-feedback-field.php
@@ -8,9 +8,9 @@
 namespace Automattic\Jetpack\Forms\ContactForm;
 
 /**
- * Handles the
+ * Feedback field class.
  *
- * Represents the submitted form data of an invividual field.
+ * Represents the submitted form data of an individual field.
  */
 class Feedback_Field {
 
@@ -22,7 +22,7 @@ class Feedback_Field {
 	private $key;
 
 	/**
-	 * The lable of the field.
+	 * The label of the field.
 	 *
 	 * @var string
 	 */
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index c20bba1a686c5..44f580f5d841f 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -184,7 +184,7 @@ public static function from_submission( $post_data, $form, $current_post = null,
 	/**
 	 * Load from Form Submission.
 	 *
-	 * @param array        $post_data The $_POST recieved during the form submission.
+	 * @param array        $post_data The $_POST received during the form submission.
 	 * @param Contact_Form $form  The form object.
 	 * @param WP_Post|null $current_post The current post object, if available.
 	 * @param int          $current_page_number The current page number associated with the current post object entry.

From b599db24156322d6ce6c6e45760eb745c8b3e5fd Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 23 Jul 2025 07:33:13 -0700
Subject: [PATCH 46/48] Making ajax work.

---
 .../packages/forms/src/contact-form/class-contact-form.php  | 4 ++--
 projects/packages/forms/src/contact-form/class-feedback.php | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/projects/packages/forms/src/contact-form/class-contact-form.php b/projects/packages/forms/src/contact-form/class-contact-form.php
index f42e416f28ae6..78a9ceb9638b9 100644
--- a/projects/packages/forms/src/contact-form/class-contact-form.php
+++ b/projects/packages/forms/src/contact-form/class-contact-form.php
@@ -904,8 +904,8 @@ public static function get_json_data( $feedback_id, $form = null ) {
 			// you are doing it wrong, the $form parameter is deprecated and no longer used
 			_deprecated_argument( __METHOD__, '$$next-version$$', 'The $form parameter is deprecated and no longer used.' );
 		}
-
-		return self::get_raw_compiled_form_data( $feedback_id );
+		$response = Feedback::get( $feedback_id );
+		return $response->get_compiled_fields( 'ajax', 'label|value' );
 	}
 
 	/**
diff --git a/projects/packages/forms/src/contact-form/class-feedback.php b/projects/packages/forms/src/contact-form/class-feedback.php
index 44f580f5d841f..999d47eaf475e 100644
--- a/projects/packages/forms/src/contact-form/class-feedback.php
+++ b/projects/packages/forms/src/contact-form/class-feedback.php
@@ -328,6 +328,12 @@ public function get_compiled_fields( $context = 'default', $array_shape = 'all'
 						'value' => $field->get_render_value( $context ),
 					);
 					break;
+				case 'label|value':
+					$compiled_fields[] = array(
+						'label' => $field->get_label( $context ),
+						'value' => $field->get_render_value( $context ),
+					);
+					break;
 				case 'value':
 					$compiled_fields[] = $field->get_render_value( $context );
 					break;

From d0f8da723256dac63c5f1508cb54003cf4f40ec4 Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 23 Jul 2025 07:36:06 -0700
Subject: [PATCH 47/48] Add a test for label|value format

---
 .../tests/php/contact-form/Feedback_Test.php  | 30 ++++++++++++++++---
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
index 562202cc532f6..fce47d9a137ed 100644
--- a/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Feedback_Test.php
@@ -1360,7 +1360,7 @@ public static function get_compiled_fields_data_provider() {
 		$test_message = 'Hello, this is a test message from our contact form.';
 
 		return array(
-			'all_format'       => array(
+			'all_format'         => array(
 				'format'   => 'all',
 				'expected' => array(
 					'1_Name'    => array(
@@ -1382,7 +1382,7 @@ public static function get_compiled_fields_data_provider() {
 				),
 				'message'  => 'Compiled fields should match the default form structure with all field data.',
 			),
-			'key_value_format' => array(
+			'key_value_format'   => array(
 				'format'   => 'key-value',
 				'expected' => array(
 					'1_Name'    => $test_name,
@@ -1392,7 +1392,29 @@ public static function get_compiled_fields_data_provider() {
 				),
 				'message'  => 'Compiled fields should return key-value pairs only.',
 			),
-			'value_format'     => array(
+			'label-value_format' => array(
+				'format'   => 'label|value',
+				'expected' => array(
+					array(
+						'label' => 'Name',
+						'value' => $test_name,
+					),
+					array(
+						'label' => 'Email',
+						'value' => $test_email,
+					),
+					array(
+						'label' => 'Website',
+						'value' => $test_website,
+					),
+					array(
+						'label' => 'Message',
+						'value' => $test_message,
+					),
+				),
+				'message'  => 'Compiled fields should returnlabel|value pairs only.',
+			),
+			'value_format'       => array(
 				'format'   => 'value',
 				'expected' => array(
 					$test_name,
@@ -1402,7 +1424,7 @@ public static function get_compiled_fields_data_provider() {
 				),
 				'message'  => 'Compiled fields should return only values as indexed array.',
 			),
-			'label_format'     => array(
+			'label_format'       => array(
 				'format'   => 'label',
 				'expected' => array(
 					'Name',

From 1dc60fd559ee630e82152d894c130c881a417e8e Mon Sep 17 00:00:00 2001
From: Enej Bajgoric <enej.bajgoric@automattic.com>
Date: Wed, 23 Jul 2025 07:44:23 -0700
Subject: [PATCH 48/48] Add test for get_json_data

---
 .../php/contact-form/Contact_Form_Test.php     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
index 56a92b3a026b2..6e34342309f80 100644
--- a/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
+++ b/projects/packages/forms/tests/php/contact-form/Contact_Form_Test.php
@@ -1646,6 +1646,24 @@ public function assertValidCheckboxField( $html, $attributes ) {
 		$this->assertEquals( $attributes['labelstyles'] . $attributes['optionstyles'], $styles, 'Label styles don\'t match' );
 	}
 
+	public function test_get_json_data() {
+		$current_post = Utility::create_post_context();
+		$post_id      = Utility::create_legacy_feedback( array( 'email' => 'hello@example.com' ) );
+		Utility::destroy_post_context( $current_post );
+		$response = Contact_Form::get_json_data( $post_id );
+
+		$this->assertIsArray( $response, 'Response should be an instance of Contact_Form_Response' );
+		$this->assertEquals(
+			array(
+				array(
+					'label' => 'email',
+					'value' => 'hello@example.com',
+				),
+			),
+			$response
+		);
+	}
+
 	/**
 	 * Tests whether a multifield contact form field is valid.
 	 *