Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

src/Parser/RichParser.php

@@ -98,7 +98,12 @@ public function parseString(string $sourceCode): array
 		}
 
 		foreach ($traitCollectingVisitor->traits as $trait) {
-			$trait->setAttribute('linesToIgnore', array_filter($linesToIgnore, static fn (int $line): bool => $line >= $trait->getStartLine() && $line <= $trait->getEndLine(), ARRAY_FILTER_USE_KEY));
+			$preexisting = $trait->getAttribute('linesToIgnore', []);
+			$filteredLinesToIgnore = array_filter($linesToIgnore, static fn (int $line): bool => $line >= $trait->getStartLine() && $line <= $trait->getEndLine(), ARRAY_FILTER_USE_KEY);
+			foreach ($preexisting as $line => $ignores) {
+				$filteredLinesToIgnore[$line] = $ignores;
+			}
+			$trait->setAttribute('linesToIgnore', $filteredLinesToIgnore);
 		}
 
 		return $nodes;

tests/PHPStan/Parser/RichParserTest.php

@@ -271,6 +271,45 @@ public function dataLinesToIgnore(): iterable
 				2 => ['identifier'],
 			],
 		];
+
+		yield [
+			'<?php' . PHP_EOL .
+			PHP_EOL .
+			'class MyClass {' . PHP_EOL .
+			'  use MyTrait;' . PHP_EOL .
+			PHP_EOL .
+			'  public mixed $myProperty;' . PHP_EOL .
+			PHP_EOL .
+			'  function myFunction(): void {' . PHP_EOL .
+			'    // @phpstan-ignore variable.undefined' . PHP_EOL .
+			'    $this->myProperty = $b;' . PHP_EOL .
+			'  }' . PHP_EOL .
+			'}',
+			[
+				10 => ['variable.undefined'],
+			],
+		];
+
+		yield [
+			'<?php' . PHP_EOL .
+			PHP_EOL .
+			'trait MyTrait {' . PHP_EOL .
+			'}' . PHP_EOL .
+			PHP_EOL .
+			'class MyClass {' . PHP_EOL .
+			'  use MyTrait;' . PHP_EOL .
+			PHP_EOL .
+			'  public mixed $myProperty;' . PHP_EOL .
+			PHP_EOL .
+			'  function myFunction(): void {' . PHP_EOL .
+			'    // @phpstan-ignore variable.undefined' . PHP_EOL .
+			'    $this->myProperty = $b;' . PHP_EOL .
+			'  }' . PHP_EOL .
+			'}',
+			[
+				13 => ['variable.undefined'],
+			],
+		];
 	}
 
 	/**