Fixed missing return rule for native mixed type

phpstan · Aug 27, 2021 · 03d8312 · 03d8312
1 parent fc7bcff
commit 03d8312
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 0 deletions.
diff --git a/src/Rules/Missing/MissingReturnRule.php b/src/Rules/Missing/MissingReturnRule.php
@@ -114,6 +114,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (
 			$returnType instanceof MixedType
 			&& !$returnType instanceof TemplateMixedType
+			&& !$node->hasNativeReturnTypehint()
 			&& (
 				!$returnType->isExplicitMixed()
 				|| !$this->checkExplicitMixedMissingReturn

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -482,6 +482,10 @@ public function dataFileAsserts(): iterable
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/filter-var-returns-non-empty-string.php');
 
+		if (PHP_VERSION_ID >= 80000 || self::$useStaticReflectionProvider) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/model-mixin.php');
+		}
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5529.php');
 	}
 

diff --git a/tests/PHPStan/Analyser/data/model-mixin.php b/tests/PHPStan/Analyser/data/model-mixin.php
@@ -0,0 +1,30 @@
+<?php // lint >= 8.0
+
+namespace ModelMixin;
+
+use function PHPStan\Testing\assertType;
+
+/** @mixin Builder<static> */
+class Model
+{
+	/** @param array<int, mixed> $args */
+	public static function __callStatic(string $method, array $args): mixed
+	{
+		(new self)->$method(...$args);
+	}
+}
+
+/** @template TModel as Model */
+class Builder
+{
+	/** @return array<int, TModel> */
+	public function all() { return []; }
+}
+
+class User extends Model
+{
+}
+
+function (): void {
+	assertType('array<int, ModelMixin\User>', User::all());
+};
diff --git a/tests/PHPStan/Rules/Missing/MissingReturnRuleTest.php b/tests/PHPStan/Rules/Missing/MissingReturnRuleTest.php
@@ -250,4 +250,36 @@ public function testCheckPhpDocMissingReturn(bool $checkPhpDocMissingReturn, arr
 		$this->analyse([__DIR__ . '/data/check-phpdoc-missing-return.php'], $errors);
 	}
 
+	public function dataModelMixin(): array
+	{
+		return [
+			[
+				true,
+			],
+			[
+				false,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataModelMixin
+	 * @param bool $checkExplicitMixedMissingReturn
+	 */
+	public function testModelMixin(bool $checkExplicitMixedMissingReturn): void
+	{
+		if (PHP_VERSION_ID < 80000 && !self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->checkExplicitMixedMissingReturn = $checkExplicitMixedMissingReturn;
+		$this->checkPhpDocMissingReturn = true;
+		$this->analyse([__DIR__ . '/../../Analyser/data/model-mixin.php'], [
+			[
+				'Method ModelMixin\Model::__callStatic() should return mixed but return statement is missing.',
+				13,
+			],
+		]);
+	}
+
 }