Update ruleset for PHP 8.1 support (#111)

zingimmick · Dec 17, 2021 · bdc1403 · bdc1403
1 parent 6028673
commit bdc1403
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/config/set/php-cs-fixer/laravel.php b/config/set/php-cs-fixer/laravel.php
@@ -40,6 +40,7 @@
         ]);
     $services->set(\PhpCsFixer\Fixer\Basic\BracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer::class);
+    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer::class)
         ->call('configure', [
             [
@@ -71,7 +72,6 @@
             ],
         ]);
     $services->set(\PhpCsFixer\Fixer\PhpTag\BlankLineAfterOpeningTagFixer::class);
-    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\ConcatSpaceFixer::class)
         ->call('configure', [

diff --git a/config/set/php-cs-fixer/php-cs-fixer-risky.php b/config/set/php-cs-fixer/php-cs-fixer-risky.php
@@ -19,9 +19,9 @@
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\ImplodeCallFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\CombineNestedDirnameFixer::class);
     $services->set(\PhpCsFixer\Fixer\Alias\PowToExponentiationFixer::class);
+    $services->set(\PhpCsFixer\Fixer\Strict\StrictParamFixer::class);
     $services->set(\PhpCsFixer\Fixer\Comment\CommentToPhpdocFixer::class);
     $services->set(\PhpCsFixer\Fixer\LanguageConstruct\NoUnsetOnPropertyFixer::class);
-    $services->set(\PhpCsFixer\Fixer\Strict\StrictParamFixer::class);
     $services->set(\PhpCsFixer\Fixer\ConstantNotation\NativeConstantInvocationFixer::class)
         ->call('configure', [
             [

diff --git a/config/set/php-cs-fixer/php-cs-fixer.php b/config/set/php-cs-fixer/php-cs-fixer.php
@@ -34,6 +34,7 @@
     $services->set(\PhpCsFixer\Fixer\ControlStructure\EmptyLoopBodyFixer::class);
     $services->set(\PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer::class);
     $services->set(\PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer::class);
+    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer::class)
         ->call('configure', [
             [
@@ -50,6 +51,7 @@
             ],
         ]);
     $services->set(\PhpCsFixer\Fixer\Whitespace\MethodChainingIndentationFixer::class);
+    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer::class)
         ->call('configure', [
@@ -113,7 +115,6 @@
     $services->set(\PhpCsFixer\Fixer\Whitespace\NoSpacesInsideParenthesisFixer::class);
     $services->set(\PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer::class);
     $services->set(\PhpCsFixer\Fixer\ControlStructure\EmptyLoopConditionFixer::class);
-    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\StandardizeIncrementFixer::class);
     $services->set(\PhpCsFixer\Fixer\PhpTag\BlankLineAfterOpeningTagFixer::class);
     $services->set(\PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer::class);
@@ -167,7 +168,6 @@
     $services->set(\PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Casing\LowercaseStaticReferenceFixer::class);
-    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer::class);

diff --git a/config/set/php-cs-fixer/psr12.php b/config/set/php-cs-fixer/psr12.php
@@ -23,6 +23,7 @@
     $services->set(\PhpCsFixer\Fixer\Whitespace\IndentationTypeFixer::class);
     $services->set(\PhpCsFixer\Fixer\ControlStructure\ElseifFixer::class);
     $services->set(\PhpCsFixer\Fixer\Whitespace\LineEndingFixer::class);
+    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer::class)
         ->call('configure', [
             [
@@ -61,7 +62,6 @@
     $services->set(\PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Casing\LowercaseStaticReferenceFixer::class);
-    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer::class);

diff --git a/config/set/php-cs-fixer/symfony.php b/config/set/php-cs-fixer/symfony.php
@@ -41,6 +41,7 @@
                 'style' => 'braces',
             ],
         ]);
+    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\ClassDefinitionFixer::class)
         ->call('configure', [
             [
@@ -58,6 +59,7 @@
             ],
         ]);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\FunctionDeclarationFixer::class);
+    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer::class)
         ->call('configure', [
             [
@@ -116,13 +118,11 @@
     $services->set(\PhpCsFixer\Fixer\Import\SingleImportPerStatementFixer::class);
     $services->set(\PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer::class);
     $services->set(\PhpCsFixer\Fixer\ControlStructure\EmptyLoopConditionFixer::class);
-    $services->set(\PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\StandardizeIncrementFixer::class);
     $services->set(\PhpCsFixer\Fixer\Whitespace\CompactNullableTypehintFixer::class);
     $services->set(\PhpCsFixer\Fixer\LanguageConstruct\DeclareEqualNormalizeFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\LowercaseCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Casing\LowercaseStaticReferenceFixer::class);
-    $services->set(\PhpCsFixer\Fixer\Operator\NewWithBracesFixer::class);
     $services->set(\PhpCsFixer\Fixer\ClassNotation\NoBlankLinesAfterClassOpeningFixer::class);
     $services->set(\PhpCsFixer\Fixer\CastNotation\ShortScalarCastFixer::class);
     $services->set(\PhpCsFixer\Fixer\Operator\TernaryOperatorSpacesFixer::class);