Merge branch '2.13.x' into 2.14.x

* 2.13.x: PHPStan 1.9.0 (#10200)
doctrine · Nov 4, 2022 · 5d88dc9 · 5d88dc9
2 parents c97f0a1 + 0b14c01
commit 5d88dc9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "doctrine/annotations": "^1.13",
         "doctrine/coding-standard": "^9.0.2 || ^10.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
-        "phpstan/phpstan": "~1.4.10 || 1.8.11",
+        "phpstan/phpstan": "~1.4.10 || 1.9.0",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",

diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
@@ -8,9 +8,6 @@ parameters:
         - '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getGuidExpression\(\).$/'
 
         # Fallback logic for DBAL 2
-        -
-            message: '/HelperSet constructor expects/'
-            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
         -
             message: '/Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command/'
             path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php

diff --git a/phpstan.neon b/phpstan.neon
@@ -8,9 +8,6 @@ parameters:
         - '/^Call to an undefined method Doctrine\\DBAL\\Platforms\\AbstractPlatform::getGuidExpression\(\).$/'
 
         # Fallback logic for DBAL 2
-        -
-            message: '/HelperSet constructor expects/'
-            path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php
         -
             message: '/Application::add\(\) expects Symfony\\Component\\Console\\Command\\Command/'
             path: lib/Doctrine/ORM/Tools/Console/ConsoleRunner.php