Contact Form: Removing code and renaming relevant references to ensur…

…e we use the package version (#37157)

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/8972300995

Upstream-Ref: Automattic/jetpack@9bf534c

3rd-party/class-salesforce-lead-form.php

@@ -27,7 +27,7 @@ public static function initialize() {
 	 * Process Salesforce Lead forms
 	 *
 	 * @param int   $post_id - the post_id for the CPT that is created.
-	 * @param array $fields - Grunion_Contact_Form_Field array.
+	 * @param array $fields - Contact_Form_Field array.
 	 * @param bool  $is_spam - marked as spam by Akismet(?).
 	 * @param array $entry_values - extra fields added to from the contact form.
 	 *

CHANGELOG.md

@@ -31,6 +31,7 @@ This is an alpha version! The changes listed here are not final.
 - AI Featured Image: allow users to write prompts for the image generation.
 - AI Featured Image: change upgrade prompt layout and fix UI issues.
 - AI Featured Image: start tracking error messages.
+- Contact Form: Removing code and renaming relevant references to ensure we use the package version of the contact form.
 - Janitorial: deprecate methods in Jetpack class in favor of methods from the Connection package.
 - Jetpack Sync: Add Woocommerce event remove_order_items to Jetpack Sync
 - SSO: deprecate in-plugin methods in favor of methods from the Connection package.

_inc/lib/class-jetpack-google-drive-helper.php

@@ -2,6 +2,7 @@
 /**
  * Google Drive helper.
  *
+ * @deprecated 13.4-a.10 Use automattic/jetpack-forms
  * @package automattic/jetpack
  */
 
@@ -11,15 +12,19 @@
 
 /**
  * Class Jetpack_Google_Drive_Helper
+ *
+ * @deprecated 13.4-a.10 Use Automattic\Jetpack\Forms\Service\Google_Drive_Helper
  */
 class Jetpack_Google_Drive_Helper {
 	/**
 	 * Checks if the user has a valid connection to Google Drive
 	 *
+	 * @deprecated 13.4-a.10 Use Automattic\Jetpack\Forms\Service\Google_Drive_Helper->has_valid_connection
 	 * @param int $user_id The user ID.
 	 * @return array       Array with single 'valid' (bool) entry.
 	 */
 	public static function has_valid_connection( $user_id ) {
+		_deprecated_function( __METHOD__, 'jetpack-13.4-a.10', 'Automattic\Jetpack\Forms\Service\Google_Drive_Helper->has_valid_connection' );
 		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return false;
@@ -63,12 +68,14 @@ public static function has_valid_connection( $user_id ) {
 	/**
 	 * Creates a Google Spreadsheet and returns some of its meta
 	 *
+	 * @deprecated 13.4-a.10 Use Automattic\Jetpack\Forms\Service\Google_Drive_Helper->create_sheet
 	 * @param int    $user_id The user ID.
 	 * @param string $title   The spreadsheet title.
 	 * @param array  $rows    Array of arrays with values.
 	 * @return array|WP_Error
 	 */
 	public static function create_sheet( $user_id, $title, $rows = array() ) {
+		_deprecated_function( __METHOD__, 'jetpack-13.4-a.10', 'Automattic\Jetpack\Forms\Service\Google_Drive_Helper->create_sheet' );
 		$site_id = Manager::get_site_id();
 		if ( is_wp_error( $site_id ) ) {
 			return false;

class.jetpack-gutenberg.php

@@ -725,11 +725,6 @@ public static function enqueue_block_editor_assets() {
 				 * @param bool true Enable the RePublicize UI in the block editor context. Defaults to true.
 				 */
 				'republicize_enabled'           => apply_filters( 'jetpack_block_editor_republicize_feature', true ),
-				/**
-				 * Prevent the registration of the blocks from extensions/blocks/contact-form
-				 * if the Forms package is enabled.
-				 */
-				'is_form_package_enabled'       => apply_filters( 'jetpack_contact_form_use_package', true ),
 			),
 			'siteFragment'     => $status->get_site_suffix(),
 			'adminUrl'         => esc_url( admin_url() ),

class.jetpack.php

@@ -5600,6 +5600,10 @@ public function deprecated_hooks() {
 				'replacement' => null,
 				'version'     => 'jetpack-13.2.0',
 			),
+			'jetpack_contact_form_use_package'             => array(
+				'replacement' => null,
+				'version'     => 'jetpack-13.4.0',
+			),
 		);
 
 		foreach ( $filter_deprecated_list as $tag => $args ) {

composer.json

@@ -27,7 +27,7 @@
 		"automattic/jetpack-constants": "^2.0.2",
 		"automattic/jetpack-device-detection": "^2.1.3",
 		"automattic/jetpack-error": "^2.0.2",
-		"automattic/jetpack-forms": "^0.30.19-alpha",
+		"automattic/jetpack-forms": "^0.31.0-alpha",
 		"automattic/jetpack-google-fonts-provider": "^0.7.2",
 		"automattic/jetpack-identity-crisis": "^0.18.6-alpha",
 		"automattic/jetpack-image-cdn": "^0.4.0-alpha",

jetpack_vendor/automattic/jetpack-forms/CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.30.19-alpha] - unreleased
+## [0.31.0-alpha] - unreleased
 
 This is an alpha version! The changes listed here are not final.
 
@@ -15,6 +15,9 @@ This is an alpha version! The changes listed here are not final.
 ### Changed
 - Updated package dependencies.
 
+### Removed
+- Contact Form: Removing code and renaming relevant references to ensure we use the package version of the contact form.
+
 ### Fixed
 - Fix reference to `Jetpack_Options` class in `Contact_Form_Plugin::record_tracks_event()`.
 
@@ -564,7 +567,7 @@ This is an alpha version! The changes listed here are not final.
 - Added a new jetpack/forms package [#28409]
 - Added a public load_contact_form method for initializing the contact form module. [#28416]
 
-[0.30.19-alpha]: https://github.com/automattic/jetpack-forms/compare/v0.30.18...v0.30.19-alpha
+[0.31.0-alpha]: https://github.com/automattic/jetpack-forms/compare/v0.30.18...v0.31.0-alpha
 [0.30.18]: https://github.com/automattic/jetpack-forms/compare/v0.30.17...v0.30.18
 [0.30.17]: https://github.com/automattic/jetpack-forms/compare/v0.30.16...v0.30.17
 [0.30.16]: https://github.com/automattic/jetpack-forms/compare/v0.30.15...v0.30.16

jetpack_vendor/automattic/jetpack-forms/src/class-jetpack-forms.php

@@ -15,7 +15,7 @@
  */
 class Jetpack_Forms {
 
-	const PACKAGE_VERSION = '0.30.19-alpha';
+	const PACKAGE_VERSION = '0.31.0-alpha';
 
 	/**
 	 * Load the contact form module.

jetpack_vendor/automattic/jetpack-forms/src/contact-form/class-admin.php

@@ -170,7 +170,7 @@ public function print_export_modal() {
 	 * Ajax handler for wp_ajax_grunion_export_to_gdrive.
 	 * Exports data to Google Drive, based on POST data.
 	 *
-	 * @see Grunion_Contact_Form_Plugin::get_feedback_entries_from_post
+	 * @see Contact_Form_Plugin::get_feedback_entries_from_post
 	 */
 	public function export_to_gdrive() {
 		$post_data = wp_unslash( $_POST );

jetpack_vendor/automattic/jetpack-forms/src/contact-form/class-editor-view.php

@@ -60,8 +60,8 @@ public static function grunion_media_button() {
 	 */
 	public static function mce_external_plugins( $plugin_array ) {
 		$plugin_array['grunion_form'] = Assets::get_file_url_for_environment(
-			'_inc/build/contact-form/js/tinymce-plugin-form-button.min.js',
-			'modules/contact-form/js/tinymce-plugin-form-button.js'
+			'jetpack_vendor/automattic/jetpack-forms/dist/contact-form/js/tinymce-plugin-form-button.min.js',
+			'jetpack_vendor/automattic/jetpack-forms/dist/contact-form/js/tinymce-plugin-form-button.js'
 		);
 		return $plugin_array;
 	}

jetpack_vendor/i18n-map.php

@@ -42,7 +42,7 @@
     ),
     'jetpack-forms' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-forms',
-      'ver' => '0.30.19-alpha1714750277',
+      'ver' => '0.31.0-alpha1715012262',
     ),
     'jetpack-google-fonts-provider' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-google-fonts-provider',