Do not match ignored error messages repeatedly for multiple paths

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: zonuexe

src/Analyser/Ignore/IgnoredErrorHelperResult.php

@@ -116,22 +116,27 @@ public function process(
 						}
 					}
 				} elseif (isset($ignore['paths'])) {
-					foreach ($ignore['paths'] as $j => $ignorePath) {
-						$shouldBeIgnored = IgnoredError::shouldIgnore($this->fileHelper, $error, ignoredErrorPattern: $ignore['message'] ?? null, ignoredErrorMessage: $ignore['rawMessage'] ?? null, identifier: $ignore['identifier'] ?? null, path: $ignorePath);
-						if (!$shouldBeIgnored) {
-							continue;
-						}
-
-						if (isset($unmatchedIgnoredErrors[$i])) {
-							if (!is_array($unmatchedIgnoredErrors[$i])) {
-								throw new ShouldNotHappenException();
+					// Message and identifier do not depend on the path. Match them once
+					// instead of repeating the potentially expensive regex for every path.
+					$matchesMessageAndIdentifier = IgnoredError::shouldIgnore($this->fileHelper, $error, ignoredErrorPattern: $ignore['message'] ?? null, ignoredErrorMessage: $ignore['rawMessage'] ?? null, identifier: $ignore['identifier'] ?? null, path: null);
+					if ($matchesMessageAndIdentifier) {
+						foreach ($ignore['paths'] as $j => $ignorePath) {
+							$shouldBeIgnored = IgnoredError::shouldIgnore($this->fileHelper, $error, ignoredErrorPattern: null, ignoredErrorMessage: null, identifier: null, path: $ignorePath);
+							if (!$shouldBeIgnored) {
+								continue;
 							}
-							unset($unmatchedIgnoredErrors[$i]['paths'][$j]);
-							if (isset($unmatchedIgnoredErrors[$i]['paths']) && count($unmatchedIgnoredErrors[$i]['paths']) === 0) {
-								unset($unmatchedIgnoredErrors[$i]);
+
+							if (isset($unmatchedIgnoredErrors[$i])) {
+								if (!is_array($unmatchedIgnoredErrors[$i])) {
+									throw new ShouldNotHappenException();
+								}
+								unset($unmatchedIgnoredErrors[$i]['paths'][$j]);
+								if (isset($unmatchedIgnoredErrors[$i]['paths']) && count($unmatchedIgnoredErrors[$i]['paths']) === 0) {
+									unset($unmatchedIgnoredErrors[$i]);
+								}
 							}
+							break;
 						}
-						break;
 					}
 				} else {
 					$shouldBeIgnored = IgnoredError::shouldIgnore($this->fileHelper, $error, ignoredErrorPattern: $ignore['message'] ?? null, ignoredErrorMessage: $ignore['rawMessage'] ?? null, identifier: $ignore['identifier'] ?? null, path: null);

tests/PHPStan/Analyser/AnalyserTest.php

@@ -406,6 +406,37 @@ public function testIgnoreErrorRawByPaths(): void
 		$this->assertNoErrors($result);
 	}
 
+	public function testIgnoreErrorByMessageIdentifierAndSecondPath(): void
+	{
+		$ignoreErrors = [
+			[
+				'message' => '#Fail\.#',
+				'identifier' => 'tests.alwaysFail',
+				'paths' => [
+					__DIR__ . '/data/another-path.php',
+					__DIR__ . '/data/bootstrap-error.php',
+				],
+			],
+		];
+		$result = $this->runAnalyser($ignoreErrors, false, __DIR__ . '/data/bootstrap-error.php', false);
+		$this->assertNoErrors($result);
+	}
+
+	public function testIgnoreErrorByPathsRequiresMatchingIdentifier(): void
+	{
+		$ignoreErrors = [
+			[
+				'message' => '#Fail\.#',
+				'identifier' => 'wrong.identifier',
+				'paths' => [__DIR__ . '/data/bootstrap-error.php'],
+			],
+		];
+		$result = $this->runAnalyser($ignoreErrors, false, __DIR__ . '/data/bootstrap-error.php', false);
+		$this->assertCount(1, $result);
+		$this->assertInstanceOf(Error::class, $result[0]);
+		$this->assertSame('Fail.', $result[0]->getMessage());
+	}
+
 	public function testIgnoreErrorMultiByPaths(): void
 	{
 		$ignoreErrors = [