Merge pull request #465 from kamil-tekiela/More-known-types

MauricioFauth · web-flow · commit 332054f160df · 2023-06-07T14:39:52.000-03:00
Add native types
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
@@ -44,10 +44,7 @@ public function before(Parser $parser, TokensList $list, Token $token): void
         $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
@@ -290,10 +290,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
@@ -92,10 +92,7 @@ public function parseHighlight(): array|false
         return $params;
     }
 
-    /**
-     * @return int
-     */
-    public function runHighlight()
+    public function runHighlight(): int
     {
         $params = $this->parseHighlight();
         if ($params === false) {
@@ -159,10 +156,7 @@ public function parseLint(): array|false
         return $params;
     }
 
-    /**
-     * @return int
-     */
-    public function runLint()
+    public function runLint(): int
     {
         $params = $this->parseLint();
         if ($params === false) {
@@ -234,10 +228,7 @@ public function parseTokenize(): array|false
         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
`@@ -44,10 +44,7 @@ public function before(Parser $parser, TokensList $list, Token $token): void`
`44`	`44`	`$list->getNextOfTypeAndValue(Token::TYPE_KEYWORD, 'TABLE');`
`45`	`45`	`}`
`46`	`46`
`47`		`- /**`
`48`		`- * @return string`
`49`		`- */`
`50`		`- public function build()`
	`47`	`+ public function build(): string`
`51`	`48`	`{`
`52`	`49`	`return 'RENAME TABLE ' . RenameOperation::build($this->renames);`
`53`	`50`	`}`
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
`@@ -290,10 +290,8 @@ public function offsetUnset($offset)`
`290`	`290`	`* @see https://tools.ietf.org/html/rfc3629`
`291`	`291`	`*`
`292`	`292`	`* @param string $byte the byte to be analyzed`
`293`		`- *`
`294`		`- * @return int`
`295`	`293`	`*/`
`296`		`- public static function getCharLength($byte)`
	`294`	`+ public static function getCharLength($byte): int`
`297`	`295`	`{`
`298`	`296`	`// Use the default ASCII map as queries are mostly ASCII chars`
`299`	`297`	`// ord($byte) has a performance cost`
Original file line number	Diff line number	Diff line change
`@@ -92,10 +92,7 @@ public function parseHighlight(): array\|false`
`92`	`92`	`return $params;`
`93`	`93`	`}`
`94`	`94`
`95`		`- /**`
`96`		`- * @return int`
`97`		`- */`
`98`		`- public function runHighlight()`
	`95`	`+ public function runHighlight(): int`
`99`	`96`	`{`
`100`	`97`	`$params = $this->parseHighlight();`
`101`	`98`	`if ($params === false) {`
`@@ -159,10 +156,7 @@ public function parseLint(): array\|false`
`159`	`156`	`return $params;`
`160`	`157`	`}`
`161`	`158`
`162`		`- /**`
`163`		`- * @return int`
`164`		`- */`
`165`		`- public function runLint()`
	`159`	`+ public function runLint(): int`
`166`	`160`	`{`
`167`	`161`	`$params = $this->parseLint();`
`168`	`162`	`if ($params === false) {`
`@@ -234,10 +228,7 @@ public function parseTokenize(): array\|false`
`234`	`228`	`return $params;`
`235`	`229`	`}`
`236`	`230`
`237`		`- /**`
`238`		`- * @return int`
`239`		`- */`
`240`		`- public function runTokenize()`
	`231`	`+ public function runTokenize(): int`
`241`	`232`	`{`
`242`	`233`	`$params = $this->parseTokenize();`
`243`	`234`	`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]))`