From 5dbdbc3c95a90b04a05f2314a9b994b32599eb33 Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sat, 1 Nov 2025 22:39:36 +0100 Subject: [PATCH 1/2] Introduce ignoreMissingDataProviderReturnType --- extension.neon | 8 ++++---- rules.neon | 2 +- tests/Type/PHPUnit/data/data-provider-iterable-value.neon | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extension.neon b/extension.neon index 23ae52cf..1739a606 100644 --- a/extension.neon +++ b/extension.neon @@ -1,7 +1,7 @@ parameters: phpunit: convertUnionToIntersectionType: true - checkDataProviderData: %featureToggles.bleedingEdge% + ignoreMissingDataProviderReturnType: true additionalConstructors: - PHPUnit\Framework\TestCase::setUp earlyTerminatingMethodCalls: @@ -24,8 +24,8 @@ parameters: parametersSchema: phpunit: structure([ - convertUnionToIntersectionType: bool() - checkDataProviderData: bool(), + convertUnionToIntersectionType: bool(), + ignoreMissingDataProviderReturnType: bool(), ]) services: @@ -76,4 +76,4 @@ conditionalTags: PHPStan\PhpDoc\PHPUnit\MockObjectTypeNodeResolverExtension: phpstan.phpDoc.typeNodeResolverExtension: %phpunit.convertUnionToIntersectionType% PHPStan\Type\PHPUnit\DataProviderReturnTypeIgnoreExtension: - phpstan.ignoreErrorExtension: %phpunit.checkDataProviderData% + phpstan.ignoreErrorExtension: [%featureToggles.bleedingEdge%, %phpunit.ignoreMissingDataProviderReturnType%] diff --git a/rules.neon b/rules.neon index 8272f47a..63e10b47 100644 --- a/rules.neon +++ b/rules.neon @@ -14,7 +14,7 @@ conditionalTags: phpstan.rules.rule: [%strictRulesInstalled%, %featureToggles.bleedingEdge%] PHPStan\Rules\PHPUnit\DataProviderDataRule: - phpstan.rules.rule: %phpunit.checkDataProviderData% + phpstan.rules.rule: %featureToggles.bleedingEdge% services: - diff --git a/tests/Type/PHPUnit/data/data-provider-iterable-value.neon b/tests/Type/PHPUnit/data/data-provider-iterable-value.neon index eed12a5b..e5597bc2 100644 --- a/tests/Type/PHPUnit/data/data-provider-iterable-value.neon +++ b/tests/Type/PHPUnit/data/data-provider-iterable-value.neon @@ -1,6 +1,6 @@ parameters: - phpunit: - checkDataProviderData: true + featureToggles: + bleedingEdge: true includes: - ../../../../extension.neon From e8768714a19627f79cf85a5cebb220afeb8062ce Mon Sep 17 00:00:00 2001 From: Vincent Langlet Date: Sat, 1 Nov 2025 23:35:23 +0100 Subject: [PATCH 2/2] reportMissingDataProviderReturnType --- extension.neon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extension.neon b/extension.neon index 1739a606..4b2d9c54 100644 --- a/extension.neon +++ b/extension.neon @@ -1,7 +1,7 @@ parameters: phpunit: convertUnionToIntersectionType: true - ignoreMissingDataProviderReturnType: true + reportMissingDataProviderReturnType: false additionalConstructors: - PHPUnit\Framework\TestCase::setUp earlyTerminatingMethodCalls: @@ -25,7 +25,7 @@ parameters: parametersSchema: phpunit: structure([ convertUnionToIntersectionType: bool(), - ignoreMissingDataProviderReturnType: bool(), + reportMissingDataProviderReturnType: bool(), ]) services: @@ -76,4 +76,4 @@ conditionalTags: PHPStan\PhpDoc\PHPUnit\MockObjectTypeNodeResolverExtension: phpstan.phpDoc.typeNodeResolverExtension: %phpunit.convertUnionToIntersectionType% PHPStan\Type\PHPUnit\DataProviderReturnTypeIgnoreExtension: - phpstan.ignoreErrorExtension: [%featureToggles.bleedingEdge%, %phpunit.ignoreMissingDataProviderReturnType%] + phpstan.ignoreErrorExtension: [%featureToggles.bleedingEdge%, not(%phpunit.reportMissingDataProviderReturnType%)]