Separate feature toggle for reportNestedTooWideType, turned off temporarily

Author: ondrejmirtes

conf/bleedingEdge.neon

@@ -12,3 +12,4 @@ parameters:
 checkExtensionsForComparisonOperators: true
 reportTooWideBool: true
 rawMessageInBaseline: true
+reportNestedTooWideType: false

conf/config.neon

@@ -36,6 +36,7 @@ parameters:
 checkExtensionsForComparisonOperators: false
 reportTooWideBool: false
 rawMessageInBaseline: false
+reportNestedTooWideType: false
 fileExtensions:
 - php
 checkAdvancedIsset: false

conf/parametersSchema.neon

@@ -39,6 +39,7 @@ parametersSchema:
 checkExtensionsForComparisonOperators: bool()
 reportTooWideBool: bool()
 rawMessageInBaseline: bool()
+reportNestedTooWideType: bool()
 ])
 fileExtensions: listOf(string())
 checkAdvancedIsset: bool()

src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -36,6 +36,8 @@ public function __construct(
 private PropertyReflectionFinder $propertyReflectionFinder,
 #[AutowiredParameter(ref: '%featureToggles.reportTooWideBool%')]
 private bool $reportTooWideBool,
+#[AutowiredParameter(ref: '%featureToggles.reportNestedTooWideType%')]
+private bool $reportNestedTooWideType,
 )
 {
 }
@@ -105,7 +107,7 @@ public function checkProperty(
 );
 }
 
-if (!$this->reportTooWideBool) {
+if (!$this->reportNestedTooWideType) {
 return [];
 }
 
@@ -227,7 +229,7 @@ public function checkFunctionReturnType(
 );
 }
 
-if (!$this->reportTooWideBool) {
+if (!$this->reportNestedTooWideType) {
 return [];
 }
 
@@ -290,7 +292,7 @@ public function checkParameterOutType(
 $parameterOutType = TypeUtils::resolveLateResolvableTypes($parameterOutType);
 $narrowedType = $this->narrowType($parameterOutType, $actualVariableType, $scope, false, false);
 if ($narrowedType->equals($parameterOutType)) {
-if (!$this->reportTooWideBool) {
+if (!$this->reportNestedTooWideType) {
 return [];
 }
 

tests/PHPStan/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRuleTest.php

@@ -15,7 +15,7 @@ class TooWideArrowFunctionReturnTypehintRuleTest extends RuleTestCase
 protected function getRule(): Rule
 {
 return new TooWideArrowFunctionReturnTypehintRule(
-new TooWideTypeCheck(new PropertyReflectionFinder(), true),
+new TooWideTypeCheck(new PropertyReflectionFinder(), true, true),
 );
 }
 

tests/PHPStan/Rules/TooWideTypehints/TooWideClosureReturnTypehintRuleTest.php

@@ -15,7 +15,7 @@ class TooWideClosureReturnTypehintRuleTest extends RuleTestCase
 protected function getRule(): Rule
 {
 return new TooWideClosureReturnTypehintRule(
-new TooWideTypeCheck(new PropertyReflectionFinder(), true),
+new TooWideTypeCheck(new PropertyReflectionFinder(), true, true),
 );
 }
 

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionParameterOutTypeRuleTest.php

@@ -15,7 +15,7 @@ class TooWideFunctionParameterOutTypeRuleTest extends RuleTestCase
 protected function getRule(): TRule
 {
 return new TooWideFunctionParameterOutTypeRule(new TooWideParameterOutTypeCheck(
-new TooWideTypeCheck(new PropertyReflectionFinder(), true),
+new TooWideTypeCheck(new PropertyReflectionFinder(), true, true),
 ));
 }
 

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php

@@ -15,9 +15,11 @@ class TooWideFunctionReturnTypehintRuleTest extends RuleTestCase
 
 private bool $reportTooWideBool = false;
 
+private bool $reportNestedTooWideType = false;
+
 protected function getRule(): Rule
 {
-return new TooWideFunctionReturnTypehintRule(new TooWideTypeCheck(new PropertyReflectionFinder(), $this->reportTooWideBool));
+return new TooWideFunctionReturnTypehintRule(new TooWideTypeCheck(new PropertyReflectionFinder(), $this->reportTooWideBool, $this->reportNestedTooWideType));
 }
 
 public function testRule(): void
@@ -74,6 +76,7 @@ public function testBug10312a(): void
 public function testBug13384cPhp82(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/bug-13384c.php'], [
 [
 'Function Bug13384c\doFoo() never returns true so the return type can be changed to false.',
@@ -98,6 +101,7 @@ public function testBug13384cPhp82(): void
 public function testBug13384cPrePhp82(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/bug-13384c.php'], [
 [
 'Function Bug13384c\doFooPhpdoc() never returns false so the return type can be changed to true.',
@@ -118,6 +122,7 @@ public function testBug13384cOff(): void
 public function testNestedTooWideType(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/nested-too-wide-function-return-type.php'], [
 [
 'Return type array<array{int, bool}> of function NestedTooWideFunctionReturnType\dataProvider() can be narrowed to array<array{int, false}>.',

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodParameterOutTypeRuleTest.php

@@ -18,7 +18,7 @@ protected function getRule(): TRule
 {
 return new TooWideMethodParameterOutTypeRule(
 new TooWideParameterOutTypeCheck(
-new TooWideTypeCheck(new PropertyReflectionFinder(), true),
+new TooWideTypeCheck(new PropertyReflectionFinder(), true, true),
 ),
 $this->checkProtectedAndPublicMethods,
 );

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

@@ -18,9 +18,11 @@ class TooWideMethodReturnTypehintRuleTest extends RuleTestCase
 
 private bool $reportTooWideBool = false;
 
+private bool $reportNestedTooWideType = false;
+
 protected function getRule(): Rule
 {
-return new TooWideMethodReturnTypehintRule($this->checkProtectedAndPublicMethods, new TooWideTypeCheck(new PropertyReflectionFinder(), $this->reportTooWideBool));
+return new TooWideMethodReturnTypehintRule($this->checkProtectedAndPublicMethods, new TooWideTypeCheck(new PropertyReflectionFinder(), $this->reportTooWideBool, $this->reportNestedTooWideType));
 }
 
 public function testPrivate(): void
@@ -227,6 +229,7 @@ public function testBug10312d(): void
 public function testBug13384c(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/bug-13384c.php'], [
 [
 'Method Bug13384c\Bug13384c::doBar() never returns true so the return type can be changed to false.',
@@ -259,6 +262,7 @@ public function testBug13384c(): void
 public function testBug13384cPrePhp82(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/bug-13384c.php'], [
 [
 'Method Bug13384c\Bug13384c::doBarPhpdoc() never returns false so the return type can be changed to true.',
@@ -279,6 +283,7 @@ public function testBug13384cOff(): void
 public function testNestedTooWideType(): void
 {
 $this->reportTooWideBool = true;
+$this->reportNestedTooWideType = true;
 $this->analyse([__DIR__ . '/data/nested-too-wide-method-return-type.php'], [
 [
 'Return type array<array{int, bool}> of method NestedTooWideMethodReturnType\Foo::dataProvider() can be narrowed to array<array{int, false}>.',