Fixed false-negative with checkExplicitMixedMissingReturn: true

ondrejmirtes · ondrejmirtes · commit 08b4eabc8484 · 2020-04-03T14:05:30.000+02:00
diff --git a/src/Rules/Missing/MissingReturnRule.php b/src/Rules/Missing/MissingReturnRule.php
@@ -66,7 +66,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$isVoidSuperType = $returnType->isSuperTypeOf(new VoidType());
-		if ($isVoidSuperType->yes()) {
+		if ($isVoidSuperType->yes() && !$returnType instanceof MixedType) {
 			return [];
 		}
 
diff --git a/tests/PHPStan/Rules/Missing/MissingReturnRuleTest.php b/tests/PHPStan/Rules/Missing/MissingReturnRuleTest.php
@@ -116,4 +116,15 @@ public function testBug2875(): void
 		$this->analyse([__DIR__ . '/data/bug-2875.php'], []);
 	}
 
+	public function testMissingMixedReturnInEmptyBody(): void
+	{
+		$this->checkExplicitMixedMissingReturn = true;
+		$this->analyse([__DIR__ . '/data/missing-mixed-return-empty-body.php'], [
+			[
+				'Method MissingMixedReturnEmptyBody\HelloWorld::doFoo() should return mixed but return statement is missing.',
+				11,
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Missing/data/missing-mixed-return-empty-body.php b/tests/PHPStan/Rules/Missing/data/missing-mixed-return-empty-body.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MissingMixedReturnEmptyBody;
+
+class HelloWorld
+{
+
+	/**
+	 * @return mixed
+	 */
+	public function doFoo()
+	{
+
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public function processNode(Node $node, Scope $scope): array`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$isVoidSuperType = $returnType->isSuperTypeOf(new VoidType());`
`69`		`- if ($isVoidSuperType->yes()) {`
	`69`	`+ if ($isVoidSuperType->yes() && !$returnType instanceof MixedType) {`
`70`	`70`	`return [];`
`71`	`71`	`}`
`72`	`72`