Support array and offset access on const types

Author: rvanvelzen

src/Ast/Type/OffsetAccessTypeNode.php

@@ -25,7 +25,6 @@ public function __toString(): string
 	{
 		if (
 			$this->type instanceof CallableTypeNode
-			|| $this->type instanceof ConstTypeNode
 			|| $this->type instanceof NullableTypeNode
 		) {
 			return '(' . $this->type . ')[' . $this->offset . ']';

src/Parser/TypeParser.php

@@ -232,7 +232,17 @@ private function parseAtomic(TokenIterator $tokens): Ast\Type\TypeNode
 				);
 			}
 
-			return $this->enrichWithAttributes($tokens, new Ast\Type\ConstTypeNode($constExpr), $startLine, $startIndex);
+			$type = $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ConstTypeNode($constExpr),
+				$startLine,
+				$startIndex
+			);
+			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
+			}
+
+			return $type;
 		} catch (LogicException $e) {
 			throw new ParserException(
 				$currentTokenValue,
@@ -733,14 +743,14 @@ private function parseCallableReturnType(TokenIterator $tokens): Ast\Type\TypeNo
 				);
 			}
 
-			$type = new Ast\Type\ConstTypeNode($constExpr);
+			$type = $this->enrichWithAttributes(
+				$tokens,
+				new Ast\Type\ConstTypeNode($constExpr),
+				$startLine,
+				$startIndex
+			);
 			if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
-				$type = $this->tryParseArrayOrOffsetAccess($tokens, $this->enrichWithAttributes(
-					$tokens,
-					$type,
-					$startLine,
-					$startIndex
-				));
+				$type = $this->tryParseArrayOrOffsetAccess($tokens, $type);
 			}
 
 			return $type;

tests/PHPStan/Parser/TypeParserTest.php

@@ -1067,6 +1067,13 @@ public function provideParseData(): array
 					new IdentifierTypeNode('int')
 				),
 			],
+			[
+				'self::TYPES[ int ]',
+				new OffsetAccessTypeNode(
+					new ConstTypeNode(new ConstFetchNode('self', 'TYPES')),
+					new IdentifierTypeNode('int')
+				),
+			],
 			[
 				"?\t\xA009", // edge-case with \h
 				new NullableTypeNode(