AnalyserTest - test matched and unmatched errors separately

tests/PHPStan/Analyser/AnalyserTest.php

@@ -465,30 +465,32 @@ public function testDoNotReportUnmatchedIgnoredErrorsFromPathWithCountIfPathWasN
 		$this->assertNoErrors($result);
 	}
 
-	/**
-	 * @dataProvider dataTrueAndFalse
-	 */
-	public function testIgnoreNextLine(bool $reportUnmatchedIgnoredErrors): void
+	public function testIgnoreNextLine(): void
 	{
-		$result = $this->runAnalyser([], $reportUnmatchedIgnoredErrors, [
+		$result = $this->runAnalyser([], true, [
 			__DIR__ . '/data/ignore-next-line.php',
 		], true);
-		$this->assertCount($reportUnmatchedIgnoredErrors ? 4 : 3, $result);
+		$this->assertCount(3, $result);
 		foreach ([10, 20, 24] as $i => $line) {
 			$this->assertArrayHasKey($i, $result);
 			$this->assertInstanceOf(Error::class, $result[$i]);
 			$this->assertSame('Fail.', $result[$i]->getMessage());
 			$this->assertSame($line, $result[$i]->getLine());
 		}
+	}
 
-		if (!$reportUnmatchedIgnoredErrors) {
-			return;
+	public function testIgnoreNextLineUnmatched(): void
+	{
+		$result = $this->runAnalyser([], true, [
+			__DIR__ . '/data/ignore-next-line-unmatched.php',
+		], true);
+		$this->assertCount(1, $result);
+		foreach ([11] as $i => $line) {
+			$this->assertArrayHasKey($i, $result);
+			$this->assertInstanceOf(Error::class, $result[$i]);
+			$this->assertStringContainsString('No error to ignore is reported on line', $result[$i]->getMessage());
+			$this->assertSame($line, $result[$i]->getLine());
 		}
-
-		$this->assertArrayHasKey(3, $result);
-		$this->assertInstanceOf(Error::class, $result[3]);
-		$this->assertSame('No error to ignore is reported on line 28.', $result[3]->getMessage());
-		$this->assertSame(28, $result[3]->getLine());
 	}
 
 	public function testIgnoreNextLineLegacyBehaviour(): void

tests/PHPStan/Analyser/data/ignore-next-line-unmatched.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace IgnoreNextLineUnmatched;
+
+class Foo
+{
+
+	public function doFoo(): void
+	{
+		/** @phpstan-ignore-next-line */
+		succ(); // reported as unmatched
+	}
+
+}

tests/PHPStan/Analyser/data/ignore-next-line.php

@@ -23,9 +23,6 @@ public function doFoo(): void
 		if (fail()) {
 			fail(); // reported
 		}
-
-		/** @phpstan-ignore-next-line */
-		succ(); // reported as unmatched
 	}
 
 }