Skip to content

Commit df5dbba

Browse files
committed
inline
1 parent 3be0a6e commit df5dbba

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

src/Context/FeatureContext.php

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,15 +1166,6 @@ private function set_cache_dir(): void {
11661166
$this->variables['CACHE_DIR'] = $path;
11671167
}
11681168

1169-
/**
1170-
* Check if the current database type is MariaDB.
1171-
*
1172-
* @return bool True if MariaDB, false otherwise.
1173-
*/
1174-
private static function is_mariadb() {
1175-
return 'mariadb' === self::$db_type;
1176-
}
1177-
11781169
/**
11791170
* Run a MySQL command with `$db_settings`.
11801171
*
@@ -1213,7 +1204,7 @@ public function create_db(): void {
12131204
}
12141205

12151206
$dbname = self::$db_settings['dbname'];
1216-
$ssl_flag = self::is_mariadb() ? ' --ssl-verify-server-cert' : '';
1207+
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
12171208
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "CREATE DATABASE IF NOT EXISTS $dbname" ] );
12181209
}
12191210

@@ -1225,7 +1216,7 @@ public function test_connection(): void {
12251216
return;
12261217
}
12271218

1228-
$ssl_flag = self::is_mariadb() ? ' --ssl-verify-server-cert' : '';
1219+
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
12291220
$sql_result = self::run_sql(
12301221
self::$mysql_binary . ' --no-defaults' . $ssl_flag,
12311222
[
@@ -1254,7 +1245,7 @@ public function drop_db(): void {
12541245
return;
12551246
}
12561247
$dbname = self::$db_settings['dbname'];
1257-
$ssl_flag = self::is_mariadb() ? ' --ssl-verify-server-cert' : '';
1248+
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
12581249
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "DROP DATABASE IF EXISTS $dbname" ] );
12591250
}
12601251

@@ -1492,7 +1483,7 @@ public function install_wp( $subdir = '', $version = '' ): void {
14921483
if ( 'sqlite' === self::$db_type ) {
14931484
copy( "{$install_cache_path}.sqlite", "$run_dir/wp-content/database/.ht.sqlite" );
14941485
} else {
1495-
$ssl_flag = self::is_mariadb() ? ' --ssl-verify-server-cert' : '';
1486+
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
14961487
self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
14971488
}
14981489
} else {
@@ -1506,7 +1497,7 @@ public function install_wp( $subdir = '', $version = '' ): void {
15061497
$mysqldump_binary = Utils\get_sql_dump_command();
15071498
$mysqldump_binary = Utils\force_env_on_nix_systems( $mysqldump_binary );
15081499
$support_column_statistics = exec( "{$mysqldump_binary} --help | grep 'column-statistics'" );
1509-
$ssl_flag = self::is_mariadb() ? ' --ssl-verify-server-cert' : '';
1500+
$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
15101501
$command = "{$mysqldump_binary} --no-defaults{$ssl_flag} --no-tablespaces";
15111502
if ( $support_column_statistics ) {
15121503
$command .= ' --skip-column-statistics';

0 commit comments

Comments
 (0)