Merge pull request #523 from MauricioFauth/phpcs

Fix some coding standard issues

phpcs.xml.dist

@@ -28,48 +28,14 @@
         <exclude-pattern>tests/Tools/templates/*</exclude-pattern>
     </rule>
 
-    <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
-        <exclude-pattern>src/Context.php</exclude-pattern>
-    </rule>
-
     <!-- Rules that should be followed, but are not required -->
-    <rule ref="SlevomatCodingStandard.Classes.ParentCallSpacing.IncorrectLinesCountAfterControlStructure">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Classes.ParentCallSpacing.IncorrectLinesCountBeforeControlStructure">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Classes.PropertySpacing.IncorrectCountOfBlankLinesAfterProperty">
-        <severity>4</severity>
-    </rule>
     <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat">
         <severity>4</severity>
     </rule>
-    <rule ref="SlevomatCodingStandard.Commenting.RequireOneLineDocComment.MultiLineDocComment">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch.NonCapturingCatchRequired">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInCall.MissingTrailingComma">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Functions.RequireTrailingCommaInDeclaration.MissingTrailingComma">
-        <severity>4</severity>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
-        <severity>4</severity>
-    </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint">
         <severity>4</severity>
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint">
         <severity>4</severity>
     </rule>
-    <rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
-        <severity>4</severity>
-    </rule>
-    <rule ref="Squiz.PHP.GlobalKeyword.NotAllowed">
-        <severity>4</severity>
-    </rule>
 </ruleset>

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.18.0@b113f3ed0259fd6e212d87c3df80eec95a6abf19">
+<files psalm-version="5.19.0@06b71be009a6bd6d81b9811855d6629b9fe90e1b">
   <file src="src/Components/AlterOperation.php">
     <PossiblyNullPropertyAssignmentValue>
       <code>$options</code>
@@ -8,7 +8,7 @@
       <code><![CDATA[ArrayObj::parse(
                         $parser,
                         $list,
-                        ['type' => PartitionDefinition::class]
+                        ['type' => PartitionDefinition::class],
                     )]]></code>
     </PropertyTypeCoercion>
   </file>
@@ -20,7 +20,7 @@
       <code><![CDATA[$options['type']::parse(
                     $parser,
                     $list,
-                    empty($options['typeOptions']) ? [] : $options['typeOptions']
+                    empty($options['typeOptions']) ? [] : $options['typeOptions'],
                 )]]></code>
     </MixedMethodCall>
     <MixedOperand>
@@ -374,14 +374,14 @@
                         [
                             'parenthesesDelimited' => true,
                             'breakOnAlias' => true,
-                        ]
+                        ],
                     )]]></code>
     </PossiblyNullPropertyAssignmentValue>
     <PropertyTypeCoercion>
       <code><![CDATA[ArrayObj::parse(
                         $parser,
                         $list,
-                        ['type' => self::class]
+                        ['type' => self::class],
                     )]]></code>
     </PropertyTypeCoercion>
     <UnusedVariable>
@@ -401,7 +401,7 @@
                     [
                         'parseField' => 'table',
                         'breakOnAlias' => true,
-                    ]
+                    ],
                 )]]></code>
     </PossiblyNullPropertyAssignmentValue>
   </file>
@@ -415,15 +415,15 @@
                     [
                         'breakOnAlias' => true,
                         'parseField' => 'table',
-                    ]
+                    ],
                 )]]></code>
       <code><![CDATA[Expression::parse(
                     $parser,
                     $list,
                     [
                         'breakOnAlias' => true,
                         'parseField' => 'table',
-                    ]
+                    ],
                 )]]></code>
     </PossiblyNullPropertyAssignmentValue>
   </file>
@@ -780,7 +780,7 @@
       <code><![CDATA[ArrayObj::parse(
                                 $parser,
                                 $list,
-                                ['type' => PartitionDefinition::class]
+                                ['type' => PartitionDefinition::class],
                             )]]></code>
       <code>ArrayObj::parse($parser, $list)</code>
     </PropertyTypeCoercion>

src/Components/AlterOperation.php

@@ -267,7 +267,7 @@ public function __construct(
         OptionsArray|null $options = null,
         Expression|string|null $field = null,
         array|null $partitions = null,
-        public array $unknown = []
+        public array $unknown = [],
     ) {
         $this->partitions = $partitions;
         $this->options = $options;
@@ -370,7 +370,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     [
                         'breakOnAlias' => true,
                         'parseField' => 'column',
-                    ]
+                    ],
                 );
                 if ($ret->field === null) {
                     // No field was read. We go back one token so the next
@@ -417,7 +417,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                             // a start to new statement, but have not found a delimiter between them
                             $parser->error(
                                 'A new statement was found, but no delimiter between it and the previous one.',
-                                $token
+                                $token,
                             );
                             break;
                         }
@@ -481,7 +481,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                     $ret->partitions = ArrayObj::parse(
                         $parser,
                         $list,
-                        ['type' => PartitionDefinition::class]
+                        ['type' => PartitionDefinition::class],
                     );
                 }
             }

src/Components/Array2d.php

@@ -88,9 +88,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         sprintf(
                             Translator::gettext('%1$d values were expected, but found %2$d.'),
                             $count,
-                            $arrCount
+                            $arrCount,
                         ),
-                        $token
+                        $token,
                     );
                 }
 

src/Components/ArrayObj.php

@@ -138,7 +138,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 $ret[] = $options['type']::parse(
                     $parser,
                     $list,
-                    empty($options['typeOptions']) ? [] : $options['typeOptions']
+                    empty($options['typeOptions']) ? [] : $options['typeOptions'],
                 );
             }
         }
@@ -170,9 +170,7 @@ public function build(): string
         return '(' . implode(', ', $this->values) . ')';
     }
 
-    /**
-     * @param ArrayObj[] $component the component to be built
-     */
+    /** @param ArrayObj[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(', ', $component);

src/Components/Condition.php

@@ -77,9 +77,7 @@ final class Condition implements Component
      */
     public $expr;
 
-    /**
-     * @param string $expr the condition or the operator
-     */
+    /** @param string $expr the condition or the operator */
     public function __construct(string|null $expr = null)
     {
         $this->expr = trim((string) $expr);
@@ -222,9 +220,7 @@ public function build(): string
         return $this->expr;
     }
 
-    /**
-     * @param Condition[] $component the component to be built
-     */
+    /** @param Condition[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(' ', $component);

src/Components/CreateDefinition.php

@@ -154,7 +154,7 @@ public function __construct(
         OptionsArray|null $options = null,
         DataType|Key|null $type = null,
         bool $isConstraint = false,
-        Reference|null $references = null
+        Reference|null $references = null,
     ) {
         $this->name = $name;
         $this->options = $options;
@@ -247,7 +247,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                             'A symbol name was expected! '
                             . 'A reserved keyword can not be used '
                             . 'as a column name without backquotes.',
-                            $token
+                            $token,
                         );
 
                         return $ret;
@@ -340,9 +340,7 @@ public function build(): string
         return trim($tmp);
     }
 
-    /**
-     * @param CreateDefinition[] $component the component to be built
-     */
+    /** @param CreateDefinition[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return "(\n  " . implode(",\n  ", $component) . "\n)";

src/Components/DataType.php

@@ -80,7 +80,7 @@ final class DataType implements Component
     public function __construct(
         string|null $name = null,
         array $parameters = [],
-        OptionsArray|null $options = null
+        OptionsArray|null $options = null,
     ) {
         $this->name = $name;
         $this->parameters = $parameters;

src/Components/Expression.php

@@ -4,6 +4,7 @@
 
 namespace PhpMyAdmin\SqlParser\Components;
 
+use AllowDynamicProperties;
 use PhpMyAdmin\SqlParser\Component;
 use PhpMyAdmin\SqlParser\Context;
 use PhpMyAdmin\SqlParser\Exceptions\ParserException;
@@ -21,7 +22,7 @@
  * Parses a reference to an expression (column, table or database name, function
  * call, mathematical expression, etc.).
  */
-#[\AllowDynamicProperties]
+#[AllowDynamicProperties]
 final class Expression implements Component
 {
     /**
@@ -114,7 +115,7 @@ public function __construct(
         string|null $database = null,
         string|null $table = null,
         string|null $column = null,
-        string|null $alias = null
+        string|null $alias = null,
     ) {
         if (($column === null) && ($alias === null)) {
             $this->expr = $database; // case 1
@@ -476,9 +477,7 @@ public function build(): string
         return $ret;
     }
 
-    /**
-     * @param Expression[] $component the component to be built
-     */
+    /** @param Expression[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(', ', $component);

src/Components/ExpressionArray.php

@@ -124,9 +124,7 @@ public function build(): string
         throw new RuntimeException(Translator::gettext('Not implemented yet.'));
     }
 
-    /**
-     * @param Expression[] $component the component to be built
-     */
+    /** @param Expression[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(', ', $component);

src/Components/GroupKeyword.php

@@ -27,9 +27,7 @@ final class GroupKeyword implements Component
      */
     public $expr;
 
-    /**
-     * @param Expression $expr the expression that we are sorting by
-     */
+    /** @param Expression $expr the expression that we are sorting by */
     public function __construct(Expression|null $expr = null)
     {
         $this->expr = $expr;
@@ -115,9 +113,7 @@ public function build(): string
         return trim((string) $this->expr);
     }
 
-    /**
-     * @param GroupKeyword[] $component the component to be built
-     */
+    /** @param GroupKeyword[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(', ', $component);

src/Components/IndexHint.php

@@ -48,7 +48,7 @@ public function __construct(
         string|null $type = null,
         string|null $indexOrKey = null,
         string|null $for = null,
-        array $indexes = []
+        array $indexes = [],
     ) {
         $this->type = $type;
         $this->indexOrKey = $indexOrKey;
@@ -186,9 +186,7 @@ public function build(): string
         return $ret . Expression::buildAll($this->indexes);
     }
 
-    /**
-     * @param IndexHint[] $component the component to be built
-     */
+    /** @param IndexHint[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         return implode(' ', $component);

src/Components/IntoKeyword.php

@@ -118,7 +118,7 @@ public function __construct(
         array|null $columns = null,
         array|null $values = null,
         OptionsArray|null $fieldsOptions = null,
-        bool|null $fieldsKeyword = null
+        bool|null $fieldsKeyword = null,
     ) {
         $this->type = $type;
         $this->dest = $dest;
@@ -195,7 +195,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         [
                             'parseField' => 'table',
                             'breakOnAlias' => true,
-                        ]
+                        ],
                     );
                 } else {
                     $ret->values = ExpressionArray::parse($parser, $list);

src/Components/JoinKeyword.php

@@ -82,7 +82,7 @@ public function __construct(
         string|null $type = null,
         Expression|null $expr = null,
         array|null $on = null,
-        ArrayObj|null $using = null
+        ArrayObj|null $using = null,
     ) {
         $this->type = $type;
         $this->expr = $expr;
@@ -206,9 +206,7 @@ public function build(): string
         throw new RuntimeException(Translator::gettext('Not implemented yet.'));
     }
 
-    /**
-     * @param JoinKeyword[] $component the component to be built
-     */
+    /** @param JoinKeyword[] $component the component to be built */
     public static function buildAll(array $component): string
     {
         $ret = [];

src/Components/Key.php

@@ -108,7 +108,7 @@ public function __construct(
         string|null $name = null,
         array $columns = [],
         string|null $type = null,
-        OptionsArray|null $options = null
+        OptionsArray|null $options = null,
     ) {
         $this->name = $name;
         $this->columns = $columns;