LineBreakAfterStatementsFixer no longer removes extra blank lines in consecutive closing curly braces

Author: erickskrauch

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- `ErickSkrauch\line_break_after_statements` no longer removes extra blank lines in consecutive closing curly braces. Use [`no_extra_blank_lines`](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/rules/whitespace/no_extra_blank_lines.rst) with `curly_brace_block` tokens configuration for this fix.
 
 ## [1.1.0] - 2023-05-29
 ### Added

src/Whitespace/LineBreakAfterStatementsFixer.php

@@ -16,7 +16,7 @@
 final class LineBreakAfterStatementsFixer extends AbstractFixer implements WhitespacesAwareFixerInterface {
 
     /**
-     * There is no 'do', 'cause the processing of the 'while' also includes do {} while (); construction
+     * There is no 'do', 'cause the processing of the 'while' also includes "do {} while ();" construction
      */
     private const STATEMENTS = [
         T_IF,
@@ -92,31 +92,26 @@ protected function applyFix(SplFileInfo $file, Tokens $tokens): void {
 
             $endStatementIndex = $this->findStatementEnd($tokens, $index);
             $nextStatementIndex = $tokens->getNextMeaningfulToken($endStatementIndex);
-            if ($nextStatementIndex === null) {
+            if ($nextStatementIndex === null || $tokens[$nextStatementIndex]->equals('}')) {
                 continue;
             }
 
-            if ($tokens[$nextStatementIndex]->equals('}')) {
-                $this->fixBlankLines($tokens, $endStatementIndex + 1, 0);
-                continue;
-            }
-
-            $this->fixBlankLines($tokens, $endStatementIndex + 1, 1);
+            $this->ensureBlankLine($tokens, $endStatementIndex + 1);
         }
     }
 
-    private function fixBlankLines(Tokens $tokens, int $index, int $countLines): void {
+    private function ensureBlankLine(Tokens $tokens, int $index): void {
         $content = $tokens[$index]->getContent();
         // Apply fix only in the case when the count lines do not equals to expected
-        if (substr_count($content, "\n") === $countLines + 1) {
+        if (substr_count($content, "\n") === 2) {
             return;
         }
 
         // The final bit of the whitespace must be the next statement's indentation
         Preg::matchAll('/[^\n\r]+[\r\n]*/', $content, $matches);
         $lines = $matches[0];
         $eol = $this->whitespacesConfig->getLineEnding();
-        $tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, $countLines + 1) . end($lines)]);
+        $tokens[$index] = new Token([T_WHITESPACE, str_repeat($eol, 2) . end($lines)]);
     }
 
     private function findStatementEnd(Tokens $tokens, int $index): int {

tests/Whitespace/LineBreakAfterStatementsFixerTest.php

@@ -289,34 +289,6 @@ public function bar()
         yield [
             '<?php
 class Foo
-{
-    public function bar()
-    {
-        foreach (["foo", "bar"] as $str) {
-            if ($str === "foo") {
-                // code
-            }
-        }
-    }
-}',
-            '<?php
-class Foo
-{
-    public function bar()
-    {
-        foreach (["foo", "bar"] as $str) {
-            if ($str === "foo") {
-                // code
-            }
-
-        }
-    }
-}',
-        ];
-
-        yield [
-            '<?php
-class Foo
 {
     public function foo()
     {