Skip to content

Commit 1a4d30d

Browse files
committed
Merge branch 'QA'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents 32e2949 + 3129c88 commit 1a4d30d

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

src/Components/DataType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function __construct(
8888
* @param TokensList $list the list of tokens that are being parsed
8989
* @param array $options parameters for parsing
9090
*
91-
* @return DataType
91+
* @return DataType|null
9292
*/
9393
public static function parse(Parser $parser, TokensList $list, array $options = [])
9494
{

src/Components/Expression.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public function __construct($database = null, $table = null, $column = null, $al
147147
* @param TokensList $list the list of tokens that are being parsed
148148
* @param array $options parameters for parsing
149149
*
150-
* @return Expression
150+
* @return Expression|null
151151
*/
152152
public static function parse(Parser $parser, TokensList $list, array $options = [])
153153
{

src/Components/IntoKeyword.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class IntoKeyword extends Component
112112
* @param array $columns column list of destination
113113
* @param array $values selected fields
114114
* @param OptionsArray $fields_options options for FIELDS/COLUMNS keyword
115-
* @param OptionsArray $fields_keyword options for OPTINOS keyword
115+
* @param bool $fields_keyword options for OPTIONS keyword
116116
*/
117117
public function __construct(
118118
$type = null,

src/Components/UnionKeyword.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
class UnionKeyword extends Component
1515
{
1616
/**
17-
* @param UnionKeyword[] $component the component to be built
18-
* @param array $options parameters for building
17+
* @param array<UnionKeyword[]> $component the component to be built
18+
* @param array $options parameters for building
1919
*
2020
* @return string
2121
*/

src/Context.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ abstract class Context
264264
* @param string $str string to be checked
265265
* @param bool $isReserved checks if the keyword is reserved
266266
*
267-
* @return int
267+
* @return int|null
268268
*/
269269
public static function isKeyword($str, $isReserved = false)
270270
{
@@ -289,7 +289,7 @@ public static function isKeyword($str, $isReserved = false)
289289
*
290290
* @param string $str string to be checked
291291
*
292-
* @return int the appropriate flag for the operator
292+
* @return int|null the appropriate flag for the operator
293293
*/
294294
public static function isOperator($str)
295295
{
@@ -324,7 +324,7 @@ public static function isWhitespace($str)
324324
* @param string $str string to be checked
325325
* @param mixed $end
326326
*
327-
* @return int the appropriate flag for the comment type
327+
* @return int|null the appropriate flag for the comment type
328328
*/
329329
public static function isComment($str, $end = false)
330330
{
@@ -394,7 +394,7 @@ public static function isNumber($str)
394394
*
395395
* @param string $str string to be checked
396396
*
397-
* @return int the appropriate flag for the symbol type
397+
* @return int|null the appropriate flag for the symbol type
398398
*/
399399
public static function isSymbol($str)
400400
{
@@ -420,7 +420,7 @@ public static function isSymbol($str)
420420
*
421421
* @param string $str string to be checked
422422
*
423-
* @return int the appropriate flag for the string type
423+
* @return int|null the appropriate flag for the string type
424424
*/
425425
public static function isString($str)
426426
{
@@ -496,7 +496,7 @@ public static function load($context = '')
496496
* @param string $context name of the context or full class name that
497497
* defines the context
498498
*
499-
* @return string The loaded context. `null` if no context was loaded.
499+
* @return string|null The loaded context. `null` if no context was loaded.
500500
*/
501501
public static function loadClosest($context = '')
502502
{
@@ -551,7 +551,7 @@ public static function setMode($mode = '')
551551
* @param array|string $str the string to be escaped
552552
* @param string $quote quote to be used when escaping
553553
*
554-
* @return string
554+
* @return string|array
555555
*/
556556
public static function escape($str, $quote = '`')
557557
{

src/TokensList.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function add(Token $token)
8989
* Gets the next token. Skips any irrelevant token (whitespaces and
9090
* comments).
9191
*
92-
* @return Token
92+
* @return Token|null
9393
*/
9494
public function getNext()
9595
{
@@ -109,7 +109,7 @@ public function getNext()
109109
*
110110
* @param int $type the type
111111
*
112-
* @return Token
112+
* @return Token|null
113113
*/
114114
public function getNextOfType($type)
115115
{
@@ -128,7 +128,7 @@ public function getNextOfType($type)
128128
* @param int $type the type of the token
129129
* @param string $value the value of the token
130130
*
131-
* @return Token
131+
* @return Token|null
132132
*/
133133
public function getNextOfTypeAndValue($type, $value)
134134
{

src/UtfString.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function offsetExists($offset)
9696
*
9797
* @param int $offset the offset to be returned
9898
*
99-
* @return string
99+
* @return string|null
100100
*/
101101
public function offsetGet($offset)
102102
{

src/Utils/BufferedQuery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function setDelimiter($delimiter)
131131
*
132132
* @param bool $end whether the end of the buffer was reached
133133
*
134-
* @return string
134+
* @return string|false
135135
*/
136136
public function extract($end = false)
137137
{

0 commit comments

Comments
 (0)