Use separate extra key/value types instead of a generic type

Author: tscni

src/Ast/Type/ArrayShapeNode.php

@@ -2,11 +2,8 @@
 
 namespace PHPStan\PhpDocParser\Ast\Type;
 
-use InvalidArgumentException;
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use function implode;
-use function strlen;
-use function substr;
 
 class ArrayShapeNode implements TypeNode
 {
@@ -25,8 +22,11 @@ class ArrayShapeNode implements TypeNode
 	/** @var self::KIND_* */
 	public $kind;
 
-	/** @var GenericTypeNode|null */
-	public $extraItemType;
+	/** @var TypeNode|null */
+	public $extraKeyType;
+
+	/** @var TypeNode|null */
+	public $extraValueType;
 
 	/**
 	 * @param ArrayShapeItemNode[] $items
@@ -36,16 +36,15 @@ public function __construct(
 		array $items,
 		bool $sealed = true,
 		string $kind = self::KIND_ARRAY,
-		?GenericTypeNode $extraItemType = null
+		?TypeNode $extraKeyType = null,
+		?TypeNode $extraValueType = null
 	)
 	{
 		$this->items = $items;
 		$this->sealed = $sealed;
 		$this->kind = $kind;
-		$this->extraItemType = $extraItemType;
-		if ($sealed && $extraItemType !== null) {
-			throw new InvalidArgumentException('An extra item type may only be set for an unsealed array shape');
-		}
+		$this->extraKeyType = $extraKeyType;
+		$this->extraValueType = $extraValueType;
 	}
 
 
@@ -55,8 +54,13 @@ public function __toString(): string
 
 		if (! $this->sealed) {
 			$item = '...';
-			if ($this->extraItemType !== null) {
-				$item .= substr((string) $this->extraItemType, strlen((string) $this->extraItemType->type));
+			if ($this->extraValueType !== null) {
+				$extraTypes = [];
+				if ($this->extraKeyType !== null) {
+					$extraTypes[] = (string) $this->extraKeyType;
+				}
+				$extraTypes[] = (string) $this->extraValueType;
+				$item .= '<' . implode(', ', $extraTypes) . '>';
 			}
 			$items[] = $item;
 		}

src/Parser/TypeParser.php

@@ -848,7 +848,8 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 
 		$items = [];
 		$sealed = true;
-		$extraItemType = null;
+		$extraKeyType = null;
+		$extraValueType = null;
 
 		do {
 			$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
@@ -859,19 +860,28 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 
 			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_VARIADIC)) {
 				$sealed = false;
+
 				$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
-				if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
-					$extraItemType = $this->parseGeneric(
-						$tokens,
-						$this->enrichWithAttributes(
-							$tokens,
-							new Ast\Type\IdentifierTypeNode($kind),
-							$tokens->currentTokenLine(),
-							$tokens->currentTokenIndex()
-						)
-					);
+				if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+					$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+
+					$extraValueType = $this->parse($tokens);
+					$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+
+					if ($kind === Ast\Type\ArrayShapeNode::KIND_ARRAY) {
+						if ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+							$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+
+							$extraKeyType = $extraValueType;
+							$extraValueType = $this->parse($tokens);
+							$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+						}
+					}
+
+					$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
 					$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 				}
+
 				$tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA);
 				break;
 			}
@@ -884,7 +894,7 @@ private function parseArrayShape(TokenIterator $tokens, Ast\Type\TypeNode $type,
 		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 		$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_CURLY_BRACKET);
 
-		return new Ast\Type\ArrayShapeNode($items, $sealed, $kind, $extraItemType);
+		return new Ast\Type\ArrayShapeNode($items, $sealed, $kind, $extraKeyType, $extraValueType);
 	}
 
 

src/Printer/Printer.php

@@ -74,7 +74,6 @@
 use function sprintf;
 use function strlen;
 use function strpos;
-use function substr;
 use function trim;
 use const PREG_SET_ORDER;
 
@@ -368,8 +367,13 @@ private function printType(TypeNode $node): string
 
 			if (! $node->sealed) {
 				$item = '...';
-				if ($node->extraItemType !== null) {
-					$item .= substr($this->printType($node->extraItemType), strlen((string) $node->extraItemType->type));
+				if ($node->extraValueType !== null) {
+					$extraTypes = [];
+					if ($node->extraKeyType !== null) {
+						$extraTypes[] = $this->printType($node->extraKeyType);
+					}
+					$extraTypes[] = $this->printType($node->extraValueType);
+					$item .= '<' . implode(', ', $extraTypes) . '>';
 				}
 				$items[] = $item;
 			}