#25 - configure NoExtraBlankLinesFixer (#36)

* #25 - configure NoExtraBlankLinesFixer * Update tests/codestyle/fixtures/noExtraBlankLines/actual.php Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl> Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>
blumilksoftware · Oct 8, 2021 · e96f41e · e96f41e
1 parent 9462c48
commit e96f41e
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 5 deletions.
diff --git a/src/Configuration/Defaults/CommonAdditionalRules.php b/src/Configuration/Defaults/CommonAdditionalRules.php
@@ -44,7 +44,14 @@ class CommonAdditionalRules extends Rules implements AdditionalRules
                 "author",
             ],
         ],
-        NoExtraBlankLinesFixer::class => null,
+        NoExtraBlankLinesFixer::class => [
+            "tokens" => [
+                "extra",
+                "curly_brace_block",
+                "parenthesis_brace_block",
+                "square_brace_block",
+            ],
+        ],
         OperatorSpacingSniff::class => null,
         TrailingCommaInMultilineFixer::class => [
             "elements" => [

diff --git a/tests/codestyle/fixtures/noExtraBlankLines/actual.php b/tests/codestyle/fixtures/noExtraBlankLines/actual.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+$a = [
+    1,
+    2,
+
+];
+
+function b(): int
+{
+    $a = 1;
+
+    return $a;
+
+}
+
+function c(int $a, int $b, int $c): int
+{
+
+    return $a + $b + $c;
+
+
+
+
+
+
+}
+
+$d = c(
+
+    1,
+    2,
+    3,
+
+);
diff --git a/tests/codestyle/fixtures/noExtraBlankLines/expected.php b/tests/codestyle/fixtures/noExtraBlankLines/expected.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+$a = [
+    1,
+    2,
+];
+
+function b(): int
+{
+    $a = 1;
+
+    return $a;
+}
+
+function c(int $a, int $b, int $c): int
+{
+    return $a + $b + $c;
+}
+
+$d = c(
+    1,
+    2,
+    3,
+);
diff --git a/tests/unit/AdditionalRulesConfigurationTest.php b/tests/unit/AdditionalRulesConfigurationTest.php
@@ -53,7 +53,14 @@ public function testAdditionalRulesConfiguration(): void
                         "author",
                     ],
                 ],
-                NoExtraBlankLinesFixer::class => null,
+                NoExtraBlankLinesFixer::class => [
+                    "tokens" => [
+                        "extra",
+                        "curly_brace_block",
+                        "parenthesis_brace_block",
+                        "square_brace_block",
+                    ],
+                ],
                 OperatorSpacingSniff::class => null,
                 TrailingCommaInMultilineFixer::class => [
                     "elements" => [
@@ -100,7 +107,14 @@ public function testFilteringAdditionalRulesConfiguration(): void
                         "author",
                     ],
                 ],
-                NoExtraBlankLinesFixer::class => null,
+                NoExtraBlankLinesFixer::class => [
+                    "tokens" => [
+                        "extra",
+                        "curly_brace_block",
+                        "parenthesis_brace_block",
+                        "square_brace_block",
+                    ],
+                ],
                 OperatorSpacingSniff::class => null,
                 TrailingCommaInMultilineFixer::class => [
                     "elements" => [
@@ -144,7 +158,14 @@ public function testExtendingAdditionalRulesConfiguration(): void
                         "author",
                     ],
                 ],
-                NoExtraBlankLinesFixer::class => null,
+                NoExtraBlankLinesFixer::class => [
+                    "tokens" => [
+                        "extra",
+                        "curly_brace_block",
+                        "parenthesis_brace_block",
+                        "square_brace_block",
+                    ],
+                ],
                 OperatorSpacingSniff::class => null,
                 TrailingCommaInMultilineFixer::class => [
                     "elements" => [
@@ -196,7 +217,14 @@ public function testExtendingWithOptionsAdditionalRulesConfiguration(): void
                         "author",
                     ],
                 ],
-                NoExtraBlankLinesFixer::class => null,
+                NoExtraBlankLinesFixer::class => [
+                    "tokens" => [
+                        "extra",
+                        "curly_brace_block",
+                        "parenthesis_brace_block",
+                        "square_brace_block",
+                    ],
+                ],
                 OperatorSpacingSniff::class => null,
                 TrailingCommaInMultilineFixer::class => [
                     "elements" => [