Fix undetected generator function with static reflection

ondrejmirtes · ondrejmirtes · commit 3ae5e8338ce2 · 2020-06-07T11:55:22.000+02:00
diff --git a/conf/config.level3.neon b/conf/config.level3.neon
@@ -10,7 +10,6 @@ rules:
 	- PHPStan\Rules\Arrays\UnpackIterableInArrayRule
 	- PHPStan\Rules\Functions\ArrowFunctionReturnTypeRule
 	- PHPStan\Rules\Functions\ClosureReturnTypeRule
-	- PHPStan\Rules\Functions\ReturnTypeRule
 	- PHPStan\Rules\Generators\YieldTypeRule
 	- PHPStan\Rules\Methods\ReturnTypeRule
 	- PHPStan\Rules\Properties\DefaultValueTypesAssignedToPropertiesRule
@@ -50,6 +49,13 @@ services:
 		tags:
 			- phpstan.rules.rule
 
+	-
+		class: PHPStan\Rules\Functions\ReturnTypeRule
+		arguments:
+			functionReflector: @betterReflectionFunctionReflector
+		tags:
+			- phpstan.rules.rule
+
 	-
 		class: PHPStan\Rules\Generators\YieldFromTypeRule
 		arguments:
diff --git a/src/Rules/Functions/ReturnTypeRule.php b/src/Rules/Functions/ReturnTypeRule.php
@@ -9,6 +9,8 @@
 use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\FunctionReturnTypeCheck;
+use Roave\BetterReflection\Reflector\Exception\IdentifierNotFound;
+use Roave\BetterReflection\Reflector\FunctionReflector;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\Return_>
@@ -18,9 +20,15 @@ class ReturnTypeRule implements \PHPStan\Rules\Rule
 
 	private \PHPStan\Rules\FunctionReturnTypeCheck $returnTypeCheck;
 
-	public function __construct(FunctionReturnTypeCheck $returnTypeCheck)
+	private FunctionReflector $functionReflector;
+
+	public function __construct(
+		FunctionReturnTypeCheck $returnTypeCheck,
+		FunctionReflector $functionReflector
+	)
 	{
 		$this->returnTypeCheck = $returnTypeCheck;
+		$this->functionReflector = $functionReflector;
 	}
 
 	public function getNodeType(): string
@@ -49,6 +57,12 @@ public function processNode(Node $node, Scope $scope): array
 		$reflection = null;
 		if (function_exists($function->getName())) {
 			$reflection = new \ReflectionFunction($function->getName());
+		} else {
+			try {
+				$reflection = $this->functionReflector->reflect($function->getName());
+			} catch (IdentifierNotFound $e) {
+				// pass
+			}
 		}
 
 		return $this->returnTypeCheck->checkReturnType(
diff --git a/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php
@@ -13,7 +13,8 @@ class ReturnTypeRuleTest extends \PHPStan\Testing\RuleTestCase
 
 	protected function getRule(): \PHPStan\Rules\Rule
 	{
-		return new ReturnTypeRule(new FunctionReturnTypeCheck(new RuleLevelHelper($this->createReflectionProvider(), true, false, true, false)));
+		[, $functionReflector] = self::getReflectors();
+		return new ReturnTypeRule(new FunctionReturnTypeCheck(new RuleLevelHelper($this->createReflectionProvider(), true, false, true, false)), $functionReflector);
 	}
 
 	public function testReturnTypeRule(): void

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ class ReturnTypeRuleTest extends \PHPStan\Testing\RuleTestCase`
`13`	`13`
`14`	`14`	`protected function getRule(): \PHPStan\Rules\Rule`
`15`	`15`	`{`
`16`		`- return new ReturnTypeRule(new FunctionReturnTypeCheck(new RuleLevelHelper($this->createReflectionProvider(), true, false, true, false)));`
	`16`	`+ [, $functionReflector] = self::getReflectors();`
	`17`	`+ return new ReturnTypeRule(new FunctionReturnTypeCheck(new RuleLevelHelper($this->createReflectionProvider(), true, false, true, false)), $functionReflector);`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`public function testReturnTypeRule(): void`