Move debug statements around

Author: schlessera

src/DB_Command.php

@@ -227,14 +227,14 @@ public function check( $_, $assoc_args ) {
 
 		$command = sprintf( '/usr/bin/env mysqlcheck%s %s', $this->get_defaults_flag_string( $assoc_args ), '%s' );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		$assoc_args['check'] = true;
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
 		);
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		WP_CLI::success( 'Database checked.' );
 	}
 
@@ -271,14 +271,14 @@ public function optimize( $_, $assoc_args ) {
 
 		$command = sprintf( '/usr/bin/env mysqlcheck%s %s', $this->get_defaults_flag_string( $assoc_args ), '%s' );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		$assoc_args['optimize'] = true;
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
 		);
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		WP_CLI::success( 'Database optimized.' );
 	}
 
@@ -315,14 +315,14 @@ public function repair( $_, $assoc_args ) {
 
 		$command = sprintf( '/usr/bin/env mysqlcheck%s %s', $this->get_defaults_flag_string( $assoc_args ), '%s' );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		$assoc_args['repair'] = true;
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
 		);
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		WP_CLI::success( 'Database repaired.' );
 	}
 
@@ -361,12 +361,12 @@ public function cli( $_, $assoc_args ) {
 
 		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		if ( ! isset( $assoc_args['database'] ) ) {
 			$assoc_args['database'] = DB_NAME;
 		}
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		self::run( $command, $assoc_args );
 	}
 
@@ -427,7 +427,6 @@ public function query( $args, $assoc_args ) {
 
 		$command = sprintf( '/usr/bin/env mysql%s --no-auto-rehash', $this->get_defaults_flag_string( $assoc_args ) );
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		$assoc_args['database'] = DB_NAME;
 
@@ -453,6 +452,7 @@ public function query( $args, $assoc_args ) {
 			$assoc_args['execute'] = $this->get_sql_mode_query( $assoc_args ) . $assoc_args['execute'];
 		}
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		self::run( $command, $assoc_args );
 	}
 
@@ -563,7 +563,6 @@ public function export( $args, $assoc_args ) {
 
 		$initial_command = sprintf( '/usr/bin/env mysqldump%s ', $this->get_defaults_flag_string( $assoc_args ) );
 		WP_CLI::debug( "Running initial shell command: {$initial_command}", 'db' );
-		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 
 		if ( $support_column_statistics ) {
 			$command = $initial_command . '--skip-column-statistics %s';
@@ -599,6 +598,7 @@ public function export( $args, $assoc_args ) {
 		// Remove parameters not needed for SQL run.
 		unset( $assoc_args['porcelain'] );
 
+		WP_CLI::debug( 'Associative arguments: ' . json_encode( $assoc_args ), 'db' );
 		self::run( $escaped_command, $assoc_args );
 
 		if ( $porcelain ) {
@@ -1003,7 +1003,7 @@ public function size( $args, $assoc_args ) {
 		}
 
 		if ( ! empty( $size_format ) && ! $tables && ! $format && ! $human_readable && true !== $all_tables && true !== $all_tables_with_prefix ) {
-			WP_CLI::Line( filter_var( $rows[0]['Size'], FILTER_SANITIZE_NUMBER_INT ) );
+			WP_CLI::line( filter_var( $rows[0]['Size'], FILTER_SANITIZE_NUMBER_INT ) );
 		} else {
 			// Display the rows.
 			$args = [
@@ -1471,6 +1471,8 @@ protected function run_query( $query, $assoc_args = [] ) {
 		// Ensure that the SQL mode is compatible with WPDB.
 		$query = $this->get_sql_mode_query( $assoc_args ) . $query;
 
+		WP_CLI::debug( "Query: {$query}", 'db' );
+
 		self::run(
 			sprintf(
 				'/usr/bin/env mysql%s --no-auto-rehash',