Skip to content

Commit bbb476a

Browse files
committed
Fix typo and code structure
1 parent 228d2d7 commit bbb476a

File tree

1 file changed

+92
-6
lines changed

1 file changed

+92
-6
lines changed

src/DB_Command.php

Lines changed: 92 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,22 +1436,108 @@ private function get_colors( $assoc_args, $colors ) {
14361436
}
14371437

14381438
/**
1439-
* Helper to pluck `mysql` opitons from associative args array.
1439+
* Helper to pluck `mysql` options from associative args array.
14401440
*
14411441
* @param array $assoc_args Associative args array.
1442-
* @return array Array with `mysql` opitons set if in passed-in associative args array.
1442+
* @return array Array with `mysql` options set if in passed-in associative args array.
14431443
*/
14441444
private static function get_mysql_args( $assoc_args ) {
14451445

1446-
$allowed_mysql_option = [ 'auto-rehash', 'auto-vertical-output', 'batch', 'binary-as-hex', 'binary-mode', 'bind-address', 'character-sets-dir', 'column-names', 'column-type-info', 'comments', 'compress', 'connect-expired-password', 'connect_timeout', 'database', 'debug', 'debug-check', 'debug-info', 'default-auth', 'default-character-set', 'defaults-extra-file', 'defaults-file', 'defaults-group-suffix', 'delimiter', 'enable-cleartext-plugin', 'execute', 'force', 'get-server-public-key', 'help', 'histignore', 'host', 'html', 'ignore-spaces', 'init-command', 'line-numbers', 'local-infile', 'login-path', 'max_allowed_packet', 'max_join_size', 'named-commands', 'net_buffer_length', 'no-beep', 'one-database', 'pager', 'pipe', 'plugin-dir', 'port', 'print-defaults', 'protocol', 'quick', 'raw', 'reconnect', 'i-am-a-dummy', 'safe-updates', 'secure-auth', 'select_limit', 'server-public-key-path', 'shared-memory-base-name', 'show-warnings', 'sigint-ignore', 'silent', 'skip-auto-rehash', 'skip-column-names', 'skip-line-numbers', 'skip-named-commands', 'skip-pager', 'skip-reconnect', 'socket', 'ssl-ca', 'ssl-capath', 'ssl-cert', 'ssl-cipher', 'ssl-crl', 'ssl-crlpath', 'ssl-fips-mode', 'ssl-key', 'ssl-mode', 'syslog', 'table', 'tee', 'tls-version', 'unbuffered', 'verbose', 'version', 'vertical', 'wait', 'xml' ];
1446+
$allowed_mysql_options = [
1447+
'auto-rehash',
1448+
'auto-vertical-output',
1449+
'batch',
1450+
'binary-as-hex',
1451+
'binary-mode',
1452+
'bind-address',
1453+
'character-sets-dir',
1454+
'column-names',
1455+
'column-type-info',
1456+
'comments',
1457+
'compress',
1458+
'connect-expired-password',
1459+
'connect_timeout',
1460+
'database',
1461+
'debug',
1462+
'debug-check',
1463+
'debug-info',
1464+
'default-auth',
1465+
'default-character-set',
1466+
'defaults-extra-file',
1467+
'defaults-file',
1468+
'defaults-group-suffix',
1469+
'delimiter',
1470+
'enable-cleartext-plugin',
1471+
'execute',
1472+
'force',
1473+
'get-server-public-key',
1474+
'help',
1475+
'histignore',
1476+
'host',
1477+
'html',
1478+
'ignore-spaces',
1479+
'init-command',
1480+
'line-numbers',
1481+
'local-infile',
1482+
'login-path',
1483+
'max_allowed_packet',
1484+
'max_join_size',
1485+
'named-commands',
1486+
'net_buffer_length',
1487+
'no-beep',
1488+
'one-database',
1489+
'pager',
1490+
'pipe',
1491+
'plugin-dir',
1492+
'port',
1493+
'print-defaults',
1494+
'protocol',
1495+
'quick',
1496+
'raw',
1497+
'reconnect',
1498+
'i-am-a-dummy',
1499+
'safe-updates',
1500+
'secure-auth',
1501+
'select_limit',
1502+
'server-public-key-path',
1503+
'shared-memory-base-name',
1504+
'show-warnings',
1505+
'sigint-ignore',
1506+
'silent',
1507+
'skip-auto-rehash',
1508+
'skip-column-names',
1509+
'skip-line-numbers',
1510+
'skip-named-commands',
1511+
'skip-pager',
1512+
'skip-reconnect',
1513+
'socket',
1514+
'ssl-ca',
1515+
'ssl-capath',
1516+
'ssl-cert',
1517+
'ssl-cipher',
1518+
'ssl-crl',
1519+
'ssl-crlpath',
1520+
'ssl-fips-mode',
1521+
'ssl-key',
1522+
'ssl-mode',
1523+
'syslog',
1524+
'table',
1525+
'tee',
1526+
'tls-version',
1527+
'unbuffered',
1528+
'verbose',
1529+
'version',
1530+
'vertical',
1531+
'wait',
1532+
'xml'
1533+
];
14471534

14481535
$mysql_args = array();
14491536

14501537
foreach ( $assoc_args as $mysql_option_key => $mysql_option_value ) {
1451-
// check flags is valid flag or not.
1452-
if ( in_array( $mysql_option_key, $allowed_mysql_option, true ) && ! empty( $mysql_option_value ) ) {
1538+
// Check flags to make sure they only contain valid options.
1539+
if ( in_array( $mysql_option_key, $allowed_mysql_options, true ) && ! empty( $mysql_option_value ) ) {
14531540
$mysql_args[$mysql_option_key] = $mysql_option_value;
1454-
14551541
}
14561542
}
14571543

0 commit comments

Comments
 (0)