Unified deciding type based on reflection and phpDoc

phpstan · Nov 12, 2016 · f649596 · f649596
1 parent e32a958
commit f649596
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 78 deletions.
diff --git a/src/Reflection/Php/PhpMethodReflection.php b/src/Reflection/Php/PhpMethodReflection.php
@@ -7,9 +7,7 @@
 use PHPStan\Parser\Parser;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\IntegerType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypehintHelper;
@@ -179,33 +177,11 @@ public function isPublic(): bool
 	public function getReturnType(): Type
 	{
 		if ($this->returnType === null) {
-			$phpTypeReflection = $this->reflection->getReturnType();
-			if ($phpTypeReflection === null) {
-				if ($this->phpDocReturnType !== null) {
-					$this->returnType = $this->phpDocReturnType;
-				} else {
-					$this->returnType = new MixedType(true);
-				}
-			} else {
-				$returnType = TypehintHelper::getTypeObjectFromTypehint(
-					(string) $phpTypeReflection,
-					$phpTypeReflection->allowsNull(),
-					$this->declaringClass->getName()
-				);
-				if ($this->phpDocReturnType !== null) {
-					if ($returnType instanceof ArrayType && $this->phpDocReturnType instanceof ArrayType) {
-						$returnType = new ArrayType(
-							$this->phpDocReturnType->getItemType(),
-							$returnType->isNullable() || $this->phpDocReturnType->isNullable()
-						);
-					}
-					if ($returnType->accepts($this->phpDocReturnType)) {
-						return $this->phpDocReturnType;
-					}
-				}
-
-				$this->returnType = $returnType;
-			}
+			$this->returnType = TypehintHelper::decideType(
+				$this->reflection->getReturnType(),
+				$this->phpDocReturnType,
+				$this->declaringClass->getName()
+			);
 		}
 
 		return $this->returnType;

diff --git a/src/Reflection/Php/PhpParameterReflection.php b/src/Reflection/Php/PhpParameterReflection.php
@@ -3,8 +3,6 @@
 namespace PHPStan\Reflection\Php;
 
 use PHPStan\Reflection\ParameterReflection;
-use PHPStan\Type\ArrayType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypehintHelper;
 
@@ -39,51 +37,15 @@ public function getName(): string
 	public function getType(): Type
 	{
 		if ($this->type === null) {
-			$phpTypeReflection = $this->reflection->getType();
-			if ($phpTypeReflection === null) {
-				if ($this->phpDocType !== null) {
-					$type = $this->phpDocType;
-					if ($this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
-						$type = $type->makeNullable();
-					}
-
-					$this->type = $type;
-				} else {
-					$this->type = new MixedType(true);
-				}
-			} else {
-				$typehintType = TypehintHelper::getTypeObjectFromTypehint(
-					(string) $phpTypeReflection,
-					$phpTypeReflection->allowsNull(),
-					$this->reflection->getDeclaringClass() !== null ? $this->reflection->getDeclaringClass()->getName() : null
-				);
-				if ($this->phpDocType !== null) {
-					$phpDocType = $this->phpDocType;
-					if ($this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
-						$phpDocType = $phpDocType->makeNullable();
-					}
-
-					if (
-						$typehintType->getClass() !== null
-						&& $phpDocType->getClass() !== $typehintType->getClass()
-						&& $this->phpDocType->getClass() !== null
-					) {
-						$phpDocTypeClassReflection = new \ReflectionClass($phpDocType->getClass());
-						if ($phpDocTypeClassReflection->isSubclassOf($typehintType->getClass())) {
-							return $this->type = $phpDocType;
-						} else {
-							return new MixedType($typehintType->isNullable() || $phpDocType->isNullable());
-						}
-					} elseif (
-						$typehintType instanceof ArrayType
-						&& $phpDocType instanceof ArrayType
-					) {
-						return $this->type = $phpDocType;
-					}
-				}
-
-				return $this->type = $typehintType;
+			$phpDocType = $this->phpDocType;
+			if ($phpDocType !== null && $this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
+				$phpDocType = $phpDocType->makeNullable();
 			}
+			$this->type = TypehintHelper::decideType(
+				$this->reflection->getType(),
+				$phpDocType,
+				$this->reflection->getDeclaringClass() !== null ? $this->reflection->getDeclaringClass()->getName() : null
+			);
 		}
 
 		return $this->type;

diff --git a/src/Type/FileTypeMapper.php b/src/Type/FileTypeMapper.php
@@ -31,7 +31,7 @@ public function __construct(
 
 	public function getTypeMap(string $fileName): array
 	{
-		$cacheKey = sprintf('%s-%d-v4', $fileName, filemtime($fileName));
+		$cacheKey = sprintf('%s-%d-v5', $fileName, filemtime($fileName));
 		$cachedResult = $this->cache->load($cacheKey);
 		if ($cachedResult === null) {
 			$typeMap = $this->createTypeMap($fileName);

diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
@@ -58,4 +58,34 @@ public static function getTypeObjectFromTypehint(
 		}
 	}
 
+	public static function decideType(
+		\ReflectionType $reflectionType = null,
+		Type $phpDocType = null,
+		string $selfClass = null
+	): Type
+	{
+		if ($reflectionType === null) {
+			return $phpDocType !== null ? $phpDocType : new MixedType(true);
+		}
+
+		$type = self::getTypeObjectFromTypehint(
+			(string) $reflectionType,
+			$reflectionType->allowsNull(),
+			$selfClass
+		);
+		if ($phpDocType !== null) {
+			if ($type instanceof ArrayType && $phpDocType instanceof ArrayType) {
+				$type = new ArrayType(
+					$phpDocType->getItemType(),
+					$type->isNullable() || $phpDocType->isNullable()
+				);
+			}
+			if ($type->accepts($phpDocType)) {
+				return $phpDocType;
+			}
+		}
+
+		return $type;
+	}
+
 }
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1369,9 +1369,9 @@ public function dataTypeFromMethodPhpDocs(): array
 				'$barObject->doBar()',
 			],
 			[
-				MixedType::class,
+				ObjectType::class,
 				false,
-				null,
+				'MethodPhpDocsNamespace\Bar',
 				'$conflictedObject',
 			],
 			[