Properties and methods has types

Author: ondrejmirtes

composer.json

@@ -6,7 +6,7 @@
 	"prefer-stable": true,
 	"require": {
 		"php": "~7.0",
-		"phpstan/phpstan": "dev-dev#1cb3904e17",
+		"phpstan/phpstan": "dev-dev#3ba62cbb49",
 		"nette/utils": "~2.3.0"
 	},
 	"autoload": {

src/Reflection/NetteObject/NetteObjectClassReflectionExtension.php

@@ -4,11 +4,12 @@
 
 use Nette\Object;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ClassReflectionExtension;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Reflection\MethodsClassReflectionExtension;
+use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
 
-class NetteObjectClassReflectionExtension implements ClassReflectionExtension
+class NetteObjectClassReflectionExtension implements MethodsClassReflectionExtension, PropertiesClassReflectionExtension
 {
 
 	public function hasProperty(ClassReflection $classReflection, string $propertyName): bool
@@ -23,14 +24,33 @@ public function hasProperty(ClassReflection $classReflection, string $propertyNa
 
 		// todo setter taky?
 
+		$getterMethod = $this->getMethodByProperty($classReflection, $propertyName);
+		if ($getterMethod === null) {
+			return false;
+		}
+
+		return $getterMethod->isPublic();
+	}
+
+	/**
+	 * @param \PHPStan\Reflection\ClassReflection $classReflection
+	 * @param string $propertyName
+	 * @return \PHPStan\Reflection\MethodReflection|null
+	 */
+	private function getMethodByProperty(ClassReflection $classReflection, string $propertyName)
+	{
 		$getterMethodName = sprintf('get%s', ucfirst($propertyName));
+		if (!$classReflection->hasMethod($getterMethodName)) {
+			return null;
+		}
 
-		return $classReflection->hasMethod($getterMethodName) && $classReflection->getMethod($getterMethodName)->isPublic();
+		return $classReflection->getMethod($getterMethodName);
 	}
 
 	public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
 	{
-		return new NetteObjectPropertyReflection($classReflection);
+		$getterMethod = $this->getMethodByProperty($classReflection, $propertyName);
+		return new NetteObjectPropertyReflection($classReflection, $getterMethod->getReturnType());
 	}
 
 	public function hasMethod(ClassReflection $classReflection, string $methodName): bool
@@ -48,6 +68,6 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
 
 	public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
 	{
-		return new NetteObjectEventListenerMethodReflection($classReflection);
+		return new NetteObjectEventListenerMethodReflection($methodName, $classReflection);
 	}
 }

src/Reflection/NetteObject/NetteObjectEventListenerMethodReflection.php

@@ -4,18 +4,29 @@
 
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
+use PHPStan\Type\NullType;
+use PHPStan\Type\Type;
 
 class NetteObjectEventListenerMethodReflection implements MethodReflection
 {
 
+	/** @var string */
+	private $name;
+
 	/** @var \PHPStan\Reflection\ClassReflection */
 	private $declaringClass;
 
-	public function __construct(ClassReflection $declaringClass)
+	public function __construct(string $name, ClassReflection $declaringClass)
 	{
+		$this->name = $name;
 		$this->declaringClass = $declaringClass;
 	}
 
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
 	public function getDeclaringClass(): ClassReflection
 	{
 		return $this->declaringClass;
@@ -48,4 +59,10 @@ public function isPublic(): bool
 	{
 		return true;
 	}
-}
+
+	public function getReturnType(): Type
+	{
+		return new NullType();
+	}
+
+}

src/Reflection/NetteObject/NetteObjectPropertyReflection.php

@@ -4,16 +4,21 @@
 
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\PropertyReflection;
+use PHPStan\Type\Type;
 
 class NetteObjectPropertyReflection implements PropertyReflection
 {
 
 	/** @var \PHPStan\Reflection\ClassReflection */
 	private $declaringClass;
 
-	public function __construct(ClassReflection $declaringClass)
+	/** @var \PHPStan\Type\Type */
+	private $type;
+
+	public function __construct(ClassReflection $declaringClass, Type $type)
 	{
 		$this->declaringClass = $declaringClass;
+		$this->type = $type;
 	}
 
 	public function getDeclaringClass(): ClassReflection
@@ -36,4 +41,9 @@ public function isPublic(): bool
 		return true;
 	}
 
+	public function getType(): Type
+	{
+		return $this->type;
+	}
+
 }