ignore also bool phpdoc

Author: staabm

src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -176,7 +176,13 @@ public function checkFunctionReturnType(
 		if (count($returnStatements) === 0) {
 			return [];
 		}
-		if (count($returnStatements) === 1 && $nativeFunctionReturnType->isBoolean()->yes()) {
+		if (
+			count($returnStatements) === 1
+			&& (
+				$nativeFunctionReturnType->isBoolean()->yes()
+				|| $phpDocFunctionReturnType->isBoolean()->yes()
+			)
+		) {
 			return [];
 		}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1099,23 +1099,15 @@ public function testBug8376(): void
 	public function testAssertDocblock(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/nsrt/assert-docblock.php');
-		$this->assertCount(8, $errors);
-		$this->assertSame('Function AssertDocblock\validateStringArrayIfTrue() never returns false so the return type can be changed to true.', $errors[0]->getMessage());
-		$this->assertSame(17, $errors[0]->getLine());
-		$this->assertSame('Function AssertDocblock\validateStringArrayIfFalse() never returns true so the return type can be changed to false.', $errors[1]->getMessage());
-		$this->assertSame(25, $errors[1]->getLine());
-		$this->assertSame('Function AssertDocblock\validateStringOrIntArray() never returns true so the return type can be changed to false.', $errors[2]->getMessage());
-		$this->assertSame(34, $errors[2]->getLine());
-		$this->assertSame('Function AssertDocblock\validateStringOrNonEmptyIntArray() never returns true so the return type can be changed to false.', $errors[3]->getMessage());
-		$this->assertSame(44, $errors[3]->getLine());
-		$this->assertSame('Call to method AssertDocblock\A::testInt() with string will always evaluate to false.', $errors[4]->getMessage());
-		$this->assertSame(218, $errors[4]->getLine());
-		$this->assertSame('Call to method AssertDocblock\A::testNotInt() with string will always evaluate to true.', $errors[5]->getMessage());
-		$this->assertSame(224, $errors[5]->getLine());
-		$this->assertSame('Call to method AssertDocblock\A::testInt() with int will always evaluate to true.', $errors[6]->getMessage());
-		$this->assertSame(232, $errors[6]->getLine());
-		$this->assertSame('Call to method AssertDocblock\A::testNotInt() with int will always evaluate to false.', $errors[7]->getMessage());
-		$this->assertSame(238, $errors[7]->getLine());
+		$this->assertCount(4, $errors);
+		$this->assertSame('Call to method AssertDocblock\A::testInt() with string will always evaluate to false.', $errors[0]->getMessage());
+		$this->assertSame(218, $errors[0]->getLine());
+		$this->assertSame('Call to method AssertDocblock\A::testNotInt() with string will always evaluate to true.', $errors[1]->getMessage());
+		$this->assertSame(224, $errors[1]->getLine());
+		$this->assertSame('Call to method AssertDocblock\A::testInt() with int will always evaluate to true.', $errors[2]->getMessage());
+		$this->assertSame(232, $errors[2]->getLine());
+		$this->assertSame('Call to method AssertDocblock\A::testNotInt() with int will always evaluate to false.', $errors[3]->getMessage());
+		$this->assertSame(238, $errors[3]->getLine());
 	}
 
 	#[RequiresPhp('>= 8.0')]

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php

@@ -77,12 +77,7 @@ public function testBug13384cPhp82(): void
 	{
 		$this->reportTooWideBool = true;
 		$this->reportNestedTooWideType = true;
-		$this->analyse([__DIR__ . '/data/bug-13384c.php'], [
-			[
-				'Function Bug13384c\doFooPhpdoc2() never returns true so the return type can be changed to false.',
-				100,
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/bug-13384c.php'], []);
 	}
 
 	#[RequiresPhp('< 8.2')]

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

@@ -230,16 +230,7 @@ public function testBug13384c(): 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.',
-				55,
-			],
-			[
-				'Method Bug13384c\Bug13384Static::doBarPhpdoc() never returns false so the return type can be changed to true.',
-				84,
-			],
-		]);
+		$this->analyse([__DIR__ . '/data/bug-13384c.php'], []);
 	}
 
 	#[RequiresPhp('< 8.2')]