From 4fef3e6c86a2f3b44023deadc62ca09fc8a4dfd7 Mon Sep 17 00:00:00 2001 From: Mark Badolato Date: Fri, 12 Nov 2021 11:58:07 -0800 Subject: [PATCH 1/3] [CAT-1864] Update to include PhpStan 1.0 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index cbed8da..cf3393a 100644 --- a/composer.json +++ b/composer.json @@ -12,9 +12,9 @@ } }, "require": { - "php": "^7.3", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12" + "php": "^7.3 || ^8.0", + "phpstan/phpstan": "^0.12 | ^1.0", + "phpstan/phpstan-strict-rules": "^0.12 | ^1.0" }, "require-dev": { "phpunit/phpunit": "^8.5" From 71445c914cce23376705fe3908c5177e4ba264f6 Mon Sep 17 00:00:00 2001 From: Mark Badolato Date: Fri, 12 Nov 2021 12:02:27 -0800 Subject: [PATCH 2/3] Test tweaks --- tests/Rules/ConstantBooleanIdenticalRuleTest.php | 3 ++- tests/Rules/ConstantBooleanNotIdenticalRuleTest.php | 3 ++- tests/Rules/InstanceOfVsNotNullRuleTest.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/Rules/ConstantBooleanIdenticalRuleTest.php b/tests/Rules/ConstantBooleanIdenticalRuleTest.php index 5ae30c8..60831b9 100644 --- a/tests/Rules/ConstantBooleanIdenticalRuleTest.php +++ b/tests/Rules/ConstantBooleanIdenticalRuleTest.php @@ -36,9 +36,10 @@ public function testRule(): void protected function getRule(): Rule { $ruleLevelHelper = new RuleLevelHelper( - $this->createBroker(), + $this->createReflectionProvider(), true, false, + true, true ); diff --git a/tests/Rules/ConstantBooleanNotIdenticalRuleTest.php b/tests/Rules/ConstantBooleanNotIdenticalRuleTest.php index b8a1fe4..f976920 100644 --- a/tests/Rules/ConstantBooleanNotIdenticalRuleTest.php +++ b/tests/Rules/ConstantBooleanNotIdenticalRuleTest.php @@ -36,9 +36,10 @@ public function testRule(): void protected function getRule(): Rule { $ruleLevelHelper = new RuleLevelHelper( - $this->createBroker(), + $this->createReflectionProvider(), true, false, + true, true ); diff --git a/tests/Rules/InstanceOfVsNotNullRuleTest.php b/tests/Rules/InstanceOfVsNotNullRuleTest.php index 265acae..13302d0 100644 --- a/tests/Rules/InstanceOfVsNotNullRuleTest.php +++ b/tests/Rules/InstanceOfVsNotNullRuleTest.php @@ -23,9 +23,10 @@ protected function getRule(): Rule { return new InstanceOfVsNotNullRule( new RuleLevelHelper( - $this->createBroker(), + $this->createReflectionProvider(), true, false, + true, true ) ); From b77c5a71c9dee83a13430a48b113abb1ecdd6212 Mon Sep 17 00:00:00 2001 From: Mark Badolato Date: Wed, 17 Nov 2021 17:28:44 -0700 Subject: [PATCH 3/3] Tweaks --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cf3393a..81225c2 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,8 @@ }, "require": { "php": "^7.3 || ^8.0", - "phpstan/phpstan": "^0.12 | ^1.0", - "phpstan/phpstan-strict-rules": "^0.12 | ^1.0" + "phpstan/phpstan": "^0.12 || ^1.0", + "phpstan/phpstan-strict-rules": "^0.12 || ^1.0" }, "require-dev": { "phpunit/phpunit": "^8.5"