test methods

Author: staabm

src/Rules/TooWideTypehints/TooWideTypeCheck.php

@@ -69,7 +69,7 @@ public function checkFunction(
 	): array
 	{
 		$functionReturnType = TypeUtils::resolveLateResolvableTypes($functionReturnType);
-		if (!$functionReturnType instanceof UnionType) {
+		if (!$functionReturnType instanceof UnionType && !$functionReturnType->isBoolean()->yes()) {
 			return [];
 		}
 		$statementResult = $node->getStatementResult();
@@ -82,22 +82,22 @@ public function checkFunction(
 			return [];
 		}
 
-		$returnTypes = [];
+		$functionReturnTypes = [];
 		foreach ($returnStatements as $returnStatement) {
 			$returnNode = $returnStatement->getReturnNode();
 			if ($returnNode->expr === null) {
-				$returnTypes[] = new VoidType();
+				$functionReturnTypes[] = new VoidType();
 				continue;
 			}
 
-			$returnTypes[] = $returnStatement->getScope()->getType($returnNode->expr);
+			$functionReturnTypes[] = $returnStatement->getScope()->getType($returnNode->expr);
 		}
 
 		if (!$statementResult->isAlwaysTerminating()) {
-			$returnTypes[] = new VoidType();
+			$functionReturnTypes[] = new VoidType();
 		}
 
-		$returnType = TypeCombinator::union(...$returnTypes);
+		$returnType = TypeCombinator::union(...$functionReturnTypes);
 
 		if (
 			$returnType->isConstantScalarValue()->yes()
@@ -115,7 +115,8 @@ public function checkFunction(
 		}
 
 		$messages = [];
-		foreach ($functionReturnType->getTypes() as $type) {
+		$functionReturnTypes = $functionReturnType instanceof UnionType ? $functionReturnType->getTypes() : $functionReturnType->getFiniteTypes();
+		foreach ($functionReturnTypes as $type) {
 			if (!$type->isSuperTypeOf($returnType)->no()) {
 				continue;
 			}

tests/PHPStan/Rules/TooWideTypehints/TooWideFunctionReturnTypehintRuleTest.php

@@ -66,4 +66,18 @@ public function testBug10312a(): void
 		$this->analyse([__DIR__ . '/data/bug-10312a.php'], []);
 	}
 
+	public function testBug13384c(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13384c.php'], [
+			[
+				'Function Bug13384c\doFoo() never returns true so it can be removed from the return type.',
+				5,
+			],
+			[
+				'Function Bug13384c\doFoo2() never returns false so it can be removed from the return type.',
+				9,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/TooWideTypehints/TooWideMethodReturnTypehintRuleTest.php

@@ -218,4 +218,26 @@ public function testBug10312d(): void
 		$this->analyse([__DIR__ . '/data/bug-10312d.php'], []);
 	}
 
+	public function testBug13384c(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13384c.php'], [
+			[
+				'Method Bug13384c\Bug13384c::doBar() never returns true so it can be removed from the return type.',
+				33,
+			],
+			[
+				'Method Bug13384c\Bug13384c::doBar2() never returns false so it can be removed from the return type.',
+				37,
+			],
+			[
+				'Method Bug13384c\Bug13384Static::doBar() never returns true so it can be removed from the return type.',
+				50,
+			],
+			[
+				'Method Bug13384c\Bug13384Static::doBar2() never returns false so it can be removed from the return type.',
+				54,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/TooWideTypehints/data/bug-13384c.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Bug13384c;
+
+function doFoo(): bool {
+	return false;
+}
+
+function doFoo2(): bool {
+	return true;
+}
+
+function doFoo3(): bool {
+	if (rand(0, 1)) {
+		return true;
+	}
+	return false;
+}
+
+
+class Bug13384c {
+	public function doBarPublic(): bool {
+		return false;
+	}
+
+	/**
+	 * @return false
+	 */
+	private function doBarPhpdocReturn(): bool {
+		return false;
+	}
+
+	private function doBar(): bool {
+		return false;
+	}
+
+	private function doBar2(): bool {
+		return true;
+	}
+
+	private function doBar3(): bool {
+		if (rand(0, 1)) {
+			return true;
+		}
+		return false;
+	}
+}
+
+class Bug13384Static {
+	private static function doBar(): bool {
+		return false;
+	}
+
+	private static function doBar2(): bool {
+		return true;
+	}
+
+	private static function doBar3(): bool {
+		if (rand(0, 1)) {
+			return true;
+		}
+		return false;
+	}
+}