Add remaining native return types

phpcs.xml.dist

@@ -66,9 +66,6 @@
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
         <severity>4</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint">
-        <severity>4</severity>
-    </rule>
     <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
         <severity>4</severity>
     </rule>

psalm-baseline.xml

@@ -857,9 +857,6 @@
       <code>$built[$field]</code>
       <code><![CDATA[$parsedClauses[$token->value]]]></code>
     </InvalidArgument>
-    <MethodSignatureMustProvideReturnType>
-      <code>__toString</code>
-    </MethodSignatureMustProvideReturnType>
     <MixedArrayOffset>
       <code><![CDATA[$parsedClauses[$token->value]]]></code>
       <code><![CDATA[$parsedClauses[$token->value]]]></code>
@@ -1206,9 +1203,6 @@
     </RedundantConditionGivenDocblockType>
   </file>
   <file src="src/UtfString.php">
-    <MethodSignatureMustProvideReturnType>
-      <code>__toString</code>
-    </MethodSignatureMustProvideReturnType>
     <PossiblyUnusedProperty>
       <code>$byteLen</code>
     </PossiblyUnusedProperty>

src/Component.php

@@ -22,10 +22,8 @@ interface Component extends Stringable
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return mixed
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = []);
+    public static function parse(Parser $parser, TokensList $list, array $options = []): mixed;
 
     /**
      * Builds the string representation of a component of this type.

src/Components/AlterOperation.php

@@ -300,10 +300,8 @@
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return AlterOperation
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): AlterOperation
     {
         $ret = new static();
 
@@ -351,12 +349,12 @@
 
             // Skipping comments.
             if ($token->type === Token::TYPE_COMMENT) {
                 continue;
             }
 
             // Skipping whitespaces.
             if ($token->type === Token::TYPE_WHITESPACE) {
                 if ($state === 2) {
                     // When parsing the unknown part, the whitespaces are
                     // included to not break anything.
                     $ret->unknown[] = $token;
@@ -370,7 +368,7 @@
                 // Not only when aliasing but also when parsing the body of an event, we just list the tokens of the
                 // body in the unknown tokens list, as they define their own statements.
                 if ($ret->options->has('AS') || $ret->options->has('DO')) {
                     for (; $list->idx < $list->count; ++$list->idx) {
                         if ($list->tokens[$list->idx]->type === Token::TYPE_DELIMITER) {
                             break;
                         }
@@ -410,7 +408,7 @@
 
                 $state = 2;
             } elseif ($state === 2) {
                 if (is_string($token->value) || is_numeric($token->value)) {
                     $arrayKey = $token->value;
                 } else {
                     $arrayKey = $token->token;
@@ -471,10 +469,10 @@
                     if (
                         ($token->type === Token::TYPE_KEYWORD)
                         && (($token->keyword === 'PARTITION BY')
                         || ($token->keyword === 'PARTITION' && $nextToken && $nextToken->value !== '('))
                     ) {
                         $partitionState = 1;
                     } elseif (($token->type === Token::TYPE_KEYWORD) && ($token->keyword === 'PARTITION')) {
                         $partitionState = 2;
                     }
 

src/Components/ArrayObj.php

@@ -49,7 +49,7 @@ public function __construct(array $raw = [], array $values = [])
      *
      * @return ArrayObj|Component[]
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): ArrayObj|array
     {
         $ret = empty($options['type']) ? new static() : [];
 

src/Components/CaseExpression.php

@@ -70,10 +70,8 @@ final class CaseExpression implements Component
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return CaseExpression
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): CaseExpression
     {
         $ret = new static();
 

src/Components/CreateDefinition.php

@@ -180,7 +180,7 @@ public function __construct(
      *
      * @return CreateDefinition[]
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): array
     {
         $ret = [];
 

src/Components/DataType.php

@@ -93,10 +93,8 @@ public function __construct(
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return DataType|null
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): DataType|null
     {
         $ret = new static();
 

src/Components/FunctionCall.php

@@ -48,10 +48,8 @@ public function __construct($name = null, $parameters = null)
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return FunctionCall
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): FunctionCall
     {
         $ret = new static();
 

src/Components/IntoKeyword.php

@@ -137,10 +137,8 @@ public function __construct(
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return IntoKeyword
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): IntoKeyword
     {
         $ret = new static();
 

src/Components/Key.php

@@ -123,10 +123,8 @@ public function __construct(
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return Key
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): Key
     {
         $ret = new static();
 

src/Components/Limit.php

@@ -42,10 +42,8 @@ public function __construct($rowCount = 0, $offset = 0)
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return Limit
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): Limit
     {
         $ret = new static();
 

src/Components/LockExpression.php

@@ -34,10 +34,8 @@ final class LockExpression implements Component
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return LockExpression
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): LockExpression
     {
         $ret = new static();
 
@@ -109,10 +107,7 @@ public static function buildAll(array $component): string
         return implode(', ', $component);
     }
 
-    /**
-     * @return string
-     */
-    private static function parseLockType(Parser $parser, TokensList $list)
+    private static function parseLockType(Parser $parser, TokensList $list): string
     {
         $lockType = '';
 

src/Components/OptionsArray.php

@@ -37,10 +37,8 @@ public function __construct(public array $options = [])
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return OptionsArray
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): OptionsArray
     {
         $ret = new static();
 
@@ -295,10 +293,8 @@ public static function build($component): string
      * @param string $key     the key to be checked
      * @param bool   $getExpr Gets the expression instead of the value.
      *                        The value is the processed form of the expression.
-     *
-     * @return mixed
      */
-    public function has($key, $getExpr = false)
+    public function has($key, $getExpr = false): mixed
     {
         foreach ($this->options as $option) {
             if (is_array($option)) {

src/Components/PartitionDefinition.php

@@ -110,10 +110,8 @@ final class PartitionDefinition implements Component
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return PartitionDefinition
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): PartitionDefinition
     {
         $ret = new static();
 

src/Components/Reference.php

@@ -76,10 +76,8 @@ public function __construct($table = null, array $columns = [], $options = null)
      * @param Parser               $parser  the parser that serves as context
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
-     *
-     * @return Reference
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): Reference
     {
         $ret = new static();
 

src/Components/UnionKeyword.php

@@ -24,11 +24,9 @@
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
      *
-     * @return mixed
-     *
      * @throws RuntimeException not implemented yet.
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): mixed
     {
         throw new RuntimeException(Translator::gettext('Not implemented yet.'));
     }

src/Components/WithKeyword.php

@@ -36,11 +36,9 @@
      * @param TokensList           $list    the list of tokens that are being parsed
      * @param array<string, mixed> $options parameters for parsing
      *
-     * @return mixed
-     *
      * @throws RuntimeException not implemented yet.
      */
-    public static function parse(Parser $parser, TokensList $list, array $options = [])
+    public static function parse(Parser $parser, TokensList $list, array $options = []): mixed
     {
         throw new RuntimeException(Translator::gettext('Not implemented yet.'));
     }

src/Context.php

@@ -670,10 +670,8 @@ private static function getModeFromString(string $mode): int
      *
      * @param string $str   the string to be escaped
      * @param string $quote quote to be used when escaping
-     *
-     * @return string
      */
-    public static function escape(string $str, string $quote = '`')
+    public static function escape(string $str, string $quote = '`'): string
     {
         if ((static::$mode & self::SQL_MODE_NO_ENCLOSING_QUOTES) && (! static::isKeyword($str, true))) {
             return $str;

src/Core.php

@@ -47,11 +47,9 @@ public function __construct()
      *
      * @param Exception $error the error exception
      *
-     * @return void
-     *
      * @throws Exception throws the exception, if strict mode is enabled.
      */
-    public function error($error)
+    public function error($error): void
     {
         if ($this->strict) {
             throw $error;