Fix bug of repeating last line in AST for textBetweenTagsBelongsToDes…

…cription=true
phpstan · Sep 7, 2024 · 0e689c5 · 0e689c5
1 parent 9d053a8
commit 0e689c5
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -237,7 +237,7 @@ private function parseText(TokenIterator $tokens): Ast\PhpDoc\PhpDocTextNode
 			$text .= $tmpText;
 
 			// stop if we're not at EOL - meaning it's the end of PHPDoc
-			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) {
 				break;
 			}
 
@@ -293,7 +293,7 @@ private function parseOptionalDescriptionAfterDoctrineTag(TokenIterator $tokens)
 			$text .= $tmpText;
 
 			// stop if we're not at EOL - meaning it's the end of PHPDoc
-			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL)) {
+			if (!$tokens->isCurrentTokenType(Lexer::TOKEN_PHPDOC_EOL, Lexer::TOKEN_CLOSE_PHPDOC)) {
 				if (!$tokens->isPrecededByHorizontalWhitespace()) {
 					return trim($text . $this->parseText($tokens)->text, " \t");
 				}

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -7547,6 +7547,41 @@ public function dataTextBetweenTagsBelongsToDescription(): iterable
 				new PhpDocTagNode('@package', new GenericTagValueNode('foo')),
 			]),
 		];
+
+		yield [
+			'/** @deprecated in Drupal 8.6.0 and will be removed before Drupal 9.0.0. In
+			*   Drupal 9 there will be no way to set the status and in Drupal 8 this
+			*   ability has been removed because mb_*() functions are supplied using
+			*   Symfony\'s polyfill. */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@deprecated',
+					new DeprecatedTagValueNode('in Drupal 8.6.0 and will be removed before Drupal 9.0.0. In
+  Drupal 9 there will be no way to set the status and in Drupal 8 this
+  ability has been removed because mb_*() functions are supplied using
+  Symfony\'s polyfill.')
+				),
+			]),
+		];
+
+		yield [
+			'/** @\ORM\Column() in Drupal 8.6.0 and will be removed before Drupal 9.0.0. In
+			*   Drupal 9 there will be no way to set the status and in Drupal 8 this
+			*   ability has been removed because mb_*() functions are supplied using
+			*   Symfony\'s polyfill. */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@\ORM\Column',
+					new DoctrineTagValueNode(
+						new DoctrineAnnotation('@\ORM\Column', []),
+						'in Drupal 8.6.0 and will be removed before Drupal 9.0.0. In
+  Drupal 9 there will be no way to set the status and in Drupal 8 this
+  ability has been removed because mb_*() functions are supplied using
+  Symfony\'s polyfill.'
+					)
+				),
+			]),
+		];
 	}
 
 	/**