Fix multiline deprecation messges

phpstan · Apr 24, 2019 · a4b5f35 · a4b5f35
1 parent ea69061
commit a4b5f35
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/PhpDoc/PhpDocNodeResolver.php b/src/PhpDoc/PhpDocNodeResolver.php
@@ -14,6 +14,7 @@
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprNullNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocChildNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ThrowsTagValueNode;
 use PHPStan\Reflection\PassedByReference;
@@ -218,15 +219,22 @@ private function resolveThrowsTags(PhpDocNode $phpDocNode, NameScope $nameScope)
 
 	private function resolveDeprecatedTag(PhpDocNode $phpDocNode, NameScope $nameScope): ?\PHPStan\PhpDoc\Tag\DeprecatedTag
 	{
-		foreach ($phpDocNode->getDeprecatedTagValues() as $key => $deprecatedTagValue) {
+		foreach ($phpDocNode->getDeprecatedTagValues() as $deprecatedTagValue) {
 			$totalChildren = count($phpDocNode->children);
+			// Find the original key in the child array so we can join together
+			// multiple line deprecation messages.
+			$deprecatedTagKey = key(array_filter($phpDocNode->children, static function (PhpDocChildNode $child) use ($deprecatedTagValue): bool {
+				return $child instanceof PhpDocTagNode && $child->value === $deprecatedTagValue;
+			}));
+
+			$deprecatedMessage = $deprecatedTagValue->description;
+
 			/** @var \PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTextNode[] $textNodes */
 			$textNodes = array_filter($phpDocNode->children, static function (PhpDocChildNode $child): bool {
 				return $child instanceof PhpDocTextNode;
 			});
-			$deprecatedMessage = $deprecatedTagValue->description;
 			if (count($textNodes) > 0) {
-				for ($i = $key; $i < $totalChildren; $i++) {
+				for ($i = $deprecatedTagKey; $i < $totalChildren; $i++) {
 					// Skip invalid children.
 					if (!isset($textNodes[$i])) {
 						continue;