bumpi

config/ecs.php

@@ -1,6 +1,10 @@
 <?php declare(strict_types=1);
 
+use PhpCsFixer\Fixer\AttributeNotation\OrderedAttributesFixer;
 use PhpCsFixer\Fixer\ClassNotation\ClassAttributesSeparationFixer;
+use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
+use PhpCsFixer\Fixer\ClassNotation\OrderedInterfacesFixer;
+use PhpCsFixer\Fixer\ClassNotation\OrderedTraitsFixer;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer;
 use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
@@ -19,7 +23,7 @@ use SlevomatCodingStandard\Sniffs\Namespaces\NamespaceSpacingSniff;
 use SlevomatCodingStandard\Sniffs\Namespaces\ReferenceUsedNamesOnlySniff;
 use SlevomatCodingStandard\Sniffs\Namespaces\UseSpacingSniff;
 use SlevomatCodingStandard\Sniffs\TypeHints\DeclareStrictTypesSniff;
-use SlevomatCodingStandard\Sniffs\TypeHints\UnionTypeHintFormatSniff;
+use SlevomatCodingStandard\Sniffs\TypeHints\DNFTypeHintFormatSniff;
 use Symplify\CodingStandard\Fixer\LineLength\LineLengthFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 
@@ -49,6 +53,9 @@ return ECSConfig::configure()
         OperatorLinebreakFixer::class,
         NoWhitespaceInBlankLineFixer::class,
         NewWithoutParenthesesSniff::class,
+        OrderedAttributesFixer::class,
+        OrderedTraitsFixer::class,
+        OrderedInterfacesFixer::class,
     ])
     ->withConfiguredRule(ClassConstantVisibilitySniff::class, [
         'fixable' => true,
@@ -67,6 +74,9 @@ return ECSConfig::configure()
             'searchAnnotations' => true,
         ]
     )
+    ->withConfiguredRule(OrderedClassElementsFixer::class, [
+        'sort_algorithm' => 'alpha',
+    ])
 
     // define newlines between use statements
     ->withConfiguredRule(
@@ -96,11 +106,11 @@ return ECSConfig::configure()
         ]
     )
     ->withConfiguredRule(
-        UnionTypeHintFormatSniff::class,
+        DNFTypeHintFormatSniff::class,
         [
             'nullPosition' => 'last',
             'shortNullable' => 'no',
-            'withSpaces' => 'no',
+            'withSpacesAroundOperators' => 'no',
         ]
     )
     ->withConfiguredRule(