Changed linesToIgnore attribute format

ondrejmirtes · ondrejmirtes · commit 2862a7bf7927 · 2023-07-25T09:37:07.000+02:00
diff --git a/src/Analyser/FileAnalyser.php b/src/Analyser/FileAnalyser.php
@@ -242,10 +242,10 @@ private function getLinesToIgnoreFromTokens(array $nodes): array
 			return [];
 		}
 
-		/** @var int[] $tokenLines */
+		/** @var array<int, list<string>|null> $tokenLines */
 		$tokenLines = $nodes[0]->getAttribute('linesToIgnore', []);
 		$lines = [];
-		foreach ($tokenLines as $tokenLine) {
+		foreach (array_keys($tokenLines) as $tokenLine) {
 			$lines[$tokenLine] = true;
 		}
 
diff --git a/src/Parser/RichParser.php b/src/Parser/RichParser.php
@@ -11,10 +11,10 @@
 use PHPStan\File\FileReader;
 use PHPStan\ShouldNotHappenException;
 use function array_filter;
-use function array_values;
 use function is_string;
 use function strpos;
 use function substr_count;
+use const ARRAY_FILTER_USE_KEY;
 use const T_COMMENT;
 use const T_DOC_COMMENT;
 
@@ -78,15 +78,15 @@ public function parseString(string $sourceCode): array
 		}
 
 		foreach ($traitCollectingVisitor->traits as $trait) {
-			$trait->setAttribute('linesToIgnore', array_values(array_filter($linesToIgnore, static fn (int $line): bool => $line >= $trait->getStartLine() && $line <= $trait->getEndLine())));
+			$trait->setAttribute('linesToIgnore', array_filter($linesToIgnore, static fn (int $line): bool => $line >= $trait->getStartLine() && $line <= $trait->getEndLine(), ARRAY_FILTER_USE_KEY));
 		}
 
 		return $nodes;
 	}
 
 	/**
 	 * @param mixed[] $tokens
-	 * @return int[]
+	 * @return array<int, list<string>|null>
 	 */
 	private function getLinesToIgnore(array $tokens): array
 	{
@@ -111,7 +111,7 @@ private function getLinesToIgnore(array $tokens): array
 
 			$line += substr_count($token[1], "\n");
 
-			$lines[] = $line;
+			$lines[$line] = null;
 		}
 
 		return $lines;

Original file line number	Diff line number	Diff line change
`@@ -242,10 +242,10 @@ private function getLinesToIgnoreFromTokens(array $nodes): array`
`242`	`242`	`return [];`
`243`	`243`	`}`
`244`	`244`
`245`		`- /** @var int[] $tokenLines */`
	`245`	`+ /** @var array<int, list<string>\|null> $tokenLines */`
`246`	`246`	`$tokenLines = $nodes[0]->getAttribute('linesToIgnore', []);`
`247`	`247`	`$lines = [];`
`248`		`- foreach ($tokenLines as $tokenLine) {`
	`248`	`+ foreach (array_keys($tokenLines) as $tokenLine) {`
`249`	`249`	`$lines[$tokenLine] = true;`
`250`	`250`	`}`
`251`	`251`