Merge branch 'QA'

Signed-off-by: William Desportes <williamdes@wdes.fr>

8 files changed, 17 insertions, 17 deletions

diff --git a/src/Components/DataType.php b/src/Components/DataType.php
index 6ebfc94..484e559 100644
--- a/src/Components/DataType.php
+++ b/src/Components/DataType.php
@@ -88,7 +88,7 @@ class DataType extends Component
      * @param TokensList $list    the list of tokens that are being parsed
      * @param array      $options parameters for parsing
      *
-     * @return DataType
+     * @return DataType|null
      */
     public static function parse(Parser $parser, TokensList $list, array $options = [])
     {
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index 38de90a..bf97937 100644
--- a/src/Components/Expression.php
+++ b/src/Components/Expression.php
@@ -147,7 +147,7 @@ class Expression extends Component
      * @param TokensList $list    the list of tokens that are being parsed
      * @param array      $options parameters for parsing
      *
-     * @return Expression
+     * @return Expression|null
      */
     public static function parse(Parser $parser, TokensList $list, array $options = [])
     {
diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
index 81cddb8..c3f8a43 100644
--- a/src/Components/IntoKeyword.php
+++ b/src/Components/IntoKeyword.php
@@ -112,7 +112,7 @@ class IntoKeyword extends Component
      * @param array             $columns        column list of destination
      * @param array             $values         selected fields
      * @param OptionsArray      $fields_options options for FIELDS/COLUMNS keyword
-     * @param OptionsArray      $fields_keyword options for OPTINOS keyword
+     * @param bool              $fields_keyword options for OPTIONS keyword
      */
     public function __construct(
         $type = null,
diff --git a/src/Components/UnionKeyword.php b/src/Components/UnionKeyword.php
index 3acc66b..55c9e29 100644
--- a/src/Components/UnionKeyword.php
+++ b/src/Components/UnionKeyword.php
@@ -14,8 +14,8 @@ use PhpMyAdmin\SqlParser\Component;
 class UnionKeyword extends Component
 {
     /**
-     * @param UnionKeyword[] $component the component to be built
-     * @param array          $options   parameters for building
+     * @param array<UnionKeyword[]> $component the component to be built
+     * @param array                 $options   parameters for building
      *
      * @return string
      */
diff --git a/src/Context.php b/src/Context.php
index 6e699c5..138c5c5 100644
--- a/src/Context.php
+++ b/src/Context.php
@@ -264,7 +264,7 @@ abstract class Context
      * @param string $str        string to be checked
      * @param bool   $isReserved checks if the keyword is reserved
      *
-     * @return int
+     * @return int|null
      */
     public static function isKeyword($str, $isReserved = false)
     {
@@ -289,7 +289,7 @@ abstract class Context
      *
      * @param string $str string to be checked
      *
-     * @return int the appropriate flag for the operator
+     * @return int|null the appropriate flag for the operator
      */
     public static function isOperator($str)
     {
@@ -324,7 +324,7 @@ abstract class Context
      * @param string $str string to be checked
      * @param mixed  $end
      *
-     * @return int the appropriate flag for the comment type
+     * @return int|null the appropriate flag for the comment type
      */
     public static function isComment($str, $end = false)
     {
@@ -394,7 +394,7 @@ abstract class Context
      *
      * @param string $str string to be checked
      *
-     * @return int the appropriate flag for the symbol type
+     * @return int|null the appropriate flag for the symbol type
      */
     public static function isSymbol($str)
     {
@@ -420,7 +420,7 @@ abstract class Context
      *
      * @param string $str string to be checked
      *
-     * @return int the appropriate flag for the string type
+     * @return int|null the appropriate flag for the string type
      */
     public static function isString($str)
     {
@@ -496,7 +496,7 @@ abstract class Context
      * @param string $context name of the context or full class name that
      *                        defines the context
      *
-     * @return string The loaded context. `null` if no context was loaded.
+     * @return string|null The loaded context. `null` if no context was loaded.
      */
     public static function loadClosest($context = '')
     {
@@ -551,7 +551,7 @@ abstract class Context
      * @param array|string $str   the string to be escaped
      * @param string       $quote quote to be used when escaping
      *
-     * @return string
+     * @return string|array
      */
     public static function escape($str, $quote = '`')
     {
diff --git a/src/TokensList.php b/src/TokensList.php
index 3f08fe6..e8ff733 100644
--- a/src/TokensList.php
+++ b/src/TokensList.php
@@ -89,7 +89,7 @@ class TokensList implements ArrayAccess
      * Gets the next token. Skips any irrelevant token (whitespaces and
      * comments).
      *
-     * @return Token
+     * @return Token|null
      */
     public function getNext()
     {
@@ -109,7 +109,7 @@ class TokensList implements ArrayAccess
      *
      * @param int $type the type
      *
-     * @return Token
+     * @return Token|null
      */
     public function getNextOfType($type)
     {
@@ -128,7 +128,7 @@ class TokensList implements ArrayAccess
      * @param int    $type  the type of the token
      * @param string $value the value of the token
      *
-     * @return Token
+     * @return Token|null
      */
     public function getNextOfTypeAndValue($type, $value)
     {
diff --git a/src/UtfString.php b/src/UtfString.php
index 06eb773..cb4187c 100644
--- a/src/UtfString.php
+++ b/src/UtfString.php
@@ -96,7 +96,7 @@ class UtfString implements ArrayAccess
      *
      * @param int $offset the offset to be returned
      *
-     * @return string
+     * @return string|null
      */
     public function offsetGet($offset)
     {
diff --git a/src/Utils/BufferedQuery.php b/src/Utils/BufferedQuery.php
index e2f269a..a2d6705 100644
--- a/src/Utils/BufferedQuery.php
+++ b/src/Utils/BufferedQuery.php
@@ -131,7 +131,7 @@ class BufferedQuery
      *
      * @param bool $end whether the end of the buffer was reached
      *
-     * @return string
+     * @return string|false
      */
     public function extract($end = false)
     {