Test with framework changes

Author: swissspidy

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "wp-cli/wp-cli": "^2.12"
+        "wp-cli/wp-cli": "dev-try/mariadb-detection as 2.12"
     },
     "require-dev": {
         "wp-cli/entity-command": "^1.3 || ^2",

src/DB_Command.php

@@ -398,8 +398,8 @@ public function repair( $_, $assoc_args ) {
 	public function cli( $_, $assoc_args ) {
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -501,8 +501,8 @@ public function cli( $_, $assoc_args ) {
 	public function query( $args, $assoc_args ) {
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -740,8 +740,8 @@ private function get_posts_table_charset( $assoc_args ) {
 
 		list( $stdout, $stderr, $exit_code ) = self::run(
 			sprintf(
-				'/usr/bin/env %s%s --no-auto-rehash --batch --skip-column-names',
-				$this->get_mysql_command(),
+				'%s%s --no-auto-rehash --batch --skip-column-names',
+				Utils\get_mysql_binary_path(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			[ 'execute' => $query ],
@@ -829,8 +829,8 @@ public function import( $args, $assoc_args ) {
 		}
 
 		$command = sprintf(
-			'/usr/bin/env %s%s --no-auto-rehash',
-			$this->get_mysql_command(),
+			'%s%s --no-auto-rehash',
+			Utils\get_mysql_binary_path(),
 			$this->get_defaults_flag_string( $assoc_args )
 		);
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
@@ -1765,8 +1765,8 @@ protected function run_query( $query, $assoc_args = [] ) {
 
 		self::run(
 			sprintf(
-				'/usr/bin/env %s%s --no-auto-rehash',
-				$this->get_mysql_command(),
+				'%s%s --no-auto-rehash',
+				Utils\get_mysql_binary_path(),
 				$this->get_defaults_flag_string( $assoc_args )
 			),
 			array_merge( [ 'execute' => $query ], $mysql_args )
@@ -2166,7 +2166,7 @@ protected function get_current_sql_modes( $assoc_args ) {
 
 			list( $stdout, $stderr, $exit_code ) = self::run(
 				sprintf(
-					'/usr/bin/env %s%s --no-auto-rehash --batch --skip-column-names',
+					'%s%s --no-auto-rehash --batch --skip-column-names',
 					$this->get_mysql_command(),
 					$this->get_defaults_flag_string( $assoc_args )
 				),
@@ -2199,22 +2199,13 @@ protected function get_current_sql_modes( $assoc_args ) {
 		return $modes;
 	}
 
-	/**
-	 * Returns the correct `mysql` command based on the detected database type.
-	 *
-	 * @return string The appropriate check command.
-	 */
-	private function get_mysql_command() {
-		return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb' : 'mysql';
-	}
-
 	/**
 	 * Returns the correct `check` command based on the detected database type.
 	 *
 	 * @return string The appropriate check command.
 	 */
 	private function get_check_command() {
-		return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-check' : 'mysqlcheck';
+		return 'mariadb' === Utils\get_db_type() ? 'mariadb-check' : 'mysqlcheck';
 	}
 
 	/**
@@ -2223,6 +2214,6 @@ private function get_check_command() {
 	 * @return string The appropriate dump command.
 	 */
 	private function get_dump_command() {
-		return ( strpos( Utils\get_mysql_version(), 'MariaDB' ) !== false ) ? 'mariadb-dump' : 'mysqldump';
+		return 'mariadb' === Utils\get_db_type() ? 'mariadb-dump' : 'mysqldump';
 	}
 }