Revert and whitelist breaking changes

Author: schlessera

functions.php

@@ -1,8 +1,7 @@
 <?php
 
-use WP_CLI\Utils;
-
-function wpcli_export( $args = array() ) {
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound -- Renaming breaks Phar compat.
+function wp_export( $args = array() ) {
 	$defaults     = array(
 		'filters'     => array(),
 		'format'      => 'WP_Export_WXR_Formatter',
@@ -20,14 +19,14 @@ function wpcli_export( $args = array() ) {
 	}
 }
 
-function wpcli_export_build_in_condition( $column_name, $values, $format = '%s' ) {
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedFunctionFound,WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid -- Renaming breaks Phar compat.
+function _wp_export_build_IN_condition( $column_name, $values, $format = '%s' ) {
 	global $wpdb;
 
 	if ( ! is_array( $values ) || empty( $values ) ) {
 		return '';
 	}
-	$formats         = implode( ', ', array_fill( 0, count( $values ), $format ) );
-	$column_name_sql = Utils\esc_sql_ident( $column_name );
+	$formats = implode( ', ', array_fill( 0, count( $values ), $format ) );
 	// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared,WordPress.DB.PreparedSQLPlaceholders.UnfinishedPrepare -- $column_name_sql escaped as ident, $formats hardcoded value.
-	return $wpdb->prepare( "{$column_name_sql} IN ({$formats})", $values );
+	return $wpdb->prepare( "{$column_name} IN ({$formats})", $values );
 }

src/Export_Command.php

@@ -2,7 +2,8 @@
 
 use WP_CLI\Utils;
 
-define( 'WPCLI_EXPORT_COMMAND_NO_SPLIT', '-1' );
+// phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedConstantFound -- Changing breaks Phar compat.
+define( 'WP_CLI_EXPORT_COMMAND_NO_SPLIT', '-1' );
 
 /**
  * Exports WordPress content to a WXR file.
@@ -175,15 +176,15 @@ function( $file_path ) {
 
 		try {
 			if ( $this->stdout ) {
-				wpcli_export(
+				wp_export(
 					[
 						'filters'     => $this->export_args,
 						'writer'      => 'WP_Export_Stdout_Writer',
 						'writer_args' => null,
 					]
 				);
 			} else {
-				wpcli_export(
+				wp_export(
 					[
 						'filters'     => $this->export_args,
 						'writer'      => 'WP_Export_Split_Files_Writer',

src/WP_Export_Query.php

@@ -211,7 +211,7 @@ private function post_type_where() {
 			unset( $post_types['attachment'] );
 		}
 
-		$this->wheres[] = wpcli_export_build_in_condition( 'p.post_type', $post_types );
+		$this->wheres[] = _wp_export_build_IN_condition( 'p.post_type', $post_types );
 	}
 
 	private function status_where() {
@@ -299,7 +299,7 @@ private function include_attachment_ids( $post_ids ) {
 		$attachment_ids    = [];
 		$batch_of_post_ids = array_splice( $post_ids, 0, self::QUERY_CHUNK );
 		while ( $batch_of_post_ids ) {
-			$post_parent_condition = wpcli_export_build_in_condition( 'post_parent', $batch_of_post_ids );
+			$post_parent_condition = _wp_export_build_IN_condition( 'post_parent', $batch_of_post_ids );
 			// phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared -- Escaped in wpcli_export_build_in_condition() function.
 			$attachment_ids = array_merge( $attachment_ids, (array) $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} WHERE post_type = 'attachment' AND {$post_parent_condition}" ) );
 		}

src/WP_Export_Split_Files_Writer.php

@@ -23,8 +23,8 @@ public function __construct( $formatter, $writer_args = [] ) {
 		//TODO: check if args are not missing
 		if ( is_null( $writer_args['max_file_size'] ) ) {
 			$this->max_file_size = 15 * MB_IN_BYTES;
-		} elseif ( WPCLI_EXPORT_COMMAND_NO_SPLIT === $writer_args['max_file_size'] ) {
-			$this->max_file_size = WPCLI_EXPORT_COMMAND_NO_SPLIT;
+		} elseif ( WP_CLI_EXPORT_COMMAND_NO_SPLIT === $writer_args['max_file_size'] ) {
+			$this->max_file_size = WP_CLI_EXPORT_COMMAND_NO_SPLIT;
 		} else {
 			$this->max_file_size = $writer_args['max_file_size'] * MB_IN_BYTES;
 		}
@@ -38,7 +38,7 @@ public function __construct( $formatter, $writer_args = [] ) {
 	public function export() {
 		$this->start_new_file();
 		foreach ( $this->formatter->posts() as $post_xml ) {
-			if ( WPCLI_EXPORT_COMMAND_NO_SPLIT !== $this->max_file_size && $this->current_file_size + strlen( $post_xml ) > $this->max_file_size ) {
+			if ( WP_CLI_EXPORT_COMMAND_NO_SPLIT !== $this->max_file_size && $this->current_file_size + strlen( $post_xml ) > $this->max_file_size ) {
 				$this->start_new_file();
 			}
 			$this->write( $post_xml );

src/WP_Post_IDs_Iterator.php

@@ -52,7 +52,7 @@ public function valid() {
 
 	private function load_next_posts_from_db() {
 		$next_batch_post_ids = array_splice( $this->ids_left, 0, $this->limit );
-		$in_post_ids_sql     = wpcli_export_build_in_condition( 'ID', $next_batch_post_ids );
+		$in_post_ids_sql     = _wp_export_build_IN_condition( 'ID', $next_batch_post_ids );
 		$this->results       = $this->db->get_results( "SELECT * FROM {$this->db->posts} WHERE $in_post_ids_sql" );
 		if ( ! $this->results ) {
 			if ( $this->db->last_error ) {