Merge branch 'master' of github.com:phpmyadmin/sql-parser

60 files changed, 105 insertions, 113 deletions

diff --git a/.php_cs b/.php_cs
index bf09473..4d0ab04 100644
--- a/.php_cs
+++ b/.php_cs
@@ -13,6 +13,7 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         'array_syntax' => array('syntax' => 'long'),
         'concat_space' => array('spacing' => true),
+        'ordered_imports' => true,
         'no_trailing_whitespace' => true,
         'phpdoc_order' => true,
     ))
diff --git a/locale/zh_TW/LC_MESSAGES/sqlparser.mo b/locale/zh_TW/LC_MESSAGES/sqlparser.mo
index 3125f10..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 9b8a9cb..1dfab71 100644
--- a/locale/zh_TW/LC_MESSAGES/sqlparser.po
+++ b/locale/zh_TW/LC_MESSAGES/sqlparser.po
@@ -4,16 +4,16 @@ 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-21 15:59+0000\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
-"phpmyadmin/sql-parser/zh_TW/>\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"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.10\n"
+"X-Generator: Weblate 2.12-dev\n"
 
 #: src/Component.php:43 src/Component.php:63
 msgid "Not implemented yet."
@@ -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."
@@ -53,20 +54,18 @@ msgstr "預期要有開始括號。"
 #: src/Statements/InsertStatement.php:217
 #: src/Statements/ReplaceStatement.php:155
 #: src/Statements/ReplaceStatement.php:183
-#, fuzzy
-#| msgid "Unexpected token."
 msgid "Unexpected keyword."
-msgstr "預期之外的符號。"
+msgstr "預期之外的關鍵字。"
 
 #: src/Components/CaseExpression.php:194
 msgid "Unexpected end of CASE expression"
-msgstr ""
+msgstr "預期之外的CASE陳述式"
 
 #: src/Components/CreateDefinition.php:222
 msgid ""
 "A symbol name was expected! A reserved keyword can not be used as a column "
 "name without backquotes."
-msgstr ""
+msgstr "預期有一個符號！保留字不可以在沒有反引號時用作欄位名稱。"
 
 #: src/Components/CreateDefinition.php:236
 msgid "A symbol name was expected!"
@@ -82,7 +81,7 @@ msgstr "預期要有結束括號。"
 
 #: src/Components/DataType.php:123
 msgid "Unrecognized data type."
-msgstr "預期之外的資料類型。"
+msgstr "無法識別的資料類型。"
 
 #: src/Components/Expression.php:244 src/Components/Expression.php:394
 msgid "An alias was expected."
@@ -127,10 +126,8 @@ msgid "A rename operation was expected."
 msgstr "預期要有重新命名的操作。"
 
 #: src/Components/SetOperation.php:105
-#, fuzzy
-#| msgid "as regular expression"
 msgid "Missing expression."
-msgstr "使用正則表示法(Regular Expression)"
+msgstr "缺少表達式。"
 
 #: src/Lexer.php:237
 msgid "Unexpected character."
@@ -182,20 +179,16 @@ msgid "Unrecognized keyword."
 msgstr "無法辨識的關鍵字。"
 
 #: src/Statement.php:486
-#, fuzzy
-#| msgid "Unexpected beginning of statement."
 msgid "Unexpected ordering of clauses."
-msgstr "預期之外的陳述句開頭。"
+msgstr "預期之外的排序語句。"
 
 #: src/Statements/CreateStatement.php:375
 msgid "The name of the entity was expected."
 msgstr "預期要有實體名稱。"
 
 #: src/Statements/CreateStatement.php:430
-#, fuzzy
-#| msgid "Variable name was expected."
 msgid "A table name was expected."
-msgstr "預期要有變數名稱。"
+msgstr "預期有表格名稱。"
 
 #: src/Statements/CreateStatement.php:438
 msgid "At least one column definition was expected."
@@ -206,10 +199,8 @@ msgid "A \"RETURNS\" keyword was expected."
 msgstr "預期要使用 \"RETURNS\" 關鍵字。"
 
 #: src/Statements/DeleteStatement.php:294
-#, fuzzy
-#| msgid "This type of clause was previously parsed."
 msgid "This type of clause is not valid in Multi-table queries."
-msgstr "此類型的子句已於前面解析過。"
+msgstr "此類型的子句不可用於多表查詢。"
 
 #: tests/Lexer/LexerTest.php:19 tests/Parser/ParserTest.php:56
 msgid "error #1"
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 2bf6198..8a06006 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;
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index d3668d7..09c1f91 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;
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/ParameterDefinition.php b/src/Components/ParameterDefinition.php
index 1f3c929..02ba20d 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;
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/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..25bebf2 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.
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..e14a83e 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.
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 cd851f8..41cf630 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
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 b1d6268..6eac3b8 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
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 84c8e31..3e89f9e 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
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/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/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/ParserTest.php b/tests/Parser/ParserTest.php
index cf83f3e..4c7aa78 100644
--- a/tests/Parser/ParserTest.php
+++ b/tests/Parser/ParserTest.php
@@ -4,9 +4,9 @@ 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
 {
diff --git a/tests/Parser/SelectStatementTest.php b/tests/Parser/SelectStatementTest.php
index 8f6e4b0..19d3de4 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
 {
diff --git a/tests/Utils/BufferedQueryTest.php b/tests/Utils/BufferedQueryTest.php
index 5e48dbe..280a9be 100644
--- a/tests/Utils/BufferedQueryTest.php
+++ b/tests/Utils/BufferedQueryTest.php
@@ -2,8 +2,8 @@
 
 namespace PhpMyAdmin\SqlParser\Tests\Utils;
 
-use PhpMyAdmin\SqlParser\Utils\BufferedQuery;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
+use PhpMyAdmin\SqlParser\Utils\BufferedQuery;
 
 class BufferedQueryTest extends TestCase
 {
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 4502bb6..861119e 100644
--- a/tests/Utils/FormatterTest.php
+++ b/tests/Utils/FormatterTest.php
@@ -2,8 +2,8 @@
 
 namespace PhpMyAdmin\SqlParser\Tests\Utils;
 
-use PhpMyAdmin\SqlParser\Utils\Formatter;
 use PhpMyAdmin\SqlParser\Tests\TestCase;
+use PhpMyAdmin\SqlParser\Utils\Formatter;
 
 class FormatTest extends TestCase
 {
diff --git a/tests/Utils/MiscTest.php b/tests/Utils/MiscTest.php
index 1eb0c80..8f6f3a0 100644
--- a/tests/Utils/MiscTest.php
+++ b/tests/Utils/MiscTest.php
@@ -3,8 +3,8 @@
 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
 {
diff --git a/tests/Utils/QueryTest.php b/tests/Utils/QueryTest.php
index a942064..e608c80 100644
--- a/tests/Utils/QueryTest.php
+++ b/tests/Utils/QueryTest.php
@@ -3,8 +3,8 @@
 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
 {
diff --git a/tests/Utils/RoutineTest.php b/tests/Utils/RoutineTest.php
index ee47b97..7fa13bb 100644
--- a/tests/Utils/RoutineTest.php
+++ b/tests/Utils/RoutineTest.php
@@ -3,8 +3,8 @@
 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
 {
diff --git a/tests/Utils/TableTest.php b/tests/Utils/TableTest.php
index bbd849d..c69647e 100644
--- a/tests/Utils/TableTest.php
+++ b/tests/Utils/TableTest.php
@@ -3,8 +3,8 @@
 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
 {
diff --git a/tests/Utils/TokensTest.php b/tests/Utils/TokensTest.php
index 5ef7b37..5650296 100644
--- a/tests/Utils/TokensTest.php
+++ b/tests/Utils/TokensTest.php
@@ -2,9 +2,9 @@
 
 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
 {