From 0b108f9e97b58cfa0b3da6bc6adf0ad939ee04e8 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 15 Mar 2024 10:42:29 +0100 Subject: [PATCH] Fixup --- composer.json | 4 ++-- src/Hooks/TestCaseHandler.php | 1 + tests/acceptance/Prophecy.feature | 3 +-- tests/acceptance/TestCase.feature | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 5f8208b..3506ee6 100755 --- a/composer.json +++ b/composer.json @@ -10,11 +10,11 @@ } ], "require": { - "php": "^7.1 || ^8.0", + "php": "^7.4 || ^8.0", "ext-simplexml": "*", "composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/package-versions-deprecated": "^1.10", - "vimeo/psalm": "dev-master || dev-4.x || ^4.7.1 || ^5@beta || ^5.0" + "vimeo/psalm": "dev-master || ^5@beta || ^5.0" }, "conflict": { "phpunit/phpunit": "<7.5" diff --git a/src/Hooks/TestCaseHandler.php b/src/Hooks/TestCaseHandler.php index e0c877b..af7e047 100644 --- a/src/Hooks/TestCaseHandler.php +++ b/src/Hooks/TestCaseHandler.php @@ -387,6 +387,7 @@ static function ( } }; + /** @psalm-suppress DeprecatedClass Will be removed soon */ /** @var Type\Atomic\TArray|Type\Atomic\TKeyedArray|Type\Atomic\TList $dataset_type */ $dataset_type = self::getAtomics($provider_return_type->type_params[1])['array']; diff --git a/tests/acceptance/Prophecy.feature b/tests/acceptance/Prophecy.feature index 386ecfe..872416a 100644 --- a/tests/acceptance/Prophecy.feature +++ b/tests/acceptance/Prophecy.feature @@ -74,7 +74,7 @@ Feature: Prophecy When I run Psalm Then I see no errors - Scenario: Argument::that() only accepts callable with boolean return type [Psalm 4] + Scenario: Argument::that() only accepts callable with boolean return type Given I have the following code """ class MyTestCase extends TestCase @@ -87,7 +87,6 @@ Feature: Prophecy } } """ - And I have Psalm older than "5.0" (because of "changed issue type") When I run Psalm Then I see these errors | Type | Message | diff --git a/tests/acceptance/TestCase.feature b/tests/acceptance/TestCase.feature index 438bdf7..8e0ea86 100644 --- a/tests/acceptance/TestCase.feature +++ b/tests/acceptance/TestCase.feature @@ -612,7 +612,7 @@ Feature: TestCase When I run Psalm Then I see no errors - Scenario: Provider omitting offsets is fine when test method has defaults for those params (specified as constants) [Psalm 4] + Scenario: Provider omitting offsets is fine when test method has defaults for those params (specified as constants) Given I have the following code """ class MyTestCase extends TestCase @@ -632,7 +632,6 @@ Feature: TestCase } } """ - And I have Psalm older than "5.0" (because of "sealed shapes") When I run Psalm Then I see no errors