From 70797f3a45b1add2237face6089a770df85ec975 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Mon, 15 Mar 2021 12:34:40 -0700
Subject: [PATCH] Upgrade Psalm to 4.6.4

---
 .github/workflows/static-analysis.yml | 3 +--
 composer.json                         | 2 +-
 psalm.xml.dist                        | 9 ++-------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 09da931f006..35f1d6645a0 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -1,4 +1,3 @@
-
 name: "Static Analysis"
 
 on:
@@ -50,6 +49,6 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions:4.5.2
+        uses: docker://vimeo/psalm-github-actions:4.6.4
         with:
           composer_require_dev: true
diff --git a/composer.json b/composer.json
index 2b429c2cb4e..7252c8724b8 100644
--- a/composer.json
+++ b/composer.json
@@ -44,7 +44,7 @@
         "phpunit/phpunit": "9.5.0",
         "psalm/plugin-phpunit": "0.13.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "vimeo/psalm": "4.5.2"
+        "vimeo/psalm": "4.6.4"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."
diff --git a/psalm.xml.dist b/psalm.xml.dist
index 147d0c91d31..556f4fed5ff 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -341,7 +341,8 @@
                 <file name="lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php"/>
                 <file name="tests/Doctrine/Tests/DBAL/Functional/PortabilityTest.php"/>
                 <!--
-                    See https://github.com/vimeo/psalm/issues/5305
+                    Requires a release of
+                    https://github.com/JetBrains/phpstorm-stubs/commit/43ce0bb13e927b9eb69cc06c16ab22f548c4735b
                 -->
                 <file name="lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php"/>
             </errorLevel>
@@ -381,12 +382,6 @@
                 <file name="lib/Doctrine/DBAL/Schema/SqliteSchemaManager.php"/>
             </errorLevel>
         </TooManyArguments>
-        <TypeDoesNotContainType>
-            <errorLevel type="suppress">
-                <!-- See https://github.com/vimeo/psalm/issues/4274 -->
-                <file name="lib/Doctrine/DBAL/Schema/Index.php"/>
-            </errorLevel>
-        </TypeDoesNotContainType>
         <UndefinedConstant>
             <errorLevel type="suppress">
                 <directory name="lib/Doctrine/DBAL/Driver/SQLAnywhere"/>