From 1456d09b3b320a89ed37455e2ff0e90d5390bd49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Barto=C5=A1?= Date: Sun, 29 Dec 2024 18:59:40 +0100 Subject: [PATCH] Require phpstan/phpstan:^2 --- composer.json | 10 +++++----- tools/phpstan.baseline.neon | 12 ++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 5fcfd84..999a25b 100644 --- a/composer.json +++ b/composer.json @@ -37,11 +37,11 @@ "orisai/coding-standard": "^3.0.0", "orisai/vfs": "^1.0.0", "phpstan/extension-installer": "^1.0.0", - "phpstan/phpstan": "^1.0.0", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "phpstan/phpstan-nette": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.0.0", - "phpstan/phpstan-strict-rules": "^1.0.0", + "phpstan/phpstan": "^2.0.0", + "phpstan/phpstan-deprecation-rules": "^2.0.0", + "phpstan/phpstan-nette": "^2.0.0", + "phpstan/phpstan-phpunit": "^2.0.0", + "phpstan/phpstan-strict-rules": "^2.0.0", "phpunit/phpunit": "^9.5.0", "staabm/annotate-pull-request-from-checkstyle": "^1.7.0" }, diff --git a/tools/phpstan.baseline.neon b/tools/phpstan.baseline.neon index 48a66a2..4c42df6 100644 --- a/tools/phpstan.baseline.neon +++ b/tools/phpstan.baseline.neon @@ -1,21 +1,25 @@ parameters: ignoreErrors: - - message: "#^Parameter \\#3 \\$subject of function str_replace expects array\\|string, string\\|false given\\.$#" + message: '#^Parameter \#3 \$subject of function str_replace expects array\\|string, string\|false given\.$#' + identifier: argument.type count: 2 path: ../tests/Unit/Loader/LoaderGeneratorTest.php - - message: "#^Call to method Orisai\\\\Installer\\\\Modules\\\\Module\\:\\:getDependents\\(\\) on a separate line has no effect\\.$#" + message: '#^Call to method Orisai\\Installer\\Modules\\Module\:\:getDependents\(\) on a separate line has no effect\.$#' + identifier: method.resultUnused count: 1 path: ../tests/Unit/Modules/ModuleTest.php - - message: "#^Cannot call method getClass\\(\\) on Orisai\\\\Installer\\\\Schema\\\\LoaderSchema\\|null\\.$#" + message: '#^Cannot call method getClass\(\) on Orisai\\Installer\\Schema\\LoaderSchema\|null\.$#' + identifier: method.nonObject count: 1 path: ../tests/Unit/Schema/ModuleSchemaTest.php - - message: "#^Cannot call method getFile\\(\\) on Orisai\\\\Installer\\\\Schema\\\\LoaderSchema\\|null\\.$#" + message: '#^Cannot call method getFile\(\) on Orisai\\Installer\\Schema\\LoaderSchema\|null\.$#' + identifier: method.nonObject count: 1 path: ../tests/Unit/Schema/ModuleSchemaTest.php