Updated for PHPStan 0.9

Author: ondrejmirtes

composer.json

@@ -6,12 +6,12 @@
 	"prefer-stable": true,
 	"extra": {
 		"branch-alias": {
-			"dev-master": "0.8-dev"
+			"dev-master": "0.9-dev"
 		}
 	},
 	"require": {
 		"php": "~7.0",
-		"phpstan/phpstan": "^0.8",
+		"phpstan/phpstan": "^0.9",
 		"nette/component-model": "^2.3.0 || ^3.0.0",
 		"nette/di": "^2.3.0 || ^3.0.0",
 		"nette/forms": "^2.3.0 || ^3.0.0",

src/Type/Nette/ComponentModelDynamicReturnTypeExtension.php

@@ -4,23 +4,14 @@
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\BrokerAwareClassReflectionExtension;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 
-class ComponentModelDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, BrokerAwareClassReflectionExtension
+class ComponentModelDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
-	/** @var \PHPStan\Broker\Broker */
-	private $broker;
-
-	public function setBroker(\PHPStan\Broker\Broker $broker)
-	{
-		$this->broker = $broker;
-	}
-
 	public static function getClass(): string
 	{
 		return \Nette\ComponentModel\Container::class;
@@ -41,10 +32,6 @@ public function getTypeFromMethodCall(
 	{
 		$calledOnType = $scope->getType($methodCall->var);
 		$mixedType = new MixedType();
-		if ($calledOnType->getClass() === null || !$this->broker->hasClass($calledOnType->getClass())) {
-			return $mixedType;
-		}
-
 		$args = $methodCall->args;
 		if (count($args) !== 1) {
 			return $mixedType;
@@ -57,13 +44,12 @@ public function getTypeFromMethodCall(
 
 		$componentName = $arg->value;
 
-		$class = $this->broker->getClass($calledOnType->getClass());
 		$methodName = sprintf('createComponent%s', ucfirst($componentName));
-		if (!$class->hasMethod($methodName)) {
+		if (!$calledOnType->hasMethod($methodName)) {
 			return $mixedType;
 		}
 
-		return $class->getMethod($methodName)->getReturnType();
+		return $calledOnType->getMethod($methodName, $scope)->getReturnType();
 	}
 
 }

src/Type/Nette/FormsBaseControlDynamicReturnTypeExtension.php

@@ -28,7 +28,12 @@ public function getTypeFromMethodCall(
 		Scope $scope
 	): Type
 	{
-		if ($methodReflection->getReturnType()->getClass() !== null && $methodReflection->getReturnType()->getClass() === \Nette\Forms\Controls\BaseControl::class) {
+		$returnType = $methodReflection->getReturnType();
+		$referencedClasses = $returnType->getReferencedClasses();
+		if (
+			count($referencedClasses) === 1
+			&& $referencedClasses[0] === \Nette\Forms\Controls\BaseControl::class
+		) {
 			return $scope->getType($methodCall->var);
 		}
 

tests/Type/Nette/FormContainerValuesDynamicReturnTypeExtensionTest.php

@@ -8,12 +8,12 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\ArrayType;
-use PHPStan\Type\CommonUnionType;
 use PHPStan\Type\FalseBooleanType;
 use PHPStan\Type\IterableIterableType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\TrueBooleanType;
+use PHPStan\Type\UnionType;
 
 final class FormContainerValuesDynamicReturnTypeExtensionTest extends \PHPUnit\Framework\TestCase
 {
@@ -31,7 +31,7 @@ public function testParameterAsArray()
 		$methodReflection = $this->createMock(MethodReflection::class);
 		$methodReflection
 			->method('getReturnType')
-			->willReturn(new CommonUnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
+			->willReturn(new UnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
 
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new TrueBooleanType());
@@ -57,7 +57,7 @@ public function testParameterAsArrayHash()
 		$methodReflection = $this->createMock(MethodReflection::class);
 		$methodReflection
 			->method('getReturnType')
-			->willReturn(new CommonUnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
+			->willReturn(new UnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
 
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new FalseBooleanType());
@@ -76,15 +76,15 @@ public function testParameterAsArrayHash()
 		$resultType = $this->extension->getTypeFromMethodCall($methodReflection, $methodCall, $scope);
 
 		$this->assertInstanceOf(ObjectType::class, $resultType);
-		$this->assertSame(\Nette\Utils\ArrayHash::class, $resultType->getClass());
+		$this->assertSame(\Nette\Utils\ArrayHash::class, $resultType->describe());
 	}
 
 	public function testDefaultParameterIsArrayHash()
 	{
 		$methodReflection = $this->createMock(MethodReflection::class);
 		$methodReflection
 			->method('getReturnType')
-			->willReturn(new CommonUnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
+			->willReturn(new UnionType([new ArrayType(new MixedType()), new IterableIterableType(new ObjectType(\Nette\Utils\ArrayHash::class))]));
 
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new FalseBooleanType());
@@ -96,7 +96,7 @@ public function testDefaultParameterIsArrayHash()
 		$resultType = $this->extension->getTypeFromMethodCall($methodReflection, $methodCall, $scope);
 
 		$this->assertInstanceOf(ObjectType::class, $resultType);
-		$this->assertSame(\Nette\Utils\ArrayHash::class, $resultType->getClass());
+		$this->assertSame(\Nette\Utils\ArrayHash::class, $resultType->describe());
 	}
 
 }