Tests: Update GitHub Actions for Node 20 deprecation

.github/workflows/_run-tests.yml

@@ -79,7 +79,7 @@ jobs:
     steps:
       - name: Define Test Group Name
         id: test-group
-        uses: mad9000/actions-find-and-replace-string@5
+        uses: mad9000/actions-find-and-replace-string@6
         with:
           source: ${{ inputs.test-group }}
           find: '/'
@@ -272,29 +272,26 @@ jobs:
 
       # Write any secrets, such as API keys, to the .env.testing file now.
       - name: Define GitHub Secrets in .env.testing
-        uses: DamianReeves/write-file-action@v1.3
-        with:
-          path: ${{ env.PLUGIN_DIR }}/.env.testing
-          contents: |
-            WORDPRESS_V3_BLOCK_EDITOR_ENABLED=${{ env.WORDPRESS_V3_BLOCK_EDITOR_ENABLED }}
-            WORDPRESS_DB_SQL_DUMP_FILE=${{ env.WORDPRESS_DB_SQL_DUMP_FILE }}
-            CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
-            CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
-            CONVERTKIT_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }}
-            CONVERTKIT_API_SECRET_NO_DATA=${{ env.CONVERTKIT_API_SECRET_NO_DATA }}
-            CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
-            CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
-            CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
-            CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
-            CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }}
-            CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }}
-            KIT_OAUTH_REDIRECT_URI=${{ env.KIT_OAUTH_REDIRECT_URI }}
-            CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
-            CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS }}
-            CONVERTKIT_API_RECAPTCHA_SITE_KEY=${{ env.CONVERTKIT_API_RECAPTCHA_SITE_KEY }}
-            CONVERTKIT_API_RECAPTCHA_SECRET_KEY=${{ env.CONVERTKIT_API_RECAPTCHA_SECRET_KEY }}
-
-          write-mode: overwrite
+        run: |
+          cat > ${{ env.PLUGIN_DIR }}/.env.testing << 'ENVEOF'
+          WORDPRESS_V3_BLOCK_EDITOR_ENABLED=${{ env.WORDPRESS_V3_BLOCK_EDITOR_ENABLED }}
+          WORDPRESS_DB_SQL_DUMP_FILE=${{ env.WORDPRESS_DB_SQL_DUMP_FILE }}
+          CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
+          CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
+          CONVERTKIT_API_KEY_NO_DATA=${{ env.CONVERTKIT_API_KEY_NO_DATA }}
+          CONVERTKIT_API_SECRET_NO_DATA=${{ env.CONVERTKIT_API_SECRET_NO_DATA }}
+          CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
+          CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
+          CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
+          CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
+          CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }}
+          CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }}
+          KIT_OAUTH_REDIRECT_URI=${{ env.KIT_OAUTH_REDIRECT_URI }}
+          CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
+          CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID_NO_ACCESS }}
+          CONVERTKIT_API_RECAPTCHA_SITE_KEY=${{ env.CONVERTKIT_API_RECAPTCHA_SITE_KEY }}
+          CONVERTKIT_API_RECAPTCHA_SECRET_KEY=${{ env.CONVERTKIT_API_RECAPTCHA_SECRET_KEY }}
+          ENVEOF
 
       # Installs wp-browser, Codeception, PHP CodeSniffer and anything else needed to run tests.
       - name: Run Composer

admin/importers/class-convertkit-admin-importer-convertkit-legacy-forms.php

@@ -0,0 +1,280 @@
+<?php
+/**
+ * ConvertKit Admin Importer Kit Legacy Forms class.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+
+/**
+ * Import and migrate data from Kit Legacy Forms to Kit.
+ *
+ * @package ConvertKit
+ * @author ConvertKit
+ */
+class ConvertKit_Admin_Importer_ConvertKit_Legacy_Forms extends ConvertKit_Admin_Importer {
+
+	/**
+	 * Holds the programmatic name of the importer (lowercase, no spaces).
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     string
+	 */
+	public $name = 'convertkit_legacy_forms';
+
+	/**
+	 * Holds the title of the importer (for display in the importer list).
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     string
+	 */
+	public $title = 'Kit Legacy Forms';
+
+	/**
+	 * Holds the shortcode name for ConvertKit Legacy Forms.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     string
+	 */
+	public $shortcode_name = 'convertkit_form';
+
+	/**
+	 * Holds the ID attribute names for Kit Legacy Form shortcodes.
+	 *
+	 * Both `form` and `id` are matched because Kit's `[convertkit_form]`
+	 * shortcode has supported both attribute names historically.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     array
+	 */
+	public $shortcode_id_attribute = array( 'form', 'id' );
+
+	/**
+	 * Holds the block name for ConvertKit Legacy Forms.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     string
+	 */
+	public $block_name = 'convertkit/form';
+
+	/**
+	 * Holds the ID attribute names for Kit Legacy Form blocks.
+	 *
+	 * Both `form` and `id` are matched because Kit's form block has supported
+	 * both attribute names historically.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @var     array
+	 */
+	public $block_id_attribute = array( 'form', 'id' );
+
+	/**
+	 * Constructor
+	 *
+	 * @since   3.3.5
+	 */
+	public function __construct() {
+
+		// Define a custom description for this importer.
+		$this->description = __( 'Kit Legacy Forms are being phased out. Use this tool to replace Kit Form shortcodes and blocks using a Legacy Form with a new Kit Form.', 'convertkit' );
+
+		// Register this as an importer, if ConvertKit Legacy Forms exist.
+		add_filter( 'convertkit_get_form_importers', array( $this, 'register' ) );
+
+	}
+
+	/**
+	 * Returns an array of Kit Legacy Forms form IDs and titles.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @return  array
+	 */
+	public function get_forms() {
+
+		// Query resource class to fetch legacy forms.
+		$forms            = array();
+		$convertkit_forms = new ConvertKit_Resource_Forms( 'settings' );
+		if ( $convertkit_forms->exist() ) {
+			foreach ( $convertkit_forms->get() as $form ) {
+				// Skip if not a Legacy Form.
+				if ( ! $convertkit_forms->is_legacy( $form['id'] ) ) {
+					continue;
+				}
+
+				$forms[ $form['id'] ] = $form['name'];
+			}
+		}
+
+		return $forms;
+
+	}
+
+	/**
+	 * Returns an array of legacy Kit form IDs (as strings) for use in
+	 * filtering shortcodes/blocks that reference them.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @return  array
+	 */
+	private function get_legacy_form_ids() {
+
+		$legacy_ids       = array();
+		$convertkit_forms = new ConvertKit_Resource_Forms( 'settings' );
+
+		if ( ! $convertkit_forms->exist() ) {
+			return $legacy_ids;
+		}
+
+		foreach ( $convertkit_forms->get() as $form ) {
+			if ( ! $convertkit_forms->is_legacy( $form['id'] ) ) {
+				continue;
+			}
+			$legacy_ids[] = (string) $form['id'];
+		}
+
+		return $legacy_ids;
+
+	}
+
+	/**
+	 * Overrides the parent method to:
+	 * - return form IDs found in both shortcodes AND blocks (the parent only
+	 *   handles shortcodes), and
+	 * - filter the result so only legacy form IDs are returned.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @param   string $content    Content containing Kit Form shortcodes / blocks.
+	 * @return  array
+	 */
+	public function get_form_ids_from_content( $content ) {
+
+		// Get shortcode-derived form IDs from the parent.
+		$shortcode_ids = parent::get_form_ids_from_content( $content );
+
+		// Get block-derived form IDs (parent only handles shortcodes).
+		$block_ids = $this->get_block_form_ids_from_content( $content );
+
+		// Combine and filter to legacy form IDs only.
+		$all_ids    = array_unique( array_merge( $shortcode_ids, $block_ids ) );
+		$legacy_ids = $this->get_legacy_form_ids();
+
+		// Cast both sides to strings for safe comparison.
+		$all_ids = array_map( 'strval', $all_ids );
+
+		return array_values( array_intersect( $all_ids, $legacy_ids ) );
+
+	}
+
+	/**
+	 * Returns an array of form IDs from convertkit/form blocks in the given
+	 * content. Walks innerBlocks recursively.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @param   string $content    Content containing Kit Form blocks.
+	 * @return  array
+	 */
+	private function get_block_form_ids_from_content( $content ) {
+
+		return $this->extract_block_form_ids( parse_blocks( $content ) );
+
+	}
+
+	/**
+	 * Recursively walks blocks (and innerBlocks) and returns an array of form
+	 * IDs from any convertkit/form block's `form` attribute.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @param   array $blocks    Blocks.
+	 * @return  array
+	 */
+	private function extract_block_form_ids( $blocks ) {
+
+		$form_ids = array();
+
+		// Normalise the block ID attribute(s) to an array so we can match
+		// against multiple attribute names (e.g. both `form` and `id`).
+		$id_attributes = (array) $this->block_id_attribute;
+
+		foreach ( $blocks as $block ) {
+			if ( ! empty( $block['innerBlocks'] ) ) {
+				$form_ids = array_merge(
+					$form_ids,
+					$this->extract_block_form_ids( $block['innerBlocks'] )
+				);
+			}
+
+			if ( $block['blockName'] !== $this->block_name ) {
+				continue;
+			}
+
+			// Record the form ID from the first matching attribute. If a block
+			// somehow has both `form` and `id` set, they'd be the same value, so
+			// we stop after the first match to avoid double-counting.
+			foreach ( $id_attributes as $id_attribute ) {
+				if ( empty( $block['attrs'][ $id_attribute ] ) ) {
+					continue;
+				}
+				$form_ids[] = (string) $block['attrs'][ $id_attribute ];
+				break;
+			}
+		}
+
+		return $form_ids;
+
+	}
+
+	/**
+	 * Overrides the parent method to only return post IDs whose content
+	 * contains a Kit Form shortcode or block referencing a legacy form ID.
+	 *
+	 * The parent's broad SQL match returns any post containing a
+	 * `[convertkit_form` shortcode or `<!-- wp:convertkit/form` block, which
+	 * for the Kit Legacy Forms importer is too broad: non-legacy uses of these
+	 * shortcodes/blocks are valid and should not appear in the importer UI.
+	 *
+	 * @since   3.3.5
+	 *
+	 * @return  array
+	 */
+	public function get_forms_in_posts() {
+
+		$candidate_post_ids = parent::get_forms_in_posts();
+
+		if ( empty( $candidate_post_ids ) ) {
+			return array();
+		}
+
+		$legacy_ids = $this->get_legacy_form_ids();
+		if ( empty( $legacy_ids ) ) {
+			return array();
+		}
+
+		$matched_post_ids = array();
+		foreach ( $candidate_post_ids as $post_id ) {
+			$content = get_post_field( 'post_content', $post_id );
+
+			// get_form_ids_from_content() (overridden above) returns only legacy IDs
+			// from both shortcodes and blocks, so any non-empty result means this
+			// post contains at least one legacy form reference.
+			$legacy_form_ids_in_content = $this->get_form_ids_from_content( $content );
+			if ( ! empty( $legacy_form_ids_in_content ) ) {
+				$matched_post_ids[] = $post_id;
+			}
+		}
+
+		return $matched_post_ids;
+
+	}
+
+}