Merge remote-tracking branch 'origin/master'

Author: weblate

src/Core.php

@@ -24,7 +24,7 @@ class Core
      * error might be false positive or a partial result (even a bad one)
      * might be needed.
      *
-     * @var Exception[]
+     * @var \Exception[]
      *
      * @see Core::error()
      */

src/Exceptions/LoaderException.php

@@ -26,10 +26,8 @@ class LoaderException extends \Exception
      * Constructor.
      *
      * @param string $msg  the message of this exception
-     * @param string $ch   the character that produced this exception
-     * @param int    $pos  the position of the character
+     * @param string $name   the character that produced this exception
      * @param int    $code the code of this error
-     * @param mixed  $name
      */
     public function __construct($msg = '', $name = '', $code = 0)
     {

src/Parser.php

@@ -422,7 +422,7 @@ public function parse()
             // Statements can start with keywords only.
             // Comments, whitespaces, etc. are ignored.
             if ($token->type !== Token::TYPE_KEYWORD) {
-                if (($token->type !== TOKEN::TYPE_COMMENT)
+                if (($token->type !== Token::TYPE_COMMENT)
                     && ($token->type !== Token::TYPE_WHITESPACE)
                     && ($token->type !== Token::TYPE_OPERATOR) // `(` and `)`
                     && ($token->type !== Token::TYPE_DELIMITER)

src/Statement.php

@@ -236,7 +236,7 @@ public function parse(Parser $parser, TokensList $list)
             // Only keywords are relevant here. Other parts of the query are
             // processed in the functions below.
             if ($token->type !== Token::TYPE_KEYWORD) {
-                if (($token->type !== TOKEN::TYPE_COMMENT)
+                if (($token->type !== Token::TYPE_COMMENT)
                     && ($token->type !== Token::TYPE_WHITESPACE)
                 ) {
                     $parser->error('Unexpected token.', $token);

src/Statements/InsertStatement.php

@@ -6,6 +6,7 @@
 
 namespace PhpMyAdmin\SqlParser\Statements;
 
+use PhpMyAdmin\SqlParser\Components\ArrayObj;
 use PhpMyAdmin\SqlParser\Components\Array2d;
 use PhpMyAdmin\SqlParser\Components\IntoKeyword;
 use PhpMyAdmin\SqlParser\Components\OptionsArray;

src/Statements/SelectStatement.php

@@ -13,6 +13,7 @@
 use PhpMyAdmin\SqlParser\Components\IntoKeyword;
 use PhpMyAdmin\SqlParser\Components\JoinKeyword;
 use PhpMyAdmin\SqlParser\Components\Limit;
+use PhpMyAdmin\SqlParser\Components\OptionsArray;
 use PhpMyAdmin\SqlParser\Components\OrderKeyword;
 use PhpMyAdmin\SqlParser\Statement;