From 9034d331cc1f925cb8a6d26a42ab03aa6ebcb4cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mor=C3=A1vek?= Date: Sun, 7 Nov 2021 21:41:43 +0100 Subject: [PATCH] Update phpstan --- composer.json | 13 ++++++------- phpstan.neon.dist | 9 ++++++--- phpstan.tests.neon.dist | 2 +- tests/PhoneNumberDoctrine/PhoneNumberTypeTest.phpt | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 7b160bc..4f21428 100644 --- a/composer.json +++ b/composer.json @@ -22,14 +22,13 @@ "require-dev": { "nette/tester": "2.4.1", "mockery/mockery": "1.4.4", - "phpstan/phpstan": "0.12.99", - "phpstan/phpstan-strict-rules": "0.12.11", - "pepakriz/phpstan-exception-rules": "0.11.7", - "nepada/phpstan-nette-tester": "0.3.2", - "spaze/phpstan-disallowed-calls": "1.11.0", - "phpstan/phpstan-mockery": "0.12.14", + "phpstan/phpstan": "1.1.1", + "phpstan/phpstan-strict-rules": "1.0.0", + "nepada/phpstan-nette-tester": "0.4.0", + "spaze/phpstan-disallowed-calls": "2.0.0", + "phpstan/phpstan-mockery": "1.0.0", "php-parallel-lint/php-parallel-lint": "1.3.1", - "nepada/coding-standard": "7.4.0", + "nepada/coding-standard": "7.4.1", "giggsey/libphonenumber-for-php": ">=8.12.34" }, "autoload": { diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8422b57..640ec68 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -1,6 +1,5 @@ includes: - vendor/phpstan/phpstan-strict-rules/rules.neon - - vendor/pepakriz/phpstan-exception-rules/extension.neon - vendor/spaze/phpstan-disallowed-calls/extension.neon - vendor/spaze/phpstan-disallowed-calls/disallowed-dangerous-calls.neon - tests/PHPStan/disallowedCalls.neon @@ -10,8 +9,12 @@ parameters: paths: - src - exceptionRules: - uncheckedExceptions: + exceptions: + implicitThrows: false + check: + missingCheckedExceptionInThrows: true + tooWideThrowType: true + uncheckedExceptionClasses: - LogicException - Doctrine\DBAL\Types\ConversionException - Nette\InvalidStateException diff --git a/phpstan.tests.neon.dist b/phpstan.tests.neon.dist index 19b2fa7..62b2f55 100644 --- a/phpstan.tests.neon.dist +++ b/phpstan.tests.neon.dist @@ -15,7 +15,7 @@ parameters: - php - phpt - excludes_analyse: + excludePaths: - tests/temp/* ignoreErrors: diff --git a/tests/PhoneNumberDoctrine/PhoneNumberTypeTest.phpt b/tests/PhoneNumberDoctrine/PhoneNumberTypeTest.phpt index 5698bcc..d77482a 100644 --- a/tests/PhoneNumberDoctrine/PhoneNumberTypeTest.phpt +++ b/tests/PhoneNumberDoctrine/PhoneNumberTypeTest.phpt @@ -73,7 +73,7 @@ class PhoneNumberTypeTest extends TestCase /** * @dataProvider getDataForConvertToDatabaseValue - * @param mixed $value + * @param PhoneNumber|string|null $value * @param string|null $expected */ public function testConvertToDatabaseValueSucceeds($value, ?string $expected): void @@ -115,7 +115,7 @@ class PhoneNumberTypeTest extends TestCase /** * @dataProvider getDataForConvertToPHPValue - * @param mixed $value + * @param PhoneNumber|string|null $value * @param PhoneNumber|null $expected */ public function testConvertToPHPValueSucceeds($value, ?PhoneNumber $expected): void