Merge pull request #472 from kamil-tekiela/Add-less-specific-Psalm-var

Add less specific Psalm-var
phpmyadmin · Jun 7, 2023 · 8ed826c · 8ed826c
2 parents 87af0c9 + 1eaaa0c
commit 8ed826c
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 3,962 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
diff --git a/src/Context.php b/src/Context.php
@@ -80,6 +80,7 @@ abstract class Context
      * Elements are sorted by flags, length and keyword.
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [];

diff --git a/src/Contexts/ContextMariaDb100000.php b/src/Contexts/ContextMariaDb100000.php
@@ -27,6 +27,7 @@ class ContextMariaDb100000 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100100.php b/src/Contexts/ContextMariaDb100100.php
@@ -27,6 +27,7 @@ class ContextMariaDb100100 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100200.php b/src/Contexts/ContextMariaDb100200.php
@@ -27,6 +27,7 @@ class ContextMariaDb100200 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100300.php b/src/Contexts/ContextMariaDb100300.php
@@ -27,6 +27,7 @@ class ContextMariaDb100300 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100400.php b/src/Contexts/ContextMariaDb100400.php
@@ -27,6 +27,7 @@ class ContextMariaDb100400 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100500.php b/src/Contexts/ContextMariaDb100500.php
@@ -27,6 +27,7 @@ class ContextMariaDb100500 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMariaDb100600.php b/src/Contexts/ContextMariaDb100600.php
@@ -27,6 +27,7 @@ class ContextMariaDb100600 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql50000.php b/src/Contexts/ContextMySql50000.php
@@ -27,6 +27,7 @@ class ContextMySql50000 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql50100.php b/src/Contexts/ContextMySql50100.php
@@ -27,6 +27,7 @@ class ContextMySql50100 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql50500.php b/src/Contexts/ContextMySql50500.php
@@ -27,6 +27,7 @@ class ContextMySql50500 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql50600.php b/src/Contexts/ContextMySql50600.php
@@ -27,6 +27,7 @@ class ContextMySql50600 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql50700.php b/src/Contexts/ContextMySql50700.php
@@ -27,6 +27,7 @@ class ContextMySql50700 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Contexts/ContextMySql80000.php b/src/Contexts/ContextMySql80000.php
@@ -27,6 +27,7 @@ class ContextMySql80000 extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/src/Tools/ContextGenerator.php b/src/Tools/ContextGenerator.php
@@ -109,6 +109,7 @@ class %2$s extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [

diff --git a/tests/Tools/templates/TestContext.php b/tests/Tools/templates/TestContext.php
@@ -27,6 +27,7 @@ class TestContext extends Context
      *      Token::FLAG_KEYWORD_FUNCTION
      *
      * @var array<string,int>
+     * @psalm-var non-empty-array<string,Token::FLAG_KEYWORD_*|int>
      * @phpstan-var non-empty-array<non-empty-string,Token::FLAG_KEYWORD_*|int>
      */
     public static $keywords = [