baseline: normalize newlines in error messages

.gitattributes

@@ -0,0 +1 @@
+tests/PHPStan/Command/ErrorFormatter/data/WindowsNewlines.php eol=crlf

src/Analyser/IgnoredError.php

@@ -48,10 +48,15 @@ public static function shouldIgnore(
 		?string $path
 	): bool
 	{
+		// normalize newlines to allow working with ignore-patterns independent of used OS newline-format
+		$errorMessage = $error->getMessage();
+		$errorMessage = str_replace(['\r\n', '\r'], '\n', $errorMessage);
+		$ignoredErrorPattern = str_replace(['\r\n', '\r'], '\n', $ignoredErrorPattern);
+
 		if ($path !== null) {
 			$fileExcluder = new FileExcluder($fileHelper, [$path]);
 
-			if (\Nette\Utils\Strings::match($error->getMessage(), $ignoredErrorPattern) === null) {
+			if (\Nette\Utils\Strings::match($errorMessage, $ignoredErrorPattern) === null) {
 				return false;
 			}
 
@@ -63,7 +68,7 @@ public static function shouldIgnore(
 			return $isExcluded;
 		}
 
-		return \Nette\Utils\Strings::match($error->getMessage(), $ignoredErrorPattern) !== null;
+		return \Nette\Utils\Strings::match($errorMessage, $ignoredErrorPattern) !== null;
 	}
 
 }

src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php

@@ -55,6 +55,9 @@ public function formatErrors(
 			}
 
 			foreach ($fileErrorsCounts as $message => $count) {
+				// normalize newlines to allow working with ignore-patterns independent of used OS newline-format
+				$message = str_replace(['\r\n', '\r'], '\n', $message);
+
 				$errorsToOutput[] = [
 					'message' => '#^' . preg_quote($message, '#') . '$#',
 					'count' => $count,

tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterIntegrationTest.php

@@ -15,8 +15,8 @@ public function testErrorWithTrait(): void
 	{
 		$output = $this->runPhpStan(null);
 		$errors = Json::decode($output, Json::FORCE_ARRAY);
-		$this->assertSame(4, array_sum($errors['totals']));
-		$this->assertCount(4, $errors['files']);
+		$this->assertSame(7, array_sum($errors['totals']));
+		$this->assertCount(5, $errors['files']);
 	}
 
 	public function testGenerateBaselineAndRunAgainWithIt(): void

tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php

@@ -149,4 +149,32 @@ public function testFormatErrorMessagesRegexEscape(): void
 		);
 	}
 
+	public function testFormatErrorMessagesNormalizedNewlines(): void
+	{
+		$formatter = new BaselineNeonErrorFormatter(new SimpleRelativePathHelper(self::DIRECTORY_PATH));
+
+		$result  = new AnalysisResult(
+			[new Error('Error message\nwith\r\ndifferent\rnewlines', 'Testfile')],
+			['Error message\nwith\r\ndifferent\rnewlines'],
+			false,
+			false,
+			null
+		);
+		$formatter->formatErrors(
+			$result,
+			$this->getErrorConsoleStyle()
+		);
+
+		self::assertSame(
+			trim(Neon::encode(['parameters' => ['ignoreErrors' => [
+				[
+					'message' => '#^Error message\\\\nwith\\\\ndifferent\\\\nnewlines$#',
+					'count' => 1,
+					'path' => 'Testfile',
+				],
+			]]], Neon::BLOCK)),
+			trim($this->getOutputContent())
+		);
+	}
+
 }

tests/PHPStan/Command/ErrorFormatter/data/WindowsNewlines.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace BaselineIntegration;
+
+class WindowsNewlines {
+
+	/**
+	 * The following phpdoc is invalid and should trigger a error message containing newlines.
+	 *
+	 * @param
+	 *            $object
+	 */
+	public function phpdocWithNewlines($object) {
+	}
+
+}