Merge pull request #5370 from derrabus/bump/sa

Psalm 4.23, PHPStan 1.6.3
doctrine · May 2, 2022 · 712cf47 · 712cf47
2 parents ea58a77 + d33837f
commit 712cf47
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -42,14 +42,14 @@
     "require-dev": {
         "doctrine/coding-standard": "9.0.0",
         "jetbrains/phpstorm-stubs": "2022.1",
-        "phpstan/phpstan": "1.6.1",
+        "phpstan/phpstan": "1.6.3",
         "phpstan/phpstan-strict-rules": "^1.2",
         "phpunit/phpunit": "9.5.20",
         "psalm/plugin-phpunit": "0.16.1",
         "squizlabs/php_codesniffer": "3.6.2",
         "symfony/cache": "^5.2|^6.0",
         "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
-        "vimeo/psalm": "4.22.0"
+        "vimeo/psalm": "4.23.0"
     },
     "suggest": {
         "symfony/console": "For helpful console commands such as SQL execution and import of files."

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -58,11 +58,6 @@ parameters:
             paths:
                 - src/Driver/OCI8/Result.php
 
-        -
-            message: '~Template type T of method Doctrine\\DBAL\\DriverManager::getConnection\(\) is not referenced in a parameter\.~'
-            paths:
-                - src/DriverManager.ph
-
         -
             message: '~Method Doctrine\\DBAL\\DriverManager::createDriver\(\) should return Doctrine\\DBAL\\Driver but returns object\.~'
             paths:
@@ -86,12 +81,6 @@ parameters:
             paths:
                 - src/Driver/OCI8/Statement.php
 
-        # https://github.com/phpstan/phpstan-src/pull/1214
-        -
-            message: '~^Expression on left side of \?\? is not nullable\.$~'
-            paths:
-                - src/Driver/IBMDB2/Connection.php
-
         # TODO: check for null after calling Connection::getDatabase()
         -
             message: '~Parameter.*\$database of method.*expects string, string\|null given\.~'

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -472,9 +472,6 @@
         </InvalidReturnType>
         <InvalidScalarArgument>
             <errorLevel type="suppress">
-                <!-- See https://github.com/vimeo/psalm/issues/4295 -->
-                <file name="src/Exception/DriverException.php"/>
-
                 <!-- See https://github.com/doctrine/dbal/pull/3498 -->
                 <file name="tests/Functional/DataAccessTest.php"/>
                 <file name="tests/Platforms/AbstractPlatformTestCase.php"/>