Merge branch 'master' into More-refactoring-of-build-method

Author: MauricioFauth

CHANGELOG.md

@@ -6,13 +6,18 @@
 - Move `Misc::getAliases()` into `SelectStatement::getAliases()` (#454)
 - Drop `USE_UTF_STRINGS` constant (#471)
 
-## [5.x.x] - YYYY-MM-DD
+## [5.9.x] - YYYY-MM-DD
+
+## [5.8.x] - YYYY-MM-DD
+
+## [5.8.1] - 2023-09-15
 
 - Fix `:=` was not recognized as an operator just like `=` (#306)
 - Fix `ALTER TABLE … MODIFY … ENUM('<reserved_keyword>')` is being wrongly parsed (#234)
 - Fix `ALTER TABLE … MODIFY … ENUM('<reserved_keyword>')` is being wrongly parsed (#478)
 - Fix MariaDB window function with alias gives bad linting errors (#283)
 - Fix unrecognized keyword `COLLATE` in `WHERE` clauses (#491)
+- Fix invalid hexadecimal prefix 0X (#508)
 
 ## [5.8.0] - 2023-06-05
 

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>

phpstan-baseline.neon

@@ -5,11 +5,6 @@ parameters:
 			count: 3
 			path: src/Components/AlterOperation.php
 
-		-
-			message: "#^Parameter \\#1 \\$key of function array_key_exists expects int\\|string, float\\|int\\|string given\\.$#"
-			count: 2
-			path: src/Components/AlterOperation.php
-
 		-
 			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Components\\\\AlterOperation\\:\\:\\$options \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\) does not accept PhpMyAdmin\\\\SqlParser\\\\Components\\\\OptionsArray\\|null\\.$#"
 			count: 1

psalm-baseline.xml

@@ -38,9 +38,6 @@
         'DO' => 10,
     ]]]></code>
     </InvalidPropertyAssignmentValue>
-    <MixedArrayOffset>
-      <code><![CDATA[Parser::$statementParsers[$token->value]]]></code>
-    </MixedArrayOffset>
     <PossiblyInvalidArgument>
       <code>$arrayKey</code>
     </PossiblyInvalidArgument>
@@ -773,9 +770,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>
@@ -1127,9 +1121,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

@@ -11,7 +11,7 @@
 
 use function array_key_exists;
 use function in_array;
-use function is_numeric;
+use function is_int;
 use function is_string;
 use function trim;
 
@@ -300,10 +300,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 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();
 
@@ -410,7 +408,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
                 $state = 2;
             } elseif ($state === 2) {
-                if (is_string($token->value) || is_numeric($token->value)) {
+                if (is_string($token->value) || is_int($token->value)) {
                     $arrayKey = $token->value;
                 } else {
                     $arrayKey = $token->token;
@@ -443,7 +441,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                             );
                             break;
                         }
-                    } elseif (! empty(Parser::$statementParsers[$token->value])) {
+                    } elseif (! empty(Parser::$statementParsers[$arrayKey])) {
                         // We have reached the end of ALTER operation and suddenly found
                         // a start to new statement, but have not found a delimiter between them
                         $parser->error(

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() : [];
 
@@ -89,6 +89,10 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
             // End of statement.
             if ($token->type === Token::TYPE_DELIMITER) {
+                if ($brackets > 0) {
+                    $parser->error('A closing bracket was expected.', $token);
+                }
+
                 break;
             }
 

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();