Different @throws inheritDoc merging

ondrejmirtes · ondrejmirtes · commit 6b89297d148b · 2020-05-10T08:23:10.000+02:00
diff --git a/src/PhpDoc/ResolvedPhpDocBlock.php b/src/PhpDoc/ResolvedPhpDocBlock.php
@@ -13,7 +13,6 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\Generic\TemplateTypeMap;
-use PHPStan\Type\TypeCombinator;
 
 class ResolvedPhpDocBlock
 {
@@ -540,32 +539,19 @@ private static function mergeOneParentReturnTag(?ReturnTag $returnTag, self $par
 	 */
 	private static function mergeThrowsTags(?ThrowsTag $throwsTag, array $parents): ?ThrowsTag
 	{
+		if ($throwsTag !== null) {
+			return $throwsTag;
+		}
 		foreach ($parents as $parent) {
-			$result = self::mergeOneParentThrowsTag($throwsTag, $parent);
+			$result = $parent->getThrowsTag();
 			if ($result === null) {
 				continue;
 			}
 
-			$throwsTag = $result;
-		}
-
-		return $throwsTag;
-	}
-
-	private static function mergeOneParentThrowsTag(?ThrowsTag $throwsTag, self $parent): ?ThrowsTag
-	{
-		$parentThrowsTag = $parent->getThrowsTag();
-		if ($parentThrowsTag === null) {
-			return $throwsTag;
-		}
-
-		if ($throwsTag === null) {
-			return $parentThrowsTag;
+			return $result;
 		}
 
-		return new ThrowsTag(
-			TypeCombinator::union($throwsTag->getType(), $parentThrowsTag->getType())
-		);
+		return null;
 	}
 
 	/**
diff --git a/tests/PHPStan/Rules/PhpDoc/InvalidThrowsPhpDocValueRuleTest.php b/tests/PHPStan/Rules/PhpDoc/InvalidThrowsPhpDocValueRuleTest.php
@@ -59,15 +59,15 @@ public function testMergeInheritedPhpDocs(): void
 				19,
 			],
 			[
-				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A|InvalidThrowsPhpDocMergeInherited\B|InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
+				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
 				28,
 			],
 			[
-				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A|InvalidThrowsPhpDocMergeInherited\B|InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
+				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
 				34,
 			],
 			[
-				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A|InvalidThrowsPhpDocMergeInherited\B|InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
+				'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',
 				39,
 			],
 		]);

Original file line number	Diff line number	Diff line change
`@@ -59,15 +59,15 @@ public function testMergeInheritedPhpDocs(): void`
`59`	`59`	`19,`
`60`	`60`	`],`
`61`	`61`	`[`
`62`		`- 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A\|InvalidThrowsPhpDocMergeInherited\B\|InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
	`62`	`+ 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
`63`	`63`	`28,`
`64`	`64`	`],`
`65`	`65`	`[`
`66`		`- 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A\|InvalidThrowsPhpDocMergeInherited\B\|InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
	`66`	`+ 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
`67`	`67`	`34,`
`68`	`68`	`],`
`69`	`69`	`[`
`70`		`- 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\A\|InvalidThrowsPhpDocMergeInherited\B\|InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
	`70`	`+ 'PHPDoc tag @throws with type InvalidThrowsPhpDocMergeInherited\C\|InvalidThrowsPhpDocMergeInherited\D is not subtype of Throwable',`
`71`	`71`	`39,`
`72`	`72`	`],`
`73`	`73`	`]);`