Use "Ignored error" instead of "Ignored error pattern" when rawMessage is used

Author: janedbal

src/Analyser/Ignore/IgnoredError.php

@@ -17,6 +17,18 @@
 final class IgnoredError
 {
 
+	/**
+	 * @param array{message?: string, rawMessage?: string, identifier?: string, identifiers?: list<string>, path?: string, paths?: list<string>}|string $ignoredError
+	 */
+	public static function getIgnoredErrorLabel(array|string $ignoredError): string
+	{
+		if (is_array($ignoredError) && !isset($ignoredError['message']) && isset($ignoredError['rawMessage'])) {
+			return 'Ignored error';
+		}
+
+		return 'Ignored error pattern';
+	}
+
 	/**
 	 * @param mixed[]|string $ignoredError
 	 * @return string Representation of the ignored error

src/Analyser/Ignore/IgnoredErrorHelperResult.php

@@ -181,7 +181,8 @@ public function process(
 			}
 
 			$errors[] = (new Error(sprintf(
-				'Ignored error pattern %s is expected to occur %d %s, but occurred %d %s.',
+				'%s %s is expected to occur %d %s, but occurred %d %s.',
+				IgnoredError::getIgnoredErrorLabel($unmatchedIgnoredError),
 				IgnoredError::stringifyPattern($unmatchedIgnoredError),
 				$unmatchedIgnoredError['count'],
 				$unmatchedIgnoredError['count'] === 1 ? 'time' : 'times',
@@ -205,7 +206,8 @@ public function process(
 				) {
 					if ($unmatchedIgnoredError['realCount'] < $unmatchedIgnoredError['count']) {
 						$errors[] = (new Error(sprintf(
-							'Ignored error pattern %s is expected to occur %d %s, but occurred only %d %s.',
+							'%s %s is expected to occur %d %s, but occurred only %d %s.',
+							IgnoredError::getIgnoredErrorLabel($unmatchedIgnoredError),
 							IgnoredError::stringifyPattern($unmatchedIgnoredError),
 							$unmatchedIgnoredError['count'],
 							$unmatchedIgnoredError['count'] === 1 ? 'time' : 'times',
@@ -224,15 +226,17 @@ public function process(
 
 					$errors[] = (new Error(
 						sprintf(
-							'Ignored error pattern %s was not matched in reported errors.',
+							'%s %s was not matched in reported errors.',
+							IgnoredError::getIgnoredErrorLabel($unmatchedIgnoredError),
 							IgnoredError::stringifyPattern($unmatchedIgnoredError),
 						),
 						$unmatchedIgnoredError['realPath'],
 						canBeIgnored: false,
 					))->withIdentifier('ignore.unmatched');
 				} elseif (!$onlyFiles) {
 					$stringErrors[] = sprintf(
-						'Ignored error pattern %s was not matched in reported errors.',
+						'%s %s was not matched in reported errors.',
+						IgnoredError::getIgnoredErrorLabel($unmatchedIgnoredError),
 						IgnoredError::stringifyPattern($unmatchedIgnoredError),
 					);
 				}

tests/PHPStan/Analyser/AnalyserTest.php

@@ -99,7 +99,7 @@ public function testFileWithAnIgnoredErrorRawMessageAndWrongIdentifier(): void
 		assert($result[0] instanceof Error);
 		$this->assertSame('Fail.', $result[0]->getMessage());
 		assert(is_string($result[1]));
-		$this->assertSame('Ignored error pattern "Fail." (wrong.identifier) was not matched in reported errors.', $result[1]);
+		$this->assertSame('Ignored error "Fail." (wrong.identifier) was not matched in reported errors.', $result[1]);
 	}
 
 	public function testFileWithAnIgnoredWrongIdentifier(): void
@@ -721,7 +721,7 @@ public function testIgnoreErrorExplicitReportUnmatchedEnableRaw(): void
 		];
 		$result = $this->runAnalyser($ignoreErrors, false, __DIR__ . '/data/bootstrap.php', false);
 		$this->assertCount(1, $result);
-		$this->assertSame('Ignored error pattern "Fail." was not matched in reported errors.', $result[0]);
+		$this->assertSame('Ignored error "Fail." was not matched in reported errors.', $result[0]);
 	}
 
 	public function testIgnoreErrorExplicitReportUnmatchedEnableMulti(): void