Native return type void can be combined with PHPDoc type never

ondrejmirtes · ondrejmirtes · commit 1857c6cc907f · 2020-11-04T17:32:12.000+01:00
diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
@@ -103,6 +103,10 @@ public static function decideType(
 	{
 		if ($phpDocType !== null && !$phpDocType instanceof ErrorType) {
 			if ($type instanceof VoidType) {
+				if ($phpDocType instanceof NeverType && $phpDocType->isExplicit()) {
+					return $phpDocType;
+				}
+
 				return new VoidType();
 			}
 			if (
diff --git a/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php b/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php
@@ -232,10 +232,6 @@ public function testBug4003(): void
 				'Parameter #1 $test (string) of method Bug4003\Ipsum::doFoo() should be compatible with parameter $test (int) of method Bug4003\Lorem::doFoo()',
 				38,
 			],
-			[
-				'Return type (void) of method Bug4003\Amet::bar() should be compatible with return type (*NEVER*) of method Bug4003\Dolor::bar()',
-				54,
-			],
 		]);
 	}
 
@@ -280,4 +276,11 @@ public function testBug4023(): void
 		$this->analyse([__DIR__ . '/data/bug-4023.php'], []);
 	}
 
+	public function testBug4006(): void
+	{
+		$this->reportMaybes = true;
+		$this->reportStatic = true;
+		$this->analyse([__DIR__ . '/data/bug-4006.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-4006.php b/tests/PHPStan/Rules/Methods/data/bug-4006.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug4006;
+
+interface Foo
+{
+
+	/**
+	 * @return never
+	 */
+	public function bar();
+
+}
+
+class Bar implements Foo
+{
+
+	public function bar(): void
+	{
+		throw new \Exception();
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,10 @@ public static function decideType(`
`103`	`103`	`{`
`104`	`104`	`if ($phpDocType !== null && !$phpDocType instanceof ErrorType) {`
`105`	`105`	`if ($type instanceof VoidType) {`
	`106`	`+ if ($phpDocType instanceof NeverType && $phpDocType->isExplicit()) {`
	`107`	`+ return $phpDocType;`
	`108`	`+ }`
	`109`	`+`
`106`	`110`	`return new VoidType();`
`107`	`111`	`}`
`108`	`112`	`if (`