Do not require to have @return null in descendant classes because it's dumb

ondrejmirtes · ondrejmirtes · commit 8157916765b4 · 2019-11-21T07:29:56.000+01:00
diff --git a/src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideMethodReturnTypehintRule.php
@@ -9,6 +9,7 @@
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
+use PHPStan\Type\NullType;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
@@ -38,8 +39,8 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$method instanceof MethodReflection) {
 			throw new \PHPStan\ShouldNotHappenException();
 		}
+		$isFirstDeclaration = $method->getPrototype()->getDeclaringClass() === $method->getDeclaringClass();
 		if (!$method->isPrivate()) {
-			$isFirstDeclaration = $method->getPrototype()->getDeclaringClass() === $method->getDeclaringClass();
 			if (!$isFirstDeclaration) {
 				if (PHP_VERSION_ID < 70400 || !$this->checkPossibleCovariantMethodReturnType) {
 					return [];
@@ -78,6 +79,15 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$returnType = TypeCombinator::union(...$returnTypes);
+		if (
+			PHP_VERSION_ID >= 70400
+			&& $this->checkPossibleCovariantMethodReturnType
+			&& !$method->isPrivate()
+			&& $returnType instanceof NullType
+			&& !$isFirstDeclaration
+		) {
+			return [];
+		}
 
 		$messages = [];
 		foreach ($methodReturnType->getTypes() as $type) {
