Add native types

kamil-tekiela · kamil-tekiela · commit 384b2f1e79bc · 2023-06-01T16:28:35.000+01:00
Signed-off-by: Kamil Tekiela &lt;tekiela246@gmail.com&gt;
diff --git a/src/Statements/CallStatement.php b/src/Statements/CallStatement.php
@@ -29,10 +29,8 @@ class CallStatement extends Statement
 
     /**
      * Build statement for CALL.
-     *
-     * @return string
      */
-    public function build()
+    public function build(): string
     {
         return 'CALL ' . $this->call->name . '('
             . ($this->call->parameters ? implode(',', $this->call->parameters->raw) : '') . ')';
diff --git a/src/Statements/CreateStatement.php b/src/Statements/CreateStatement.php
@@ -408,10 +408,7 @@ class CreateStatement extends Statement
      */
     public $body = [];
 
-    /**
-     * @return string
-     */
-    public function build()
+    public function build(): string
     {
         $fields = '';
         if (! empty($this->fields)) {
diff --git a/src/Statements/RenameStatement.php b/src/Statements/RenameStatement.php
@@ -46,10 +46,7 @@ public function before(Parser $parser, TokensList $list, Token $token)
         $list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');
     }
 
-    /**
-     * @return string
-     */
-    public function build()
+    public function build(): string
     {
         return 'RENAME TABLE ' . RenameOperation::build($this->renames);
     }
diff --git a/src/Statements/TruncateStatement.php b/src/Statements/TruncateStatement.php
@@ -29,10 +29,8 @@ class TruncateStatement extends Statement
 
     /**
      * Special build method for truncate statement as Statement::build would return empty string.
-     *
-     * @return string
      */
-    public function build()
+    public function build(): string
     {
         return 'TRUNCATE TABLE ' . $this->table . ';';
     }
diff --git a/src/UtfString.php b/src/UtfString.php
@@ -292,10 +292,8 @@ public function offsetUnset($offset)
      * @see https://tools.ietf.org/html/rfc3629
      *
      * @param string $byte the byte to be analyzed
-     *
-     * @return int
      */
-    public static function getCharLength($byte)
+    public static function getCharLength($byte): int
     {
         // Use the default ASCII map as queries are mostly ASCII chars
         // ord($byte) has a performance cost
diff --git a/src/Utils/CLI.php b/src/Utils/CLI.php
@@ -97,10 +97,7 @@ public function parseHighlight()
         return $params;
     }
 
-    /**
-     * @return int
-     */
-    public function runHighlight()
+    public function runHighlight(): int
     {
         $params = $this->parseHighlight();
         if ($params === false) {
@@ -167,10 +164,7 @@ public function parseLint()
         return $params;
     }
 
-    /**
-     * @return int
-     */
-    public function runLint()
+    public function runLint(): int
     {
         $params = $this->parseLint();
         if ($params === false) {
@@ -245,10 +239,7 @@ public function parseTokenize()
         return $params;
     }
 
-    /**
-     * @return int
-     */
-    public function runTokenize()
+    public function runTokenize(): int
     {
         $params = $this->parseTokenize();
         if ($params === false) {
diff --git a/src/Utils/Formatter.php b/src/Utils/Formatter.php
@@ -766,10 +766,9 @@ public static function getGroupLength($list)
      *
      * @param Token $token the token to be checked
      *
-     * @return int|false
      * @psalm-return 1|2|false
      */
-    public static function isClause($token)
+    public static function isClause($token): int|false
     {
         if (
             ($token->type === Token::TYPE_KEYWORD && isset(Parser::$statementParsers[$token->keyword]))
diff --git a/src/Utils/Query.php b/src/Utils/Query.php
@@ -738,10 +738,8 @@ public static function getClause($statement, $list, $clause, $type = 0, $skipFir
      *                              it is considered to be equal with `$old`.
      * @param bool       $onlyType  whether only the type of the clause should
      *                              be replaced or the entire clause
-     *
-     * @return string
      */
-    public static function replaceClause($statement, $list, $old, $new = null, $onlyType = false)
+    public static function replaceClause($statement, $list, $old, $new = null, $onlyType = false): string
     {
         // TODO: Update the tokens list and the statement.
 

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,7 @@ public function before(Parser $parser, TokensList $list, Token $token)`
`46`	`46`	`$list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');`
`47`	`47`	`}`
`48`	`48`
`49`		`- /**`
`50`		`- * @return string`
`51`		`- */`
`52`		`- public function build()`
	`49`	`+ public function build(): string`
`53`	`50`	`{`
`54`	`51`	`return 'RENAME TABLE ' . RenameOperation::build($this->renames);`
`55`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,8 @@ class TruncateStatement extends Statement`
`29`	`29`
`30`	`30`	`/**`
`31`	`31`	`* Special build method for truncate statement as Statement::build would return empty string.`
`32`		`- *`
`33`		`- * @return string`
`34`	`32`	`*/`
`35`		`- public function build()`
	`33`	`+ public function build(): string`
`36`	`34`	`{`
`37`	`35`	`return 'TRUNCATE TABLE ' . $this->table . ';';`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -292,10 +292,8 @@ public function offsetUnset($offset)`
`292`	`292`	`* @see https://tools.ietf.org/html/rfc3629`
`293`	`293`	`*`
`294`	`294`	`* @param string $byte the byte to be analyzed`
`295`		`- *`
`296`		`- * @return int`
`297`	`295`	`*/`
`298`		`- public static function getCharLength($byte)`
	`296`	`+ public static function getCharLength($byte): int`
`299`	`297`	`{`
`300`	`298`	`// Use the default ASCII map as queries are mostly ASCII chars`
`301`	`299`	`// ord($byte) has a performance cost`
Original file line number	Diff line number	Diff line change
`@@ -97,10 +97,7 @@ public function parseHighlight()`
`97`	`97`	`return $params;`
`98`	`98`	`}`
`99`	`99`
`100`		`- /**`
`101`		`- * @return int`
`102`		`- */`
`103`		`- public function runHighlight()`
	`100`	`+ public function runHighlight(): int`
`104`	`101`	`{`
`105`	`102`	`$params = $this->parseHighlight();`
`106`	`103`	`if ($params === false) {`
`@@ -167,10 +164,7 @@ public function parseLint()`
`167`	`164`	`return $params;`
`168`	`165`	`}`
`169`	`166`
`170`		`- /**`
`171`		`- * @return int`
`172`		`- */`
`173`		`- public function runLint()`
	`167`	`+ public function runLint(): int`
`174`	`168`	`{`
`175`	`169`	`$params = $this->parseLint();`
`176`	`170`	`if ($params === false) {`
`@@ -245,10 +239,7 @@ public function parseTokenize()`
`245`	`239`	`return $params;`
`246`	`240`	`}`
`247`	`241`
`248`		`- /**`
`249`		`- * @return int`
`250`		`- */`
`251`		`- public function runTokenize()`
	`242`	`+ public function runTokenize(): int`
`252`	`243`	`{`
`253`	`244`	`$params = $this->parseTokenize();`
`254`	`245`	`if ($params === false) {`
Original file line number	Diff line number	Diff line change
`@@ -766,10 +766,9 @@ public static function getGroupLength($list)`
`766`	`766`	`*`
`767`	`767`	`* @param Token $token the token to be checked`
`768`	`768`	`*`
`769`		`- * @return int\|false`
`770`	`769`	`* @psalm-return 1\|2\|false`
`771`	`770`	`*/`
`772`		`- public static function isClause($token)`
	`771`	`+ public static function isClause($token): int\|false`
`773`	`772`	`{`
`774`	`773`	`if (`
`775`	`774`	`($token->type === Token::TYPE_KEYWORD && isset(Parser::$statementParsers[$token->keyword]))`