PhpDocParser: do not fail on invalid phpDoc tag value

Author: JanTvrdik

src/Ast/PhpDoc/InvalidTagValueNode.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\PhpDocParser\Ast\PhpDoc;
+
+
+use PHPStan\PhpDocParser\Parser\ParserException;
+
+
+class InvalidTagValueNode implements PhpDocTagValueNode
+{
+	/** @var string (may be empty) */
+	public $value;
+
+	/** @var ParserException */
+	public $exception;
+
+
+	public function __construct(string $value, ParserException $exception)
+	{
+		$this->value = $value;
+		$this->exception = $exception;
+	}
+
+
+	public function __toString(): string
+	{
+		return $this->value;
+	}
+}

src/Parser/PhpDocParser.php

@@ -61,28 +61,46 @@ public function parseTag(TokenIterator $tokens): Ast\PhpDoc\PhpDocTagNode
 
 	private function parseTagValue(TokenIterator $tokens, string $tag): Ast\PhpDoc\PhpDocTagValueNode
 	{
-		switch ($tag) {
-			case '@param':
-				return $this->parseParamTagValue($tokens);
-
-			case '@var':
-				return $this->parseVarTagValue($tokens);
-
-			case '@return':
-			case '@returns':
-				return $this->parseReturnTagValue($tokens);
-
-			case '@property':
-			case '@property-read':
-			case '@property-write':
-				return $this->parsePropertyTagValue($tokens);
+		try {
+			$tokens->pushSavePoint();
+
+			switch ($tag) {
+				case '@param':
+					$tagValue = $this->parseParamTagValue($tokens);
+					break;
+
+				case '@var':
+					$tagValue = $this->parseVarTagValue($tokens);
+					break;
+
+				case '@return':
+				case '@returns':
+					$tagValue = $this->parseReturnTagValue($tokens);
+					break;
+
+				case '@property':
+				case '@property-read':
+				case '@property-write':
+					$tagValue = $this->parsePropertyTagValue($tokens);
+					break;
+
+				case '@method':
+					$tagValue = $this->parseMethodTagValue($tokens);
+					break;
+
+				default:
+					$tagValue = new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescription($tokens));
+					break;
+			}
 
-			case '@method':
-				return $this->parseMethodTagValue($tokens);
+			$tokens->dropSavePoint();
 
-			default:
-				return new Ast\PhpDoc\GenericTagValueNode($this->parseOptionalDescription($tokens));
+		} catch (ParserException $e) {
+			$tokens->rollback();
+			$tagValue = new Ast\PhpDoc\InvalidTagValueNode($this->parseOptionalDescription($tokens), $e);
 		}
+
+		return $tagValue;
 	}