Report "Ignored error pattern is expected to occur N times but occured only M times" as file-specific

ondrejmirtes · ondrejmirtes · commit eec492e40c8e · 2020-03-02T23:21:30.000+01:00
diff --git a/src/Analyser/IgnoredErrorHelperResult.php b/src/Analyser/IgnoredErrorHelperResult.php
@@ -97,12 +97,13 @@ public function process(array $errors, bool $onlyFiles, bool $reachedInternalErr
 							$realCount++;
 							$unmatchedIgnoredErrors[$i]['realCount'] = $realCount;
 
+							if (!isset($unmatchedIgnoredErrors[$i]['file'])) {
+								$unmatchedIgnoredErrors[$i]['file'] = $error->getFile();
+								$unmatchedIgnoredErrors[$i]['line'] = $error->getLine();
+							}
+
 							if ($realCount > $ignore['count']) {
 								$shouldBeIgnored = false;
-								if (!isset($unmatchedIgnoredErrors[$i]['file'])) {
-									$unmatchedIgnoredErrors[$i]['file'] = $error->getFile();
-									$unmatchedIgnoredErrors[$i]['line'] = $error->getLine();
-								}
 							}
 						} else {
 							unset($unmatchedIgnoredErrors[$i]);
@@ -213,14 +214,14 @@ public function process(array $errors, bool $onlyFiles, bool $reachedInternalErr
 					&& (isset($unmatchedIgnoredError['realPath']) || !$onlyFiles)
 				) {
 					if ($unmatchedIgnoredError['realCount'] < $unmatchedIgnoredError['count']) {
-						$errors[] = sprintf(
+						$errors[] = new Error(sprintf(
 							'Ignored error pattern %s is expected to occur %d %s, but occured only %d %s.',
 							IgnoredError::stringifyPattern($unmatchedIgnoredError),
 							$unmatchedIgnoredError['count'],
 							$unmatchedIgnoredError['count'] === 1 ? 'time' : 'times',
 							$unmatchedIgnoredError['realCount'],
 							$unmatchedIgnoredError['realCount'] === 1 ? 'time' : 'times'
-						);
+						), $unmatchedIgnoredError['file'], $unmatchedIgnoredError['line'], false);
 					}
 				} elseif (!$onlyFiles) {
 					$errors[] = sprintf(
diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php
@@ -123,7 +123,7 @@ public function testIgnoreErrorByPathAndCountMoreThanExpected(bool $onlyFiles):
 		$this->assertInstanceOf(Error::class, $result[2]);
 		$this->assertStringContainsString('Ignored error pattern #Fail\.#', $result[2]->getMessage());
 		$this->assertStringContainsString('is expected to occur 1 time, but occured 3 times.', $result[2]->getMessage());
-		$this->assertSame(6, $result[2]->getLine());
+		$this->assertSame(5, $result[2]->getLine());
 		$this->assertSamePaths(__DIR__ . '/data/two-fails.php', $result[2]->getFile());
 	}
 
@@ -142,9 +142,11 @@ public function testIgnoreErrorByPathAndCountLessThanExpected(bool $onlyFiles):
 		];
 		$result = $this->runAnalyser($ignoreErrors, true, __DIR__ . '/data/two-fails.php', $onlyFiles);
 		$this->assertCount(1, $result);
-		$this->assertIsString($result[0]);
-		$this->assertStringContainsString('Ignored error pattern #Fail\.#', $result[0]);
-		$this->assertStringContainsString('is expected to occur 4 times, but occured only 3 times.', $result[0]);
+		$this->assertInstanceOf(Error::class, $result[0]);
+		$this->assertStringContainsString('Ignored error pattern #Fail\.#', $result[0]->getMessage());
+		$this->assertStringContainsString('is expected to occur 4 times, but occured only 3 times.', $result[0]->getMessage());
+		$this->assertSamePaths(__DIR__ . '/data/two-fails.php', $result[0]->getFile());
+		$this->assertSame(5, $result[0]->getLine());
 	}
 
 	public function testIgnoreErrorByPathAndCountMissing(): void
