From 9fb900d38cffcc2f152077b4508bf66b768bc4ef Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Sun, 26 Jan 2025 11:59:31 +0100 Subject: [PATCH] v6 fixes --- src/Hooks/TestCaseHandler.php | 15 +-------------- tests/acceptance/Assert75.feature | 2 +- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/Hooks/TestCaseHandler.php b/src/Hooks/TestCaseHandler.php index 7ac8229..f4470ee 100644 --- a/src/Hooks/TestCaseHandler.php +++ b/src/Hooks/TestCaseHandler.php @@ -106,8 +106,6 @@ public static function afterClassLikeVisit(AfterClassLikeVisitEvent $event) /** * {@inheritDoc} - * - * @psalm-suppress DeprecatedClass TList will be removed soon */ public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event) { @@ -389,7 +387,7 @@ static function ( } }; - /** @var Type\Atomic\TArray|Type\Atomic\TKeyedArray|Type\Atomic\TList $dataset_type */ + /** @var Type\Atomic\TArray|Type\Atomic\TKeyedArray $dataset_type */ $dataset_type = self::getAtomics($provider_return_type->type_params[1])['array']; if ($dataset_type instanceof Type\Atomic\TArray) { @@ -401,14 +399,6 @@ static function ( } $checkParam($potential_argument_type, $param->type, $param->is_optional, $param_offset); } - } elseif ($dataset_type instanceof Type\Atomic\TList) { - $potential_argument_type = $dataset_type->type_param; - foreach ($method_storage->params as $param_offset => $param) { - if (!$param->type) { - continue; - } - $checkParam($potential_argument_type, $param->type, $param->is_optional, $param_offset); - } } else { // TKeyedArray // iterate over all params checking if corresponding value type is acceptable // let's hope properties are sorted in array order @@ -492,9 +482,6 @@ private static function unionizeIterables(Codebase $codebase, Type\Union $iterab $value_types[] = $type->getGenericValueType(); } elseif ($type instanceof Type\Atomic\TNamedObject || $type instanceof Type\Atomic\TIterable) { [$key_types[], $value_types[]] = $codebase->getKeyValueParamsForTraversableObject($type); - } elseif ($type instanceof Type\Atomic\TList) { - $key_types[] = Type::getInt(); - $value_types[] = $type->type_param; } else { throw new RuntimeException('unexpected type'); } diff --git a/tests/acceptance/Assert75.feature b/tests/acceptance/Assert75.feature index 03d209e..e5daeb6 100644 --- a/tests/acceptance/Assert75.feature +++ b/tests/acceptance/Assert75.feature @@ -7,7 +7,7 @@ Feature: Assert (PHPUnit 7.5+) Given I have the following config """ - +