Escape special nette/di characters in BaselineNeonErrorFormatter

phpstan · Aug 7, 2020 · 7336df1 · 7336df1
1 parent f419ec3
commit 7336df1
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php b/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php
@@ -2,6 +2,7 @@
 
 namespace PHPStan\Command\ErrorFormatter;
 
+use Nette\DI\Helpers;
 use Nette\Neon\Neon;
 use PHPStan\Command\AnalysisResult;
 use PHPStan\Command\Output;
@@ -54,9 +55,9 @@ public function formatErrors(
 
 			foreach ($fileErrorsCounts as $message => $count) {
 				$errorsToOutput[] = [
-					'message' => '#^' . preg_quote($message, '#') . '$#',
+					'message' => Helpers::escape('#^' . preg_quote($message, '#') . '$#'),
 					'count' => $count,
-					'path' => $this->relativePathHelper->getRelativePath($file),
+					'path' => Helpers::escape($this->relativePathHelper->getRelativePath($file)),
 				];
 			}
 		}

diff --git a/tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php b/tests/PHPStan/Command/ErrorFormatter/BaselineNeonErrorFormatterTest.php
@@ -158,4 +158,39 @@ public function testFormatErrorMessagesRegexEscape(): void
 		);
 	}
 
+	public function testEscapeDiNeon(): void
+	{
+		$formatter = new BaselineNeonErrorFormatter(new SimpleRelativePathHelper(self::DIRECTORY_PATH));
+		$result = new AnalysisResult(
+			[new Error('Test %value%', 'Testfile')],
+			[],
+			[],
+			[],
+			false,
+			null,
+			true
+		);
+
+		$formatter->formatErrors(
+			$result,
+			$this->getOutput()
+		);
+		self::assertSame(
+			trim(
+				Neon::encode([
+					'parameters' => [
+						'ignoreErrors' => [
+							[
+								'message' => '#^Test %%value%%$#',
+								'count' => 1,
+								'path' => 'Testfile',
+							],
+						],
+					],
+				], Neon::BLOCK)
+			),
+			trim($this->getOutputContent())
+		);
+	}
+
 }