Update rules (#25)

kubawerlos · Jan 21, 2022 · 623df12 · 623df12
1 parent c852cb1
commit 623df12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/Builder/Modifier/NonDefaultConfiguration.php b/src/Builder/Modifier/NonDefaultConfiguration.php
@@ -12,7 +12,6 @@
 namespace PhpCsFixerConfig\Builder\Modifier;
 
 use PhpCsFixer\Fixer\Whitespace\NoExtraBlankLinesFixer;
-use PhpCsFixerCustomFixers\Fixer\NoSuperfluousConcatenationFixer;
 
 /**
  * @internal
@@ -41,7 +40,6 @@ public function __invoke(array $rules): array
         $rules['phpdoc_line_span'] = ['property' => 'single'];
         $rules['trailing_comma_in_multiline'] = ['after_heredoc' => true, 'elements' => ['arguments', 'arrays', 'parameters']];
         $rules['yoda_style'] = ['equal' => false, 'identical' => false, 'less_and_greater' => false];
-        $rules[NoSuperfluousConcatenationFixer::name()] = ['allow_preventing_trailing_spaces' => true];
 
         return $rules;
     }

diff --git a/src/Builder/Modifier/UnwantedRulesFilter.php b/src/Builder/Modifier/UnwantedRulesFilter.php
@@ -17,11 +17,13 @@
 final class UnwantedRulesFilter
 {
     private const UNWANTED_RULES = [
+        'blank_line_after_opening_tag',
         'combine_consecutive_issets',
         'combine_consecutive_unsets',
         'general_phpdoc_annotation_remove',
         'global_namespace_import',
         'group_import',
+        'linebreak_after_opening_tag',
         'no_blank_lines_before_namespace',
         'not_operator_with_space',
         'not_operator_with_successor_space',

diff --git a/src/Rules/LibraryRules.php b/src/Rules/LibraryRules.php
@@ -50,7 +50,7 @@ public function getRules(): array
             'backtick_to_shell_exec' => true,
             'binary_operator_spaces' => true,
             'blank_line_after_namespace' => true,
-            'blank_line_after_opening_tag' => true,
+            'blank_line_after_opening_tag' => false,
             'blank_line_before_statement' => [
                 'statements' => [
                     'return',
@@ -132,7 +132,7 @@ public function getRules(): array
             'is_null' => true,
             'lambda_not_used_import' => true,
             'line_ending' => true,
-            'linebreak_after_opening_tag' => true,
+            'linebreak_after_opening_tag' => false,
             'list_syntax' => true,
             'logical_operators' => true,
             'lowercase_cast' => true,
@@ -367,9 +367,7 @@ public function getRules(): array
             Fixer\NoNullableBooleanTypeFixer::name() => false,
             Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
             Fixer\NoReferenceInFunctionDefinitionFixer::name() => true,
-            Fixer\NoSuperfluousConcatenationFixer::name() => [
-                'allow_preventing_trailing_spaces' => true,
-            ],
+            Fixer\NoSuperfluousConcatenationFixer::name() => true,
             Fixer\NoTrailingCommaInSinglelineFixer::name() => true,
             Fixer\NoUselessCommentFixer::name() => true,
             Fixer\NoUselessDirnameCallFixer::name() => true,

diff --git a/src/Rules/ProjectRules.php b/src/Rules/ProjectRules.php
@@ -31,7 +31,7 @@ public function getRules(): array
             'backtick_to_shell_exec' => true,
             'binary_operator_spaces' => true,
             'blank_line_after_namespace' => true,
-            'blank_line_after_opening_tag' => true,
+            'blank_line_after_opening_tag' => false,
             'blank_line_before_statement' => [
                 'statements' => [
                     'return',
@@ -110,7 +110,7 @@ public function getRules(): array
             'is_null' => true,
             'lambda_not_used_import' => true,
             'line_ending' => true,
-            'linebreak_after_opening_tag' => true,
+            'linebreak_after_opening_tag' => false,
             'list_syntax' => true,
             'logical_operators' => true,
             'lowercase_cast' => true,
@@ -345,9 +345,7 @@ public function getRules(): array
             Fixer\NoNullableBooleanTypeFixer::name() => true,
             Fixer\NoPhpStormGeneratedCommentFixer::name() => true,
             Fixer\NoReferenceInFunctionDefinitionFixer::name() => true,
-            Fixer\NoSuperfluousConcatenationFixer::name() => [
-                'allow_preventing_trailing_spaces' => true,
-            ],
+            Fixer\NoSuperfluousConcatenationFixer::name() => true,
             Fixer\NoTrailingCommaInSinglelineFixer::name() => true,
             Fixer\NoUselessCommentFixer::name() => true,
             Fixer\NoUselessDirnameCallFixer::name() => true,