Merge pull request #5300 from derrabus/bump/psalm

Psalm 4.22.0, PHPUnit 9.5.16
doctrine · Feb 28, 2022 · 04fc772 · 04fc772
2 parents a2212d1 + 00c7a40
commit 04fc772
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -42,12 +42,12 @@
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2021.1",
         "phpstan/phpstan": "1.4.6",
-        "phpunit/phpunit": "^7.5.20|^8.5|9.5.13",
+        "phpunit/phpunit": "^7.5.20|^8.5|9.5.16",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.2",
         "symfony/cache": "^4.4",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
-        "vimeo/psalm": "4.20.0"
+        "vimeo/psalm": "4.22.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/psalm-strict.xml b/psalm-strict.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
+    errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -309,14 +309,6 @@
                 <file name="lib/Doctrine/DBAL/Schema/View.php"/>
             </errorLevel>
         </PropertyNotSetInConstructor>
-        <RedundantCondition>
-            <errorLevel type="suppress">
-                <!--
-                    See https://github.com/vimeo/psalm/pull/7660
-                -->
-                <file name="lib/Doctrine/DBAL/Driver/Mysqli/Exception/ConnectionFailed.php"/>
-            </errorLevel>
-        </RedundantCondition>
         <!-- This is necessary pre 4.0  -->
         <RedundantCastGivenDocblockType>
             <errorLevel type="suppress">