From b97e8eef9f392e70c1c9c73b1deaab740e355ee9 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 1 Nov 2021 12:33:22 +0100 Subject: [PATCH 1/3] support phpstan 1.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a49026b..0d95e9e 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^0.10 | ^0.11 | ^0.12", + "phpstan/phpstan": "^0.10 | ^0.11 | ^0.12 | ^1.0", "thecodingmachine/safe": "^1.0" }, "require-dev": { From a630c7bf9f3060b6e3dc74a4d9ef5edc0feec052 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Mon, 1 Nov 2021 12:49:31 +0100 Subject: [PATCH 2/3] fix tests --- composer.json | 2 +- tests/Rules/CallMethodRuleTest.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 0d95e9e..5fba811 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^0.10 | ^0.11 | ^0.12 | ^1.0", + "phpstan/phpstan": "^1.0", "thecodingmachine/safe": "^1.0" }, "require-dev": { diff --git a/tests/Rules/CallMethodRuleTest.php b/tests/Rules/CallMethodRuleTest.php index f6c3413..1836b31 100644 --- a/tests/Rules/CallMethodRuleTest.php +++ b/tests/Rules/CallMethodRuleTest.php @@ -2,8 +2,11 @@ namespace TheCodingMachine\Safe\PHPStan\Rules; +use PHPStan\Php\PhpVersion; use PHPStan\Rules\FunctionCallParametersCheck; use PHPStan\Rules\Methods\CallMethodsRule; +use PHPStan\Rules\NullsafeCheck; +use PHPStan\Rules\PhpDoc\UnresolvableTypeHelper; use PHPStan\Rules\Rule; use PHPStan\Rules\RuleLevelHelper; use PHPStan\Testing\RuleTestCase; @@ -14,10 +17,10 @@ class CallMethodRuleTest extends RuleTestCase protected function getRule(): Rule { $broker = $this->createBroker(); - $ruleLevelHelper = new RuleLevelHelper($broker, true, true, true); + $ruleLevelHelper = new RuleLevelHelper($broker, true, true, true, false); return new CallMethodsRule( $broker, - new FunctionCallParametersCheck($ruleLevelHelper, true, true, true, true), + new FunctionCallParametersCheck($ruleLevelHelper, new NullsafeCheck(), new PhpVersion(PHP_VERSION_ID), new UnresolvableTypeHelper(), true, false, false, false), $ruleLevelHelper, true, true From 1ef7f7fbc9e9c7b27fce9e2f4a0a2e48bf15fd0f Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Wed, 17 Nov 2021 12:19:35 +0100 Subject: [PATCH 3/3] adjusted branch-alias per feedback --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5fba811..f08db62 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" }, "phpstan": { "includes": [