From 234829644ced6a281c59827b381994ce74382105 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 22 Aug 2021 23:45:59 +0200 Subject: [PATCH] PHPStan 0.12.96 Signed-off-by: Alexander M. Turek --- composer.json | 2 +- phpstan-baseline.neon | 11 +++-------- phpstan-params.neon | 3 --- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 67aa98cdf76..d80b37332f3 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "doctrine/annotations": "^1.13", "doctrine/coding-standard": "^9.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "0.12.94", + "phpstan/phpstan": "0.12.96", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.4", "squizlabs/php_codesniffer": "3.6.0", "symfony/cache": "^4.4 || ^5.2", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 60932a873eb..8f4e7080362 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -536,12 +536,12 @@ parameters: path: lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php - - message: "#^Array \\(array\\\\) does not accept key 'options'\\.$#" + message: "#^Array \\(array\\('name' \\=\\> string, 'schema' \\=\\> string, 'indexes' \\=\\> array, 'uniqueConstraints' \\=\\> array\\)\\) does not accept key 'options'\\.$#" count: 1 path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php - - message: "#^Array \\(array\\\\) does not accept key 'quoted'\\.$#" + message: "#^Array \\(array\\('name' \\=\\> string, 'schema' \\=\\> string, 'indexes' \\=\\> array, 'uniqueConstraints' \\=\\> array\\)\\) does not accept key 'quoted'\\.$#" count: 2 path: lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1396,7 +1396,7 @@ parameters: path: lib/Doctrine/ORM/Query/FilterCollection.php - - message: "#^Array \\(array\\\\) does not accept key string\\.$#" + message: "#^Array \\(array\\\\) does not accept key non\\-empty\\-string\\.$#" count: 1 path: lib/Doctrine/ORM/Query/Parser.php @@ -1446,11 +1446,6 @@ parameters: count: 1 path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php - - - message: "#^Parameter \\#2 \\$mode of method Doctrine\\\\ORM\\\\Query\\\\ResultSetMappingBuilder\\:\\:getColumnAliasMap\\(\\) expects 1\\|2\\|3, int given\\.$#" - count: 2 - path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php - - message: "#^Array \\(array\\\\|string\\>\\) does not accept key int\\.$#" count: 1 diff --git a/phpstan-params.neon b/phpstan-params.neon index df303cb0365..1a5e688fa43 100644 --- a/phpstan-params.neon +++ b/phpstan-params.neon @@ -9,6 +9,3 @@ parameters: Doctrine\ORM\Query\Parser: - syntaxError phpVersion: 70100 - ignoreErrors: - # The class was added in PHP 8.1 - - '/^Attribute class ReturnTypeWillChange does not exist.$/'