From bb88ea7b1495de88a3a2bd69a2dd8fa397cf0d89 Mon Sep 17 00:00:00 2001 From: Vasek Purchart Date: Mon, 25 Apr 2022 16:51:17 +0200 Subject: [PATCH] Generate only 1, not 2 newlines at the end of baseline --- phpstan-baseline.neon | 1 - .../ErrorFormatter/BaselineNeonErrorFormatter.php | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 2d8e472cdb8..dc1d9d033cd 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -409,4 +409,3 @@ parameters: """ count: 1 path: tests/PHPStan/Rules/Arrays/AppendedArrayKeyTypeRuleTest.php - diff --git a/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php b/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php index 1f40c73422d..3005583c09f 100644 --- a/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php +++ b/src/Command/ErrorFormatter/BaselineNeonErrorFormatter.php @@ -7,6 +7,7 @@ use PHPStan\Command\AnalysisResult; use PHPStan\Command\Output; use PHPStan\File\RelativePathHelper; +use PHPStan\ShouldNotHappenException; use function ksort; use function preg_quote; use function substr; @@ -70,11 +71,17 @@ public function formatErrors( */ private function getNeon(array $ignoreErrors): string { - return Neon::encode([ + $neon = Neon::encode([ 'parameters' => [ 'ignoreErrors' => $ignoreErrors, ], ], Neon::BLOCK); + + if (substr($neon, -2) !== "\n\n") { + throw new ShouldNotHappenException(); + } + + return substr($neon, 0, -1); } }