diff options
86 files changed, 242 insertions, 215 deletions
@@ -13,7 +13,10 @@ return PhpCsFixer\Config::create() '@Symfony' => true, 'array_syntax' => array('syntax' => 'long'), 'concat_space' => array('spacing' => true), + 'ordered_imports' => true, 'no_trailing_whitespace' => true, + 'no_useless_return' => true, + 'no_useless_else' => true, 'phpdoc_add_missing_param_annotation' => true, 'phpdoc_order' => true, )) diff --git a/locale/ja/LC_MESSAGES/sqlparser.mo b/locale/ja/LC_MESSAGES/sqlparser.mo Binary files differindex a52c5fc..eec707b 100644 --- a/locale/ja/LC_MESSAGES/sqlparser.mo +++ b/locale/ja/LC_MESSAGES/sqlparser.mo diff --git a/locale/ja/LC_MESSAGES/sqlparser.po b/locale/ja/LC_MESSAGES/sqlparser.po index e9fd114..dd54463 100644 --- a/locale/ja/LC_MESSAGES/sqlparser.po +++ b/locale/ja/LC_MESSAGES/sqlparser.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: SQL parser 0\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-01-24 10:49+0100\n" -"PO-Revision-Date: 2016-12-27 15:16+0000\n" +"PO-Revision-Date: 2017-02-13 11:33+0000\n" "Last-Translator: Fujiwara Software <fujisoft@gmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/phpmyadmin/sql-" "parser/ja/>\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.11-dev\n" +"X-Generator: Weblate 2.12-dev\n" #: src/Component.php:43 src/Component.php:63 msgid "Not implemented yet." @@ -121,10 +121,8 @@ msgid "Keyword \"TO\" was expected." msgstr "キーワード \"TO\" があるべきです。" #: src/Components/RenameOperation.php:123 -#, fuzzy -#| msgid "The number of tables that are open." msgid "The new name of the table was expected." -msgstr "開いているテーブルの数。" +msgstr "テーブルの新しい名前が必要です。" #: src/Components/RenameOperation.php:141 #, fuzzy @@ -133,16 +131,12 @@ msgid "A rename operation was expected." msgstr "行を削除しました" #: src/Components/SetOperation.php:105 -#, fuzzy -#| msgid "as regular expression" msgid "Missing expression." -msgstr "正規表現" +msgstr "式がありません。" #: src/Lexer.php:237 -#, fuzzy -#| msgid "Unexpected characters on line %s." msgid "Unexpected character." -msgstr "予期しない文字 (行: %s)。" +msgstr "予期しない文字。" #: src/Lexer.php:278 msgid "Expected whitespace(s) before delimiter." @@ -197,7 +191,7 @@ msgstr "予期しない節の順序。" #, fuzzy #| msgid "The number of tables that are open." msgid "The name of the entity was expected." -msgstr "開いているテーブルの数。" +msgstr "エンティティの名前が必要です。" #: src/Statements/CreateStatement.php:430 msgid "A table name was expected." diff --git a/locale/zh_TW/LC_MESSAGES/sqlparser.mo b/locale/zh_TW/LC_MESSAGES/sqlparser.mo Binary files differindex d894dde..bd68438 100644 --- a/locale/zh_TW/LC_MESSAGES/sqlparser.mo +++ b/locale/zh_TW/LC_MESSAGES/sqlparser.mo diff --git a/locale/zh_TW/LC_MESSAGES/sqlparser.po b/locale/zh_TW/LC_MESSAGES/sqlparser.po index ee7de0c..1dfab71 100644 --- a/locale/zh_TW/LC_MESSAGES/sqlparser.po +++ b/locale/zh_TW/LC_MESSAGES/sqlparser.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: SQL parser 0\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-01-24 10:49+0100\n" -"PO-Revision-Date: 2017-02-10 16:44+0000\n" +"PO-Revision-Date: 2017-02-10 16:51+0000\n" "Last-Translator: hd hd <hd@cgsword.com>\n" "Language-Team: Chinese (Taiwan) " "<https://hosted.weblate.org/projects/phpmyadmin/sql-parser/zh_TW/>\n" @@ -22,20 +22,21 @@ msgstr "尚未實作。" #: src/Components/AlterOperation.php:224 src/Statement.php:334 msgid "" "A new statement was found, but no delimiter between it and the previous one." -msgstr "找到新的陳述句，但與前一個陳述句之間未加入間隔符號。" +msgstr "找到新的陳述句，但與前一陳述句之間沒有分隔符。" #: src/Components/AlterOperation.php:236 +#, fuzzy msgid "Unrecognized alter operation." -msgstr "無法辨識的修改(Alter)操作。" +msgstr "無法識別的修改操作。" #: src/Components/Array2d.php:88 #, php-format msgid "%1$d values were expected, but found %2$d." -msgstr "預期要有 %1$d 個數值，但只找到 %2$d 個。" +msgstr "預期 %1$d 個數值，但找到 %2$d 個。" #: src/Components/Array2d.php:111 msgid "An opening bracket followed by a set of values was expected." -msgstr "預期要於數值之後接著開始括號。" +msgstr "預期開括號後有一組數值。" #: src/Components/ArrayObj.php:114 src/Components/CreateDefinition.php:201 msgid "An opening bracket was expected." diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php index feeb169..e86ddfd 100644 --- a/src/Components/ArrayObj.php +++ b/src/Components/ArrayObj.php @@ -182,8 +182,8 @@ class ArrayObj extends Component return implode(', ', $component); } elseif (!empty($component->raw)) { return '(' . implode(', ', $component->raw) . ')'; - } else { - return '(' . implode(', ', $component->values) . ')'; } + + return '(' . implode(', ', $component->values) . ')'; } } diff --git a/src/Components/Condition.php b/src/Components/Condition.php index 79899e8..99ab34c 100644 --- a/src/Components/Condition.php +++ b/src/Components/Condition.php @@ -220,8 +220,8 @@ class Condition extends Component { if (is_array($component)) { return implode(' ', $component); - } else { - return $component->expr; } + + return $component->expr; } } diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php index 2bf6198..0b5c584 100644 --- a/src/Components/CreateDefinition.php +++ b/src/Components/CreateDefinition.php @@ -8,8 +8,8 @@ namespace PhpMyAdmin\SqlParser\Components; -use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; @@ -201,6 +201,7 @@ class CreateDefinition extends Component 'An opening bracket was expected.', $token ); + break; } } elseif ($state === 1) { @@ -226,11 +227,11 @@ class CreateDefinition extends Component ); return $ret; - } else { - // Non-reserved keywords are allowed without backquotes - $expr->name = $token->value; - $state = 2; } + + // Non-reserved keywords are allowed without backquotes + $expr->name = $token->value; + $state = 2; } else { $parser->error( 'A symbol name was expected!', @@ -302,35 +303,35 @@ class CreateDefinition extends Component { if (is_array($component)) { return "(\n " . implode(",\n ", $component) . "\n)"; - } else { - $tmp = ''; - - if ($component->isConstraint) { - $tmp .= 'CONSTRAINT '; - } + } - if ((isset($component->name)) && ($component->name !== '')) { - $tmp .= Context::escape($component->name) . ' '; - } + $tmp = ''; - if (!empty($component->type)) { - $tmp .= DataType::build( - $component->type, - array('lowercase' => true) - ) . ' '; - } + if ($component->isConstraint) { + $tmp .= 'CONSTRAINT '; + } - if (!empty($component->key)) { - $tmp .= $component->key . ' '; - } + if ((isset($component->name)) && ($component->name !== '')) { + $tmp .= Context::escape($component->name) . ' '; + } - if (!empty($component->references)) { - $tmp .= 'REFERENCES ' . $component->references . ' '; - } + if (!empty($component->type)) { + $tmp .= DataType::build( + $component->type, + array('lowercase' => true) + ) . ' '; + } - $tmp .= $component->options; + if (!empty($component->key)) { + $tmp .= $component->key . ' '; + } - return trim($tmp); + if (!empty($component->references)) { + $tmp .= 'REFERENCES ' . $component->references . ' '; } + + $tmp .= $component->options; + + return trim($tmp); } } diff --git a/src/Components/Expression.php b/src/Components/Expression.php index d3668d7..a1b460b 100644 --- a/src/Components/Expression.php +++ b/src/Components/Expression.php @@ -7,8 +7,8 @@ namespace PhpMyAdmin\SqlParser\Components; -use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; @@ -418,28 +418,28 @@ class Expression extends Component { if (is_array($component)) { return implode($component, ', '); + } + + if ($component->expr !== '' && !is_null($component->expr)) { + $ret = $component->expr; } else { - if ($component->expr !== '' && !is_null($component->expr)) { - $ret = $component->expr; - } else { - $fields = array(); - if ((isset($component->database)) && ($component->database !== '')) { - $fields[] = $component->database; - } - if ((isset($component->table)) && ($component->table !== '')) { - $fields[] = $component->table; - } - if ((isset($component->column)) && ($component->column !== '')) { - $fields[] = $component->column; - } - $ret = implode('.', Context::escape($fields)); + $fields = array(); + if ((isset($component->database)) && ($component->database !== '')) { + $fields[] = $component->database; } - - if (!empty($component->alias)) { - $ret .= ' AS ' . Context::escape($component->alias); + if ((isset($component->table)) && ($component->table !== '')) { + $fields[] = $component->table; + } + if ((isset($component->column)) && ($component->column !== '')) { + $fields[] = $component->column; } + $ret = implode('.', Context::escape($fields)); + } - return $ret; + if (!empty($component->alias)) { + $ret .= ' AS ' . Context::escape($component->alias); } + + return $ret; } } diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php index a5c2d24..6c52f20 100644 --- a/src/Components/IntoKeyword.php +++ b/src/Components/IntoKeyword.php @@ -235,27 +235,26 @@ class IntoKeyword extends Component public static function build($component, array $options = array()) { if ($component->dest instanceof Expression) { - $columns = !empty($component->columns) ? - '(`' . implode('`, `', $component->columns) . '`)' : ''; + $columns = !empty($component->columns) ? '(`' . implode('`, `', $component->columns) . '`)' : ''; return $component->dest . $columns; } elseif (isset($component->values)) { return ExpressionArray::build($component->values); - } else { - $ret = 'OUTFILE "' . $component->dest . '"'; + } - $fields_options_str = OptionsArray::build($component->fields_options); - if (trim($fields_options_str) !== '') { - $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS'; - $ret .= ' ' . $fields_options_str; - } + $ret = 'OUTFILE "' . $component->dest . '"'; - $lines_options_str = OptionsArray::build($component->lines_options, array('expr' => true)); - if (trim($lines_options_str) !== '') { - $ret .= ' LINES ' . $lines_options_str; - } + $fields_options_str = OptionsArray::build($component->fields_options); + if (trim($fields_options_str) !== '') { + $ret .= ($component->fields_keyword) ? ' FIELDS' : ' COLUMNS'; + $ret .= ' ' . $fields_options_str; + } - return $ret; + $lines_options_str = OptionsArray::build($component->lines_options, array('expr' => true)); + if (trim($lines_options_str) !== '') { + $ret .= ' LINES ' . $lines_options_str; } + + return $ret; } } diff --git a/src/Components/Key.php b/src/Components/Key.php index bc71f4d..bd3bbd1 100644 --- a/src/Components/Key.php +++ b/src/Components/Key.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Components; -use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php index 8e628f0..77d5a3d 100644 --- a/src/Components/OrderKeyword.php +++ b/src/Components/OrderKeyword.php @@ -133,8 +133,8 @@ class OrderKeyword extends Component { if (is_array($component)) { return implode(', ', $component); - } else { - return $component->expr . ' ' . $component->type; } + + return $component->expr . ' ' . $component->type; } } diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php index 1f3c929..1a9ee54 100644 --- a/src/Components/ParameterDefinition.php +++ b/src/Components/ParameterDefinition.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Components; -use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; @@ -143,15 +143,15 @@ class ParameterDefinition extends Component { if (is_array($component)) { return '(' . implode(', ', $component) . ')'; - } else { - $tmp = ''; - if (!empty($component->inOut)) { - $tmp .= $component->inOut . ' '; - } + } - return trim( - $tmp . Context::escape($component->name) . ' ' . $component->type - ); + $tmp = ''; + if (!empty($component->inOut)) { + $tmp .= $component->inOut . ' '; } + + return trim( + $tmp . Context::escape($component->name) . ' ' . $component->type + ); } } diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php index 3e3c1d8..59b34cb 100644 --- a/src/Components/PartitionDefinition.php +++ b/src/Components/PartitionDefinition.php @@ -203,19 +203,18 @@ class PartitionDefinition extends Component { if (is_array($component)) { return "(\n" . implode(",\n", $component) . "\n)"; - } else { - if ($component->isSubpartition) { - return trim('SUBPARTITION ' . $component->name . ' ' . $component->options); - } else { - $subpartitions = empty($component->subpartitions) - ? '' : ' ' . self::build($component->subpartitions); - - return trim( - 'PARTITION ' . $component->name - . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ') - . $component->options . $subpartitions - ); - } } + + if ($component->isSubpartition) { + return trim('SUBPARTITION ' . $component->name . ' ' . $component->options); + } + + $subpartitions = empty($component->subpartitions) ? '' : ' ' . self::build($component->subpartitions); + + return trim( + 'PARTITION ' . $component->name + . (empty($component->type) ? '' : ' VALUES ' . $component->type . ' ' . $component->expr . ' ') + . $component->options . $subpartitions + ); } } diff --git a/src/Components/Reference.php b/src/Components/Reference.php index 0f708fe..798eb68 100644 --- a/src/Components/Reference.php +++ b/src/Components/Reference.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Components; -use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Component; +use PhpMyAdmin\SqlParser\Context; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php index 8ec8647..6405cb4 100644 --- a/src/Components/RenameOperation.php +++ b/src/Components/RenameOperation.php @@ -163,8 +163,8 @@ class RenameOperation extends Component { if (is_array($component)) { return implode(', ', $component); - } else { - return $component->old . ' TO ' . $component->new; } + + return $component->old . ' TO ' . $component->new; } } diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php index 087ff6a..364165a 100644 --- a/src/Components/SetOperation.php +++ b/src/Components/SetOperation.php @@ -128,8 +128,8 @@ class SetOperation extends Component { if (is_array($component)) { return implode(', ', $component); - } else { - return $component->column . ' = ' . $component->value; } + + return $component->column . ' = ' . $component->value; } } diff --git a/src/Lexer.php b/src/Lexer.php index 627763b..918bdf6 100644 --- a/src/Lexer.php +++ b/src/Lexer.php @@ -391,9 +391,8 @@ class Lexer extends Core if ($lastSpace) { --$j; // The size of the keyword didn't increase. continue; - } else { - $lastSpace = true; } + $lastSpace = true; } else { $lastSpace = false; } @@ -453,9 +452,8 @@ class Lexer extends Core if ($lastSpace) { --$j; // The size of the keyword didn't increase. continue; - } else { - $lastSpace = true; } + $lastSpace = true; } elseif ($this->str[$this->last] === ':') { $token .= $this->str[$this->last]; $ret = new Token($token, Token::TYPE_LABEL); diff --git a/src/Statement.php b/src/Statement.php index e778d36..1e02a02 100644 --- a/src/Statement.php +++ b/src/Statement.php @@ -488,9 +488,8 @@ abstract class Statement ); return false; - } else { - $minIdx = $clauseStartIdx; } + $minIdx = $clauseStartIdx; } elseif ($clauseStartIdx != -1) { $minIdx = $clauseStartIdx; } diff --git a/src/Statements/AlterStatement.php b/src/Statements/AlterStatement.php index e1fbc90..e1c3f83 100644 --- a/src/Statements/AlterStatement.php +++ b/src/Statements/AlterStatement.php @@ -6,13 +6,13 @@ namespace PhpMyAdmin\SqlParser\Statements; +use PhpMyAdmin\SqlParser\Components\AlterOperation; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Components\AlterOperation; -use PhpMyAdmin\SqlParser\Components\Expression; -use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * `ALTER` statement. diff --git a/src/Statements/AnalyzeStatement.php b/src/Statements/AnalyzeStatement.php index 1b36fc1..0efbbde 100644 --- a/src/Statements/AnalyzeStatement.php +++ b/src/Statements/AnalyzeStatement.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; /** * `ANALYZE` statement. diff --git a/src/Statements/CallStatement.php b/src/Statements/CallStatement.php index 0b0f29e..51f1011 100644 --- a/src/Statements/CallStatement.php +++ b/src/Statements/CallStatement.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\FunctionCall; +use PhpMyAdmin\SqlParser\Statement; /** * `CALL` statement. diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php index eee5c5b..a2f2eae 100644 --- a/src/Statements/CreateStatement.php +++ b/src/Statements/CreateStatement.php @@ -6,17 +6,17 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Statement; -use PhpMyAdmin\SqlParser\Token; -use PhpMyAdmin\SqlParser\TokensList; use PhpMyAdmin\SqlParser\Components\ArrayObj; -use PhpMyAdmin\SqlParser\Components\DataType; use PhpMyAdmin\SqlParser\Components\CreateDefinition; -use PhpMyAdmin\SqlParser\Components\PartitionDefinition; +use PhpMyAdmin\SqlParser\Components\DataType; use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Components\ParameterDefinition; +use PhpMyAdmin\SqlParser\Components\PartitionDefinition; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `CREATE` statement. diff --git a/src/Statements/DeleteStatement.php b/src/Statements/DeleteStatement.php index 929245c..f4c1e61 100644 --- a/src/Statements/DeleteStatement.php +++ b/src/Statements/DeleteStatement.php @@ -6,17 +6,17 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; -use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Token; -use PhpMyAdmin\SqlParser\TokensList; use PhpMyAdmin\SqlParser\Components\ArrayObj; +use PhpMyAdmin\SqlParser\Components\Condition; use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\ExpressionArray; use PhpMyAdmin\SqlParser\Components\Limit; -use PhpMyAdmin\SqlParser\Components\OrderKeyword; -use PhpMyAdmin\SqlParser\Components\Condition; use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\OrderKeyword; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `DELETE` statement. diff --git a/src/Statements/DropStatement.php b/src/Statements/DropStatement.php index 9fa51dc..1572a55 100644 --- a/src/Statements/DropStatement.php +++ b/src/Statements/DropStatement.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; /** * `DROP` statement. diff --git a/src/Statements/InsertStatement.php b/src/Statements/InsertStatement.php index 5628103..0c7639a 100644 --- a/src/Statements/InsertStatement.php +++ b/src/Statements/InsertStatement.php @@ -6,14 +6,14 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Token; -use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Statement; -use PhpMyAdmin\SqlParser\Components\IntoKeyword; use PhpMyAdmin\SqlParser\Components\Array2d; +use PhpMyAdmin\SqlParser\Components\IntoKeyword; use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `INSERT` statement. @@ -188,15 +188,15 @@ class InsertStatement extends Statement ) { $parser->error('Unexpected keyword.', $token); break; - } else { - ++$list->idx; - $this->into = IntoKeyword::parse( - $parser, - $list, - array('fromInsert' => true) - ); } + ++$list->idx; + $this->into = IntoKeyword::parse( + $parser, + $list, + array('fromInsert' => true) + ); + $state = 1; } elseif ($state === 1) { if ($token->type === Token::TYPE_KEYWORD) { diff --git a/src/Statements/MaintenanceStatement.php b/src/Statements/MaintenanceStatement.php index c1b3aaa..ac3b8c9 100644 --- a/src/Statements/MaintenanceStatement.php +++ b/src/Statements/MaintenanceStatement.php @@ -6,12 +6,12 @@ namespace PhpMyAdmin\SqlParser\Statements; +use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Components\Expression; -use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * Maintenance statement. diff --git a/src/Statements/OptimizeStatement.php b/src/Statements/OptimizeStatement.php index 7e28ad1..0d88e76 100644 --- a/src/Statements/OptimizeStatement.php +++ b/src/Statements/OptimizeStatement.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; /** * `OPTIMIZE` statement. diff --git a/src/Statements/RenameStatement.php b/src/Statements/RenameStatement.php index 22c056e..90533c2 100644 --- a/src/Statements/RenameStatement.php +++ b/src/Statements/RenameStatement.php @@ -6,11 +6,11 @@ namespace PhpMyAdmin\SqlParser\Statements; +use PhpMyAdmin\SqlParser\Components\RenameOperation; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Components\RenameOperation; /** * `RENAME` statement. diff --git a/src/Statements/ReplaceStatement.php b/src/Statements/ReplaceStatement.php index 3fa675a..59d66ae 100644 --- a/src/Statements/ReplaceStatement.php +++ b/src/Statements/ReplaceStatement.php @@ -6,14 +6,14 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Token; -use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\Array2d; use PhpMyAdmin\SqlParser\Components\IntoKeyword; use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * `REPLACE` statement. @@ -87,8 +87,7 @@ class ReplaceStatement extends Statement */ public function build() { - $ret = 'REPLACE ' . $this->options - . ' INTO ' . $this->into; + $ret = 'REPLACE ' . $this->options . ' INTO ' . $this->into; if ($this->values != null && count($this->values) > 0) { $ret .= ' VALUES ' . Array2d::build($this->values); @@ -115,6 +114,7 @@ class ReplaceStatement extends Statement $list, static::$OPTIONS ); + ++$list->idx; /** @@ -154,14 +154,13 @@ class ReplaceStatement extends Statement ) { $parser->error('Unexpected keyword.', $token); break; - } else { - ++$list->idx; - $this->into = IntoKeyword::parse( - $parser, - $list, - array('fromReplace' => true) - ); } + ++$list->idx; + $this->into = IntoKeyword::parse( + $parser, + $list, + array('fromReplace' => true) + ); $state = 1; } elseif ($state === 1) { diff --git a/src/Statements/SelectStatement.php b/src/Statements/SelectStatement.php index 66ed150..deee68a 100644 --- a/src/Statements/SelectStatement.php +++ b/src/Statements/SelectStatement.php @@ -6,15 +6,15 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\ArrayObj; -use PhpMyAdmin\SqlParser\Components\FunctionCall; +use PhpMyAdmin\SqlParser\Components\Condition; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Components\FunctionCall; use PhpMyAdmin\SqlParser\Components\IntoKeyword; use PhpMyAdmin\SqlParser\Components\JoinKeyword; use PhpMyAdmin\SqlParser\Components\Limit; use PhpMyAdmin\SqlParser\Components\OrderKeyword; -use PhpMyAdmin\SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Statement; /** * `SELECT` statement. diff --git a/src/Statements/SetStatement.php b/src/Statements/SetStatement.php index 3975596..007134f 100644 --- a/src/Statements/SetStatement.php +++ b/src/Statements/SetStatement.php @@ -6,9 +6,9 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; -use PhpMyAdmin\SqlParser\Components\SetOperation; use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Components\SetOperation; +use PhpMyAdmin\SqlParser\Statement; /** * `SET` statement. diff --git a/src/Statements/TransactionStatement.php b/src/Statements/TransactionStatement.php index 6ae0c95..c2bb303 100644 --- a/src/Statements/TransactionStatement.php +++ b/src/Statements/TransactionStatement.php @@ -6,10 +6,10 @@ namespace PhpMyAdmin\SqlParser\Statements; +use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Components\OptionsArray; /** * Transaction statement. diff --git a/src/Statements/TruncateStatement.php b/src/Statements/TruncateStatement.php index 6f58929..b625bc6 100644 --- a/src/Statements/TruncateStatement.php +++ b/src/Statements/TruncateStatement.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Statement; /** * `TRUNCATE` statement. diff --git a/src/Statements/UpdateStatement.php b/src/Statements/UpdateStatement.php index e3d68be..b0aba01 100644 --- a/src/Statements/UpdateStatement.php +++ b/src/Statements/UpdateStatement.php @@ -6,12 +6,12 @@ namespace PhpMyAdmin\SqlParser\Statements; -use PhpMyAdmin\SqlParser\Statement; +use PhpMyAdmin\SqlParser\Components\Condition; use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\Limit; use PhpMyAdmin\SqlParser\Components\OrderKeyword; use PhpMyAdmin\SqlParser\Components\SetOperation; -use PhpMyAdmin\SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Statement; /** * `UPDATE` statement. diff --git a/src/Utils/CLI.php b/src/Utils/CLI.php index b66cc8d..dbf80aa 100644 --- a/src/Utils/CLI.php +++ b/src/Utils/CLI.php @@ -6,8 +6,8 @@ namespace PhpMyAdmin\SqlParser\Utils; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; /** * CLI interface. diff --git a/src/Utils/Query.php b/src/Utils/Query.php index 3b4db97..5ad701e 100644 --- a/src/Utils/Query.php +++ b/src/Utils/Query.php @@ -6,12 +6,10 @@ namespace PhpMyAdmin\SqlParser\Utils; +use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Lexer; use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statement; -use PhpMyAdmin\SqlParser\Token; -use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Statements\AlterStatement; use PhpMyAdmin\SqlParser\Statements\AnalyzeStatement; use PhpMyAdmin\SqlParser\Statements\CallStatement; @@ -30,6 +28,8 @@ use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Statements\ShowStatement; use PhpMyAdmin\SqlParser\Statements\TruncateStatement; use PhpMyAdmin\SqlParser\Statements\UpdateStatement; +use PhpMyAdmin\SqlParser\Token; +use PhpMyAdmin\SqlParser\TokensList; /** * Statement utilities. diff --git a/src/Utils/Routine.php b/src/Utils/Routine.php index 4413f9a..127d37b 100644 --- a/src/Utils/Routine.php +++ b/src/Utils/Routine.php @@ -6,10 +6,10 @@ namespace PhpMyAdmin\SqlParser\Utils; -use PhpMyAdmin\SqlParser\Lexer; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\DataType; use PhpMyAdmin\SqlParser\Components\ParameterDefinition; +use PhpMyAdmin\SqlParser\Lexer; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; /** diff --git a/tests/Builder/CreateStatementTest.php b/tests/Builder/CreateStatementTest.php index 05cc3d3..1e0dc00 100644 --- a/tests/Builder/CreateStatementTest.php +++ b/tests/Builder/CreateStatementTest.php @@ -2,12 +2,12 @@ namespace PhpMyAdmin\SqlParser\Tests\Builder; -use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Components\CreateDefinition; use PhpMyAdmin\SqlParser\Components\DataType; use PhpMyAdmin\SqlParser\Components\Expression; -use PhpMyAdmin\SqlParser\Components\CreateDefinition; use PhpMyAdmin\SqlParser\Components\Key; use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Statements\CreateStatement; use PhpMyAdmin\SqlParser\Tests\TestCase; diff --git a/tests/Builder/StatementTest.php b/tests/Builder/StatementTest.php index 2651b28..e2c0cb7 100644 --- a/tests/Builder/StatementTest.php +++ b/tests/Builder/StatementTest.php @@ -2,10 +2,10 @@ namespace PhpMyAdmin\SqlParser\Tests\Builder; -use PhpMyAdmin\SqlParser\Components\OptionsArray; -use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\Limit; +use PhpMyAdmin\SqlParser\Components\OptionsArray; use PhpMyAdmin\SqlParser\Statements\SelectStatement; use PhpMyAdmin\SqlParser\Tests\TestCase; diff --git a/tests/Components/Array2dTest.php b/tests/Components/Array2dTest.php index 6aebaf3..b7ee756 100644 --- a/tests/Components/Array2dTest.php +++ b/tests/Components/Array2dTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Array2d; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class Array2dTest extends TestCase diff --git a/tests/Components/ArrayObjTest.php b/tests/Components/ArrayObjTest.php index e545eb2..4c782d2 100644 --- a/tests/Components/ArrayObjTest.php +++ b/tests/Components/ArrayObjTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\ArrayObj; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ArrayObjTest extends TestCase @@ -38,6 +38,7 @@ class ArrayObjTest extends TestCase /** * @dataProvider testParseProvider + * * @param mixed $test */ public function testParse($test) diff --git a/tests/Components/CaseExpressionTest.php b/tests/Components/CaseExpressionTest.php index 0e2fef3..afe5e60 100644 --- a/tests/Components/CaseExpressionTest.php +++ b/tests/Components/CaseExpressionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\CaseExpression; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class CaseExpressionTest extends TestCase diff --git a/tests/Components/ComponentTest.php b/tests/Components/ComponentTest.php index 6260518..8686160 100644 --- a/tests/Components/ComponentTest.php +++ b/tests/Components/ComponentTest.php @@ -4,8 +4,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Parser; use PhpMyAdmin\SqlParser\Component; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\TokensList; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\TokensList; class ComponentTest extends TestCase { diff --git a/tests/Components/ConditionTest.php b/tests/Components/ConditionTest.php index 317f24e..27c6a4f 100644 --- a/tests/Components/ConditionTest.php +++ b/tests/Components/ConditionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Condition; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ConditionTest extends TestCase diff --git a/tests/Components/CreateDefinitionTest.php b/tests/Components/CreateDefinitionTest.php index 361491a..eca7362 100644 --- a/tests/Components/CreateDefinitionTest.php +++ b/tests/Components/CreateDefinitionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\CreateDefinition; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class CreateDefinitionTest extends TestCase diff --git a/tests/Components/ExpressionArrayTest.php b/tests/Components/ExpressionArrayTest.php index 84c1cef..2c5527d 100644 --- a/tests/Components/ExpressionArrayTest.php +++ b/tests/Components/ExpressionArrayTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\ExpressionArray; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ExpressionArrayTest extends TestCase diff --git a/tests/Components/ExpressionTest.php b/tests/Components/ExpressionTest.php index adb973d..09a50b0 100644 --- a/tests/Components/ExpressionTest.php +++ b/tests/Components/ExpressionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Expression; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ExpressionTest extends TestCase @@ -21,6 +21,7 @@ class ExpressionTest extends TestCase /** * @dataProvider testParseErrProvider + * * @param mixed $expr * @param mixed $error */ diff --git a/tests/Components/IntoKeywordTest.php b/tests/Components/IntoKeywordTest.php index c7d2ee1..2ebf5ee 100644 --- a/tests/Components/IntoKeywordTest.php +++ b/tests/Components/IntoKeywordTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\IntoKeyword; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class IntoKeywordTest extends TestCase diff --git a/tests/Components/JoinKeywordTest.php b/tests/Components/JoinKeywordTest.php index 58d5849..fbe2d40 100644 --- a/tests/Components/JoinKeywordTest.php +++ b/tests/Components/JoinKeywordTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\JoinKeyword; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class JoinKeywordTest extends TestCase diff --git a/tests/Components/KeyTest.php b/tests/Components/KeyTest.php index 741f10c..ed05288 100644 --- a/tests/Components/KeyTest.php +++ b/tests/Components/KeyTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Key; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class KeyTest extends TestCase diff --git a/tests/Components/LimitTest.php b/tests/Components/LimitTest.php index 9c97861..466a199 100644 --- a/tests/Components/LimitTest.php +++ b/tests/Components/LimitTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Limit; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class LimitTest extends TestCase @@ -22,6 +22,7 @@ class LimitTest extends TestCase /** * @dataProvider testParseProvider + * * @param mixed $test */ public function testParse($test) diff --git a/tests/Components/OptionsArrayTest.php b/tests/Components/OptionsArrayTest.php index 2832bd5..4dda0db 100644 --- a/tests/Components/OptionsArrayTest.php +++ b/tests/Components/OptionsArrayTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\OptionsArray; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class OptionsArrayTest extends TestCase diff --git a/tests/Components/ParameterDefinitionTest.php b/tests/Components/ParameterDefinitionTest.php index b90d710..683eb3a 100644 --- a/tests/Components/ParameterDefinitionTest.php +++ b/tests/Components/ParameterDefinitionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\ParameterDefinition; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ParameterDefinitionTest extends TestCase diff --git a/tests/Components/PartitionDefinitionTest.php b/tests/Components/PartitionDefinitionTest.php index 7e0948b..7edc21e 100644 --- a/tests/Components/PartitionDefinitionTest.php +++ b/tests/Components/PartitionDefinitionTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\PartitionDefinition; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class PartitionDefinitionTest extends TestCase diff --git a/tests/Components/ReferenceTest.php b/tests/Components/ReferenceTest.php index 7869e4a..dc142fe 100644 --- a/tests/Components/ReferenceTest.php +++ b/tests/Components/ReferenceTest.php @@ -2,9 +2,9 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\Expression; use PhpMyAdmin\SqlParser\Components\Reference; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class ReferenceTest extends TestCase diff --git a/tests/Components/RenameOperationTest.php b/tests/Components/RenameOperationTest.php index cb0075f..919c4bd 100644 --- a/tests/Components/RenameOperationTest.php +++ b/tests/Components/RenameOperationTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Components; -use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Components\RenameOperation; +use PhpMyAdmin\SqlParser\Parser; use PhpMyAdmin\SqlParser\Tests\TestCase; class RenameOperationTest extends TestCase diff --git a/tests/Lexer/IsMethodsTest.php b/tests/Lexer/IsMethodsTest.php index 30b2f1b..192b194 100644 --- a/tests/Lexer/IsMethodsTest.php +++ b/tests/Lexer/IsMethodsTest.php @@ -3,8 +3,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Lexer; use PhpMyAdmin\SqlParser\Context; -use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Token; class IsMethodsTest extends TestCase { diff --git a/tests/Lexer/LexerTest.php b/tests/Lexer/LexerTest.php index 17436d8..f29e233 100644 --- a/tests/Lexer/LexerTest.php +++ b/tests/Lexer/LexerTest.php @@ -48,6 +48,7 @@ class LexerTest extends TestCase /** * @dataProvider testLexProvider + * * @param mixed $test */ public function testLex($test) diff --git a/tests/Lexer/TokenTest.php b/tests/Lexer/TokenTest.php index f468a85..1285da0 100644 --- a/tests/Lexer/TokenTest.php +++ b/tests/Lexer/TokenTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Lexer; -use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Token; class TokenTest extends TestCase { diff --git a/tests/Lexer/TokensListTest.php b/tests/Lexer/TokensListTest.php index 2401eb7..c379b0d 100644 --- a/tests/Lexer/TokensListTest.php +++ b/tests/Lexer/TokensListTest.php @@ -2,9 +2,9 @@ namespace PhpMyAdmin\SqlParser\Tests\Lexer; +use PhpMyAdmin\SqlParser\Tests\TestCase; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Tests\TestCase; class TokensListTest extends TestCase { diff --git a/tests/Misc/BugsTest.php b/tests/Misc/BugsTest.php index 1a90137..9a1c070 100644 --- a/tests/Misc/BugsTest.php +++ b/tests/Misc/BugsTest.php @@ -8,6 +8,7 @@ class BugsTest extends TestCase { /** * @dataProvider testBugProvider + * * @param mixed $test */ public function testBug($test) diff --git a/tests/Misc/UtfStringTest.php b/tests/Misc/UtfStringTest.php index 7fc2bda..d7c4404 100644 --- a/tests/Misc/UtfStringTest.php +++ b/tests/Misc/UtfStringTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Misc; -use PhpMyAdmin\SqlParser\UtfString; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\UtfString; class UtfStringTest extends TestCase { diff --git a/tests/Parser/AlterStatementTest.php b/tests/Parser/AlterStatementTest.php index 1aebf7c..33de19d 100644 --- a/tests/Parser/AlterStatementTest.php +++ b/tests/Parser/AlterStatementTest.php @@ -8,6 +8,7 @@ class AlterStatementTest extends TestCase { /** * @dataProvider testAlterProvider + * * @param mixed $test */ public function testAlter($test) diff --git a/tests/Parser/CallStatementTest.php b/tests/Parser/CallStatementTest.php index 9884d72..cb8ac25 100644 --- a/tests/Parser/CallStatementTest.php +++ b/tests/Parser/CallStatementTest.php @@ -8,6 +8,7 @@ class CallStatementTest extends TestCase { /** * @dataProvider testCallProvider + * * @param mixed $test */ public function testCall($test) diff --git a/tests/Parser/CreateStatementTest.php b/tests/Parser/CreateStatementTest.php index e524d36..de785dd 100644 --- a/tests/Parser/CreateStatementTest.php +++ b/tests/Parser/CreateStatementTest.php @@ -8,6 +8,7 @@ class CreateStatementTest extends TestCase { /** * @dataProvider testCreateProvider + * * @param mixed $test */ public function testCreate($test) diff --git a/tests/Parser/DeleteStatementTest.php b/tests/Parser/DeleteStatementTest.php index 181c7dd..daaf327 100644 --- a/tests/Parser/DeleteStatementTest.php +++ b/tests/Parser/DeleteStatementTest.php @@ -8,6 +8,7 @@ class DeleteStatementTest extends TestCase { /** * @dataProvider testDeleteProvider + * * @param mixed $test */ public function testDelete($test) diff --git a/tests/Parser/ExplainStatement.php b/tests/Parser/ExplainStatement.php index 3e242af..6cf3059 100644 --- a/tests/Parser/ExplainStatement.php +++ b/tests/Parser/ExplainStatement.php @@ -8,6 +8,7 @@ class ExplainStatementTest extends TestCase { /** * @dataProvider testExplainProvider + * * @param mixed $test */ public function testExplain($test) diff --git a/tests/Parser/InsertStatementTest.php b/tests/Parser/InsertStatementTest.php index 4e5e646..1ba0a05 100644 --- a/tests/Parser/InsertStatementTest.php +++ b/tests/Parser/InsertStatementTest.php @@ -8,6 +8,7 @@ class InsertStatementTest extends TestCase { /** * @dataProvider testInsertProvider + * * @param mixed $test */ public function testInsert($test) diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php index f2de43a..9d1b7b8 100644 --- a/tests/Parser/ParserTest.php +++ b/tests/Parser/ParserTest.php @@ -4,14 +4,15 @@ namespace PhpMyAdmin\SqlParser\Tests\Parser; use PhpMyAdmin\SqlParser\Exceptions\ParserException; use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Tests\TestCase; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\TokensList; -use PhpMyAdmin\SqlParser\Tests\TestCase; class ParserTest extends TestCase { /** * @dataProvider testParseProvider + * * @param mixed $test */ public function testParse($test) diff --git a/tests/Parser/RenameStatementTest.php b/tests/Parser/RenameStatementTest.php index 66b99a1..d9606e7 100644 --- a/tests/Parser/RenameStatementTest.php +++ b/tests/Parser/RenameStatementTest.php @@ -8,6 +8,7 @@ class RenameStatementTest extends TestCase { /** * @dataProvider testRenameProvider + * * @param mixed $test */ public function testRename($test) diff --git a/tests/Parser/ReplaceStatementTest.php b/tests/Parser/ReplaceStatementTest.php index b8f7f1d..a3551bc 100644 --- a/tests/Parser/ReplaceStatementTest.php +++ b/tests/Parser/ReplaceStatementTest.php @@ -8,6 +8,7 @@ class ReplaceStatementTest extends TestCase { /** * @dataProvider testReplaceProvider + * * @param mixed $test */ public function testReplace($test) diff --git a/tests/Parser/RestoreStatementTest.php b/tests/Parser/RestoreStatementTest.php index fc71fce..7f25e95 100644 --- a/tests/Parser/RestoreStatementTest.php +++ b/tests/Parser/RestoreStatementTest.php @@ -8,6 +8,7 @@ class RestoreStatementTest extends TestCase { /** * @dataProvider testRestoreProvider + * * @param mixed $test */ public function testRestore($test) diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php index f222f06..5be345f 100644 --- a/tests/Parser/SelectStatementTest.php +++ b/tests/Parser/SelectStatementTest.php @@ -2,8 +2,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Parser; -use PhpMyAdmin\SqlParser\Tests\TestCase; use PhpMyAdmin\SqlParser\Parser; +use PhpMyAdmin\SqlParser\Tests\TestCase; class SelectStatementTest extends TestCase { @@ -17,6 +17,7 @@ class SelectStatementTest extends TestCase /** * @dataProvider testSelectProvider + * * @param mixed $test */ public function testSelect($test) diff --git a/tests/Parser/SetStatementTest.php b/tests/Parser/SetStatementTest.php index 6b43c5d..61062e3 100644 --- a/tests/Parser/SetStatementTest.php +++ b/tests/Parser/SetStatementTest.php @@ -8,6 +8,7 @@ class SetStatementTest extends TestCase { /** * @dataProvider testSetProvider + * * @param mixed $test */ public function testSet($test) diff --git a/tests/Parser/TransactionStatementTest.php b/tests/Parser/TransactionStatementTest.php index 618a305..9316cb7 100644 --- a/tests/Parser/TransactionStatementTest.php +++ b/tests/Parser/TransactionStatementTest.php @@ -8,6 +8,7 @@ class TransactionStatementTest extends TestCase { /** * @dataProvider testTransactionProvider + * * @param mixed $test */ public function testTransaction($test) diff --git a/tests/Parser/UpdateStatementTest.php b/tests/Parser/UpdateStatementTest.php index 3e3d483..3c442fe 100644 --- a/tests/Parser/UpdateStatementTest.php +++ b/tests/Parser/UpdateStatementTest.php @@ -8,6 +8,7 @@ class UpdateStatementTest extends TestCase { /** * @dataProvider testUpdateProvider + * * @param mixed $test */ public function testUpdate($test) diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php index eaf7b48..9ef539d 100644 --- a/tests/Utils/BufferedQueryTest.php +++ b/tests/Utils/BufferedQueryTest.php @@ -2,13 +2,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; -use PhpMyAdmin\SqlParser\Utils\BufferedQuery; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\BufferedQuery; class BufferedQueryTest extends TestCase { /** * @dataProvider testExtractProvider + * * @param mixed $query * @param mixed $chunkSize */ diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php index fec7ddf..a354701 100644 --- a/tests/Utils/CLITest.php +++ b/tests/Utils/CLITest.php @@ -30,6 +30,7 @@ class CLITest extends TestCase /** * @dataProvider highlightParams + * * @param mixed $getopt * @param mixed $output * @param mixed $result @@ -91,6 +92,7 @@ class CLITest extends TestCase /** * @dataProvider lintParams + * * @param mixed $getopt * @param mixed $output * @param mixed $result diff --git a/tests/Utils/ErrorTest.php b/tests/Utils/ErrorTest.php index 0c218ae..7a62e46 100644 --- a/tests/Utils/ErrorTest.php +++ b/tests/Utils/ErrorTest.php @@ -4,8 +4,8 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; use PhpMyAdmin\SqlParser\Lexer; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Utils\Error; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Error; class ErrorTest extends TestCase { diff --git a/tests/Utils/FormatterTest.php b/tests/Utils/FormatterTest.php index 73a7506..b8a8ff2 100644 --- a/tests/Utils/FormatterTest.php +++ b/tests/Utils/FormatterTest.php @@ -2,13 +2,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; -use PhpMyAdmin\SqlParser\Utils\Formatter; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Formatter; class FormatTest extends TestCase { /** * @dataProvider mergeFormats + * * @param mixed $default * @param mixed $overriding * @param mixed $expected @@ -234,6 +235,7 @@ class FormatTest extends TestCase /** * @dataProvider formatQueries + * * @param mixed $query * @param mixed $text * @param mixed $cli diff --git a/tests/Utils/MiscTest.php b/tests/Utils/MiscTest.php index 8c8e093..c6b03a2 100644 --- a/tests/Utils/MiscTest.php +++ b/tests/Utils/MiscTest.php @@ -3,13 +3,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Utils\Misc; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Misc; class MiscTest extends TestCase { /** * @dataProvider getAliasesProvider + * * @param mixed $query * @param mixed $db */ diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php index fb34c5f..faae263 100644 --- a/tests/Utils/QueryTest.php +++ b/tests/Utils/QueryTest.php @@ -3,13 +3,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Utils\Query; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Query; class QueryTest extends TestCase { /** * @dataProvider testGetFlagsProvider + * * @param mixed $query * @param mixed $expected */ @@ -349,6 +350,7 @@ class QueryTest extends TestCase /** * @dataProvider testGetTablesProvider + * * @param mixed $query * @param mixed $expected */ diff --git a/tests/Utils/RoutineTest.php b/tests/Utils/RoutineTest.php index 3fe38c6..3a6ba55 100644 --- a/tests/Utils/RoutineTest.php +++ b/tests/Utils/RoutineTest.php @@ -3,13 +3,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Utils\Routine; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Routine; class RoutineTest extends TestCase { /** * @dataProvider getReturnTypeProvider + * * @param mixed $def */ public function testGetReturnType($def, array $expected) @@ -50,6 +51,7 @@ class RoutineTest extends TestCase /** * @dataProvider getParameterProvider + * * @param mixed $def */ public function testGetParameter($def, array $expected) @@ -90,6 +92,7 @@ class RoutineTest extends TestCase /** * @dataProvider getParametersProvider + * * @param mixed $query */ public function testGetParameters($query, array $expected) diff --git a/tests/Utils/TableTest.php b/tests/Utils/TableTest.php index 52a49b3..ef21137 100644 --- a/tests/Utils/TableTest.php +++ b/tests/Utils/TableTest.php @@ -3,13 +3,14 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; use PhpMyAdmin\SqlParser\Parser; -use PhpMyAdmin\SqlParser\Utils\Table; use PhpMyAdmin\SqlParser\Tests\TestCase; +use PhpMyAdmin\SqlParser\Utils\Table; class TableTest extends TestCase { /** * @dataProvider getForeignKeysProvider + * * @param mixed $query */ public function testGetForeignKeys($query, array $expected) @@ -111,6 +112,7 @@ class TableTest extends TestCase /** * @dataProvider getFieldsProvider + * * @param mixed $query */ public function testGetFields($query, array $expected) diff --git a/tests/Utils/TokensTest.php b/tests/Utils/TokensTest.php index 2f49082..6ebbbab 100644 --- a/tests/Utils/TokensTest.php +++ b/tests/Utils/TokensTest.php @@ -2,14 +2,15 @@ namespace PhpMyAdmin\SqlParser\Tests\Utils; +use PhpMyAdmin\SqlParser\Tests\TestCase; use PhpMyAdmin\SqlParser\Token; use PhpMyAdmin\SqlParser\Utils\Tokens; -use PhpMyAdmin\SqlParser\Tests\TestCase; class TokensTest extends TestCase { /** * @dataProvider replaceTokensProvider + * * @param mixed $list * @param mixed $find * @param mixed $replace @@ -40,6 +41,7 @@ class TokensTest extends TestCase /** * @dataProvider matchProvider + * * @param mixed $token * @param mixed $pattern * @param mixed $expected |