[BCB] ArrayShapeItemNode and ObjectShapeItemNode are not standalone TypeNode, just Node

Author: ondrejmirtes

UPGRADING.md

@@ -126,3 +126,4 @@ The line with `some text in the middle` in phpdoc-parser 2.0 is now part of the
 * Constructor parameter `$isReference` in `TypelessParamTagValueNode` made required
 * Constructor parameter `$templateTypes` in `CallableTypeNode` made required
 * Constructor parameters `$expectedTokenValue` and `$currentTokenLine` in `ParserException` made required
+* `ArrayShapeItemNode` and `ObjectShapeItemNode` are not standalone TypeNode, just Node

src/Ast/Type/ArrayShapeItemNode.php

@@ -4,10 +4,11 @@
 
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use function sprintf;
 
-class ArrayShapeItemNode implements TypeNode
+class ArrayShapeItemNode implements Node
 {
 
 	use NodeAttributes;

src/Ast/Type/ObjectShapeItemNode.php

@@ -3,10 +3,11 @@
 namespace PHPStan\PhpDocParser\Ast\Type;
 
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
+use PHPStan\PhpDocParser\Ast\Node;
 use PHPStan\PhpDocParser\Ast\NodeAttributes;
 use function sprintf;
 
-class ObjectShapeItemNode implements TypeNode
+class ObjectShapeItemNode implements Node
 {
 
 	use NodeAttributes;

src/Printer/Printer.php

@@ -248,6 +248,30 @@ function (PhpDocChildNode $child): string {
 		if ($node instanceof DoctrineArrayItem) {
 			return (string) $node;
 		}
+		if ($node instanceof ArrayShapeItemNode) {
+			if ($node->keyName !== null) {
+				return sprintf(
+					'%s%s: %s',
+					$this->print($node->keyName),
+					$node->optional ? '?' : '',
+					$this->printType($node->valueType),
+				);
+			}
+
+			return $this->printType($node->valueType);
+		}
+		if ($node instanceof ObjectShapeItemNode) {
+			if ($node->keyName !== null) {
+				return sprintf(
+					'%s%s: %s',
+					$this->print($node->keyName),
+					$node->optional ? '?' : '',
+					$this->printType($node->valueType),
+				);
+			}
+
+			return $this->printType($node->valueType);
+		}
 
 		throw new LogicException(sprintf('Unknown node type %s', get_class($node)));
 	}
@@ -364,26 +388,14 @@ private function printTagValue(PhpDocTagValueNode $node): string
 	private function printType(TypeNode $node): string
 	{
 		if ($node instanceof ArrayShapeNode) {
-			$items = array_map(fn (ArrayShapeItemNode $item): string => $this->printType($item), $node->items);
+			$items = array_map(fn (ArrayShapeItemNode $item): string => $this->print($item), $node->items);
 
 			if (! $node->sealed) {
 				$items[] = '...' . ($node->unsealedType === null ? '' : $this->print($node->unsealedType));
 			}
 
 			return $node->kind . '{' . implode(', ', $items) . '}';
 		}
-		if ($node instanceof ArrayShapeItemNode) {
-			if ($node->keyName !== null) {
-				return sprintf(
-					'%s%s: %s',
-					$this->print($node->keyName),
-					$node->optional ? '?' : '',
-					$this->printType($node->valueType),
-				);
-			}
-
-			return $this->printType($node->valueType);
-		}
 		if ($node instanceof ArrayTypeNode) {
 			return $this->printOffsetAccessType($node->type) . '[]';
 		}
@@ -469,22 +481,10 @@ private function printType(TypeNode $node): string
 			return '?' . $this->printType($node->type);
 		}
 		if ($node instanceof ObjectShapeNode) {
-			$items = array_map(fn (ObjectShapeItemNode $item): string => $this->printType($item), $node->items);
+			$items = array_map(fn (ObjectShapeItemNode $item): string => $this->print($item), $node->items);
 
 			return 'object{' . implode(', ', $items) . '}';
 		}
-		if ($node instanceof ObjectShapeItemNode) {
-			if ($node->keyName !== null) {
-				return sprintf(
-					'%s%s: %s',
-					$this->print($node->keyName),
-					$node->optional ? '?' : '',
-					$this->printType($node->valueType),
-				);
-			}
-
-			return $this->printType($node->valueType);
-		}
 		if ($node instanceof OffsetAccessTypeNode) {
 			return $this->printOffsetAccessType($node->type) . '[' . $this->printType($node->offset) . ']';
 		}

tests/PHPStan/Parser/TypeParserTest.php

@@ -2888,7 +2888,7 @@ public function dataLinesAndIndexes(): iterable
 					6,
 				],
 				[
-					static fn (ArrayShapeNode $typeNode): TypeNode => $typeNode->items[0],
+					static fn (ArrayShapeNode $typeNode): Node => $typeNode->items[0],
 					'foo: int',
 					1,
 					1,
@@ -2924,7 +2924,7 @@ public function dataLinesAndIndexes(): iterable
 					6,
 				],
 				[
-					static fn (ObjectShapeNode $typeNode): TypeNode => $typeNode->items[0],
+					static fn (ObjectShapeNode $typeNode): Node => $typeNode->items[0],
 					'foo: int',
 					1,
 					1,