Upgrade phpstan and psalm

doctrine · Nov 11, 2020 · e9034c5 · e9034c5
1 parent 3622d6d
commit e9034c5
Show file tree

Hide file tree

Showing 3 changed files with 151 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -40,9 +40,11 @@
     "require-dev": {
         "doctrine/coding-standard": "^8.1",
         "jetbrains/phpstorm-stubs": "^2019.1",
-        "phpstan/phpstan": "^0.12.40",
+        "phpstan/phpstan": "^0.12.54",
+        "phpstan/phpstan-phpunit": "^0.12.16",
+        "phpstan/phpstan-strict-rules": "^0.12.5",
         "phpunit/phpunit": "^9.4",
-        "psalm/plugin-phpunit": "^0.10.0",
+        "psalm/plugin-phpunit": "^0.12.0",
         "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
         "vimeo/psalm": "^3.17.2"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -77,6 +77,13 @@ parameters:
             paths:
                 - %currentWorkingDirectory%/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
 
+        # Fixing the issue may cause a BC break.
+        # TODO: fix in 3.0.0
+        -
+            message: '~^Method Doctrine\\DBAL\\Driver\\Mysqli\\MysqliConnection::lastInsertId\(\) should return string but returns int\|string\.$~'
+            paths:
+                - %currentWorkingDirectory%/lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
+
         # Fixing the issue may cause a BC break.
         # TODO: fix in 3.0.0
         -