Make constants const

Signed-off-by: Kamil Tekiela <[email protected]>
phpmyadmin · Sep 6, 2023 · e76fcc2 · e76fcc2
1 parent b737500
commit e76fcc2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 22 deletions.
diff --git a/src/Lexer.php b/src/Lexer.php
@@ -30,10 +30,8 @@ class Lexer extends Core
 {
     /**
      * A list of methods that are used in lexing the SQL query.
-     *
-     * @var string[]
      */
-    public static $parserMethods = [
+    private const PARSER_METHODS = [
         // It is best to put the parsers in order of their complexity
         // (ascending) and their occurrence rate (descending).
         //
@@ -70,14 +68,11 @@ class Lexer extends Core
         'parseUnknown',
     ];
 
-
     /**
      * A list of keywords that indicate that the function keyword
      * is not used as a function
-     *
-     * @var string[]
      */
-    public $keywordNameIndicators = [
+    private const KEYWORD_NAME_INDICATORS = [
         'FROM',
         'SET',
         'WHERE',
@@ -86,10 +81,8 @@ class Lexer extends Core
     /**
      * A list of operators that indicate that the function keyword
      * is not used as a function
-     *
-     * @var string[]
      */
-    public $operatorNameIndicators = [
+    private const OPERATOR_NAME_INDICATORS = [
         ',',
         '.',
     ];
@@ -238,7 +231,7 @@ public function lex(): void
              */
             $token = null;
 
-            foreach (static::$parserMethods as $method) {
+            foreach (self::PARSER_METHODS as $method) {
                 $token = $this->$method();
 
                 if ($token) {
@@ -413,10 +406,10 @@ private function solveAmbiguityOnFunctionKeywords(): void
             $next = $this->list->getNext();
             if (
                 ($next->type !== Token::TYPE_KEYWORD
-                    || ! in_array($next->value, $this->keywordNameIndicators, true)
+                    || ! in_array($next->value, self::KEYWORD_NAME_INDICATORS, true)
                 )
                 && ($next->type !== Token::TYPE_OPERATOR
-                    || ! in_array($next->value, $this->operatorNameIndicators, true)
+                    || ! in_array($next->value, self::OPERATOR_NAME_INDICATORS, true)
                 )
                 && ($next->value !== null)
             ) {

diff --git a/src/Statements/ExplainStatement.php b/src/Statements/ExplainStatement.php
@@ -20,11 +20,8 @@ class ExplainStatement extends Statement
 {
     /**
      * Options for `EXPLAIN` statements.
-     *
-     * @var array<string, int|array<int, int|string>>
-     * @psalm-var array<string, (positive-int|array{positive-int, ('var'|'var='|'expr'|'expr=')})>
      */
-    public static $OPTIONS = [
+    private const OPTIONS = [
 
         'EXTENDED' => 1,
         'PARTITIONS' => 1,
@@ -166,7 +163,7 @@ public function parse(Parser $parser, TokensList $list): void
                 }
             } elseif ($state === 1) {
                 // Parsing options.
-                $this->options = OptionsArray::parse($parser, $list, static::$OPTIONS);
+                $this->options = OptionsArray::parse($parser, $list, self::OPTIONS);
                 $state = 2;
             } elseif ($state === 2) {
                 $currIdx = $list->idx;

diff --git a/src/Tools/CustomJsonSerializer.php b/src/Tools/CustomJsonSerializer.php
@@ -21,11 +21,7 @@ class CustomJsonSerializer extends JsonSerializer
         'statementEndOptions',
         'keywordParsers',
         'statementParsers',
-        'keywordNameIndicators',// Not static
-        'operatorNameIndicators',// Not static
         'defaultDelimiter',
-        'parserMethods',
-        'OPTIONS',
         'clauses',
         'databaseOptions',
         'delimiters',