Refactor --defaults flag handling

Author: schlessera

src/DB_Command.php

@@ -80,7 +80,7 @@ class DB_Command extends WP_CLI_Command {
 	 */
 	public function create( $_, $assoc_args ) {
 
-		$this->run_query( self::get_create_query(), self::get_dbuser_dbpass_args( $assoc_args ) );
+		$this->run_query( self::get_create_query(), $assoc_args );
 
 		WP_CLI::success( 'Database created.' );
 	}
@@ -111,7 +111,7 @@ public function create( $_, $assoc_args ) {
 	public function drop( $_, $assoc_args ) {
 		WP_CLI::confirm( "Are you sure you want to drop the '" . DB_NAME . "' database?", $assoc_args );
 
-		$this->run_query( sprintf( 'DROP DATABASE `%s`', DB_NAME ), self::get_dbuser_dbpass_args( $assoc_args ) );
+		$this->run_query( sprintf( 'DROP DATABASE `%s`', DB_NAME ), $assoc_args );
 
 		WP_CLI::success( 'Database dropped.' );
 	}
@@ -142,10 +142,8 @@ public function drop( $_, $assoc_args ) {
 	public function reset( $_, $assoc_args ) {
 		WP_CLI::confirm( "Are you sure you want to reset the '" . DB_NAME . "' database?", $assoc_args );
 
-		$mysql_args = self::get_dbuser_dbpass_args( $assoc_args );
-
-		$this->run_query( sprintf( 'DROP DATABASE IF EXISTS `%s`', DB_NAME ), $mysql_args );
-		$this->run_query( self::get_create_query(), $mysql_args );
+		$this->run_query( sprintf( 'DROP DATABASE IF EXISTS `%s`', DB_NAME ), $assoc_args );
+		$this->run_query( self::get_create_query(), $assoc_args );
 
 		WP_CLI::success( 'Database reset.' );
 	}
@@ -187,8 +185,6 @@ public function clean( $_, $assoc_args ) {
 			$assoc_args
 		);
 
-		$mysql_args = self::get_dbuser_dbpass_args( $assoc_args );
-
 		$tables = Utils\wp_get_table_names(
 			[],
 			[ 'all-tables-with-prefix' => true ]
@@ -201,7 +197,7 @@ public function clean( $_, $assoc_args ) {
 					DB_NAME,
 					$table
 				),
-				$mysql_args
+				$assoc_args
 			);
 		}
 
@@ -721,7 +717,6 @@ public function import( $args, $assoc_args ) {
 		$mysql_args = [
 			'database' => DB_NAME,
 		];
-		$mysql_args = array_merge( self::get_dbuser_dbpass_args( $assoc_args ), $mysql_args );
 
 		if ( '-' !== $result_file ) {
 			if ( ! is_readable( $result_file ) ) {
@@ -1548,12 +1543,14 @@ protected function run_query( $query, $assoc_args = [] ) {
 
 		WP_CLI::debug( "Query: {$query}", 'db' );
 
+		$mysql_args = self::get_mysql_args( $assoc_args );
+
 		self::run(
 			sprintf(
 				'/usr/bin/env mysql%s --no-auto-rehash',
 				$this->get_defaults_flag_string( $assoc_args )
 			),
-			array_merge( $assoc_args, [ 'execute' => $query ] )
+			array_merge( $mysql_args, [ 'execute' => $query ] )
 		);
 	}
 
@@ -1604,25 +1601,6 @@ private static function run( $cmd, $assoc_args = [], $send_to_shell = true, $int
 		return Utils\run_mysql_command( $cmd, $final_args, null, $send_to_shell, $interactive );
 	}
 
-	/**
-	 * Helper to pluck 'dbuser' and 'dbpass' from associative args array.
-	 *
-	 * @param array $assoc_args Associative args array.
-	 * @return array Array with `dbuser' and 'dbpass' set if in passed-in associative args array.
-	 */
-	private static function get_dbuser_dbpass_args( $assoc_args ) {
-		$mysql_args = [];
-		$dbuser     = Utils\get_flag_value( $assoc_args, 'dbuser' );
-		if ( null !== $dbuser ) {
-			$mysql_args['dbuser'] = $dbuser;
-		}
-		$dbpass = Utils\get_flag_value( $assoc_args, 'dbpass' );
-		if ( null !== $dbpass ) {
-			$mysql_args['dbpass'] = $dbpass;
-		}
-		return $mysql_args;
-	}
-
 	/**
 	 * Gets the column names of a db table differentiated into key columns and text columns and all columns.
 	 *