diff options
| -rwxr-xr-x | bin/highlight-query | 2 | ||||
| -rw-r--r-- | src/Utils/CLI.php | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/bin/highlight-query b/bin/highlight-query index fe916d9..85967cd 100755 --- a/bin/highlight-query +++ b/bin/highlight-query @@ -26,4 +26,4 @@ if (!$found) { } $cli = new SqlParser\Utils\CLI(); -exit($cli->run()); +exit($cli->runHighlight()); diff --git a/src/Utils/CLI.php b/src/Utils/CLI.php index 9fed84a..b654016 100644 --- a/src/Utils/CLI.php +++ b/src/Utils/CLI.php @@ -24,18 +24,23 @@ class CLI echo "Usage: highlight-query --query SQL [--format html|cli|text]\n"; } - public function parse() + public function mergeLongOpts(&$params, &$longopts) { - $longopts = array('help', 'query:', 'format:'); - $params = getopt( - 'hq:f:', $longopts - ); foreach ($longopts as $value) { $value = rtrim($value, ':'); if (isset($params[$value])) { $params[$value[0]] = $params[$value]; } } + } + + public function parseHighlight() + { + $longopts = array('help', 'query:', 'format:'); + $params = getopt( + 'hq:f:', $longopts + ); + $this->mergeLongOpts($params, $longopts); if (! isset($params['f'])) { $params['f'] = 'cli'; } @@ -46,9 +51,9 @@ class CLI return $params; } - public function run() + public function runHighlight() { - $params = $this->parse(); + $params = $this->parseHighlight(); if ($params === false) { return 1; } |