include path when counting errors ignored by identifier

this fixes phpstan/phpstan#11177
phpstan · Jun 13, 2024 · 386ccd0 · 386ccd0
1 parent f638dc4
commit 386ccd0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/Analyser/Ignore/IgnoredErrorHelper.php b/src/Analyser/Ignore/IgnoredErrorHelper.php
@@ -68,9 +68,9 @@ public function initialize(): IgnoredErrorHelperResult
 				continue;
 			}
 
-			$key = '';
+			$key = $ignoreError['path'];
 			if (isset($ignoreError['message'])) {
-				$key = sprintf("%s\n%s", $ignoreError['message'], $ignoreError['path']);
+				$key = sprintf("%s\n%s", $key, $ignoreError['message']);
 			}
 			if (isset($ignoreError['identifier'])) {
 				$key = sprintf("%s\n%s", $key, $ignoreError['identifier']);

diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php
@@ -207,6 +207,32 @@ public function dataTrueAndFalse(): array
 		];
 	}
 
+	/**
+	 * @dataProvider dataTrueAndFalse
+	 */
+	public function testIgnoreErrorByPathAndIdentifierCountsCorrectly(bool $onlyFiles): void
+	{
+		$ignoreErrors = [
+			[
+				'identifier' => 'tests.alwaysFail',
+				'count' => 3,
+				'path' => __DIR__ . '/data/two-fails.php',
+			],
+			[
+				'identifier' => 'tests.alwaysFail',
+				'count' => 2,
+				'path' => __DIR__ . '/data/two-different-fails.php',
+			],
+		];
+
+		$filesToAnalyze = [
+			__DIR__ . '/data/two-fails.php',
+			__DIR__ . '/data/two-different-fails.php',
+		];
+		$result = $this->runAnalyser($ignoreErrors, true, $filesToAnalyze, $onlyFiles);
+		$this->assertSame([], $result);
+	}
+
 	/**
 	 * @dataProvider dataTrueAndFalse
 	 */