Merge remote-tracking branch 'origin/1.23.x' into 2.0.x

Author: ondrejmirtes

.github/workflows/apiref.yml

@@ -36,7 +36,7 @@ jobs:
         run: "composer install --no-interaction --no-progress"
 
       - name: "Run ApiGen"
-        run: "apigen/vendor/bin/apigen -c apigen/apigen.neon --output docs -- src"
+        run: "apigen/vendor/bin/apigen -c apigen/apigen.neon --output docs/${{ github.ref_name }} -- src"
 
       - name: "Copy favicon"
         run: "cp apigen/favicon.png docs/favicon.png"

README.md

@@ -13,9 +13,9 @@ For the complete list of supported PHPDoc features check out PHPStan documentati
 
 * [PHPDoc Basics](https://phpstan.org/writing-php-code/phpdocs-basics) (list of PHPDoc tags)
 * [PHPDoc Types](https://phpstan.org/writing-php-code/phpdoc-types) (list of PHPDoc types)
-* [phpdoc-parser API Reference](https://phpstan.github.io/phpdoc-parser/namespace-PHPStan.PhpDocParser.html) with all the AST node types etc.
+* [phpdoc-parser API Reference](https://phpstan.github.io/phpdoc-parser/2.0.x/namespace-PHPStan.PhpDocParser.html) with all the AST node types etc.
 
-This parser also supports parsing [Doctrine Annotations](https://github.com/doctrine/annotations). The AST nodes live in the [PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine namespace](https://phpstan.github.io/phpdoc-parser/namespace-PHPStan.PhpDocParser.Ast.PhpDoc.Doctrine.html). The support needs to be turned on by setting `bool $parseDoctrineAnnotations` to `true` in `Lexer` and `PhpDocParser` class constructors.
+This parser also supports parsing [Doctrine Annotations](https://github.com/doctrine/annotations). The AST nodes live in the [PHPStan\PhpDocParser\Ast\PhpDoc\Doctrine namespace](https://phpstan.github.io/phpdoc-parser/2.0.x/namespace-PHPStan.PhpDocParser.Ast.PhpDoc.Doctrine.html). The support needs to be turned on by setting `bool $parseDoctrineAnnotations` to `true` in `Lexer` and `PhpDocParser` class constructors.
 
 ## Installation
 

src/Parser/PhpDocParser.php

@@ -207,7 +207,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;
 			}
 
@@ -263,7 +263,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");
 				}

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -7297,6 +7297,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.'
+					)
+				),
+			]),
+		];
 	}
 
 	/**