ThrowableReturnTypeExtension needs to honor @method tag

phpstan · Jan 7, 2022 · e04cc8d · e04cc8d
1 parent 27bc69b
commit e04cc8d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/Type/Php/ThrowableReturnTypeExtension.php b/src/Type/Php/ThrowableReturnTypeExtension.php
@@ -39,6 +39,17 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		$pdoException = new ObjectType('PDOException');
 		foreach (TypeUtils::getDirectClassNames($type) as $class) {
 			$classType = new ObjectType($class);
+			if ($classType->getClassReflection() !== null) {
+				$classReflection = $classType->getClassReflection();
+				foreach ($classReflection->getMethodTags() as $methodName => $methodTag) {
+					if (strtolower($methodName) !== 'getcode') {
+						continue;
+					}
+
+					$types[] = $methodTag->getReturnType();
+					continue 2;
+				}
+			}
 			if ($pdoException->isSuperTypeOf($classType)->yes()) {
 				$types[] = new StringType();
 				continue;

diff --git a/tests/PHPStan/Analyser/data/bug-6001.php b/tests/PHPStan/Analyser/data/bug-6001.php
@@ -15,6 +15,7 @@ public function doFoo(\Throwable $t): void
 		assertType('string', (new \PDOException())->getCode());
 		assertType('int', (new MyException())->getCode());
 		assertType('string', (new SubPDOException())->getCode());
+		assertType('1|2|3', (new ExceptionWithMethodTag())->getCode());
 	}
 
 	/**
@@ -37,3 +38,11 @@ class SubPDOException extends \PDOException
 {
 
 }
+
+/**
+ * @method 1|2|3 getCode()
+ */
+class ExceptionWithMethodTag extends \Exception
+{
+
+}