Updated ECS to commit 9ead38096a2af3c28540a00c14e4d3137e883fea

TomasVotruba · TomasVotruba · commit 2105622c6b44 · 2026-06-20T14:56:59.000Z
diff --git a/README.md b/README.md
@@ -89,6 +89,42 @@ return ECSConfig::configure()
 
 <br>
 
+### Prepared Sets
+
+`->withPreparedSets()` bundles curated rule sets. Enable the whole `common` set, or pick single topics:
+
+```php
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return ECSConfig::configure()
+    ->withPaths([__DIR__ . '/src', __DIR__ . '/tests'])
+    ->withPreparedSets(
+        arrays: true,
+        spaces: true,
+        namespaces: true,
+        docblocks: true,
+        controlStructures: true,
+        comments: true,
+        casing: true,
+        cleanup: true,
+    );
+```
+
+| Set | What it covers |
+| --- | --- |
+| `arrays` | array syntax, spacing, trailing commas, indentation |
+| `spaces` | whitespace, operator/type spacing, blank lines |
+| `namespaces` | imports ordering, unused/needless-alias imports |
+| `docblocks` | phpdoc tags, types, alignment, cleanup |
+| `controlStructures` | control flow, casing, operators, class structure |
+| `comments` | comment style, spacing, empty-comment cleanup |
+| `casing` | native function/type, magic method, literal casing |
+| `cleanup` | dead statements, useless returns/casts, unused closure imports |
+
+Or enable everything at once with `->withPreparedSets(common: true)`.
+
+<br>
+
 Do you want to include one of sets from [php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst)?
 
 You can:
diff --git a/bin/ecs.php b/bin/ecs.php
@@ -17,7 +17,7 @@
 // performance boost
 \gc_disable();
 \define('__ECS_RUNNING__', \true);
-# 1. autoload
+// 1. autoload
 $autoloadIncluder = new ECSAutoloadIncluder();
 $autoloadIncluder->includeCwdVendorAutoloadIfExists();
 $autoloadIncluder->loadIfNotLoadedYet(__DIR__ . '/../vendor/scoper-autoload.php');
diff --git a/config/set/common.php b/config/set/common.php
@@ -5,4 +5,4 @@
 
 use Symplify\EasyCodingStandard\Config\ECSConfig;
 use Symplify\EasyCodingStandard\ValueObject\Set\SetList;
-return ECSConfig::configure()->withSets([SetList::ARRAY, SetList::COMMENTS, SetList::CONTROL_STRUCTURES, SetList::DOCBLOCK, SetList::NAMESPACES, SetList::SPACES, SetList::CLEAN_CODE]);
+return ECSConfig::configure()->withSets([SetList::ARRAY, SetList::COMMENTS, SetList::CONTROL_STRUCTURES, SetList::DOCBLOCK, SetList::NAMESPACES, SetList::SPACES, SetList::CASING, SetList::CLEANUP, SetList::CLEAN_CODE]);
diff --git a/config/set/common/casing.php b/config/set/common/casing.php
@@ -0,0 +1,12 @@
+<?php
+
+declare (strict_types=1);
+namespace ECSPrefix202606;
+
+use PhpCsFixer\Fixer\Casing\ClassReferenceNameCasingFixer;
+use PhpCsFixer\Fixer\Casing\IntegerLiteralCaseFixer;
+use PhpCsFixer\Fixer\Casing\MagicMethodCasingFixer;
+use PhpCsFixer\Fixer\Casing\NativeFunctionCasingFixer;
+use PhpCsFixer\Fixer\Casing\NativeTypeDeclarationCasingFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+return ECSConfig::configure()->withRules([NativeFunctionCasingFixer::class, NativeTypeDeclarationCasingFixer::class, IntegerLiteralCaseFixer::class, MagicMethodCasingFixer::class, ClassReferenceNameCasingFixer::class]);
diff --git a/config/set/common/cleanup.php b/config/set/common/cleanup.php
@@ -0,0 +1,12 @@
+<?php
+
+declare (strict_types=1);
+namespace ECSPrefix202606;
+
+use PhpCsFixer\Fixer\CastNotation\NoShortBoolCastFixer;
+use PhpCsFixer\Fixer\ClassNotation\NoNullPropertyInitializationFixer;
+use PhpCsFixer\Fixer\FunctionNotation\LambdaNotUsedImportFixer;
+use PhpCsFixer\Fixer\ReturnNotation\NoUselessReturnFixer;
+use PhpCsFixer\Fixer\Semicolon\NoEmptyStatementFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+return ECSConfig::configure()->withRules([NoEmptyStatementFixer::class, NoUselessReturnFixer::class, LambdaNotUsedImportFixer::class, NoNullPropertyInitializationFixer::class, NoShortBoolCastFixer::class]);
diff --git a/config/set/common/comments.php b/config/set/common/comments.php
@@ -4,5 +4,9 @@
 namespace ECSPrefix202606;
 
 use PHP_CodeSniffer\Standards\Generic\Sniffs\VersionControl\GitMergeConflictSniff;
+use PhpCsFixer\Fixer\Comment\MultilineCommentOpeningClosingFixer;
+use PhpCsFixer\Fixer\Comment\NoEmptyCommentFixer;
+use PhpCsFixer\Fixer\Comment\SingleLineCommentSpacingFixer;
+use PhpCsFixer\Fixer\Comment\SingleLineCommentStyleFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-return ECSConfig::configure()->withRules([GitMergeConflictSniff::class]);
+return ECSConfig::configure()->withRules([GitMergeConflictSniff::class, NoEmptyCommentFixer::class, SingleLineCommentSpacingFixer::class, SingleLineCommentStyleFixer::class, MultilineCommentOpeningClosingFixer::class]);
diff --git a/config/set/common/namespaces.php b/config/set/common/namespaces.php
@@ -3,8 +3,9 @@
 declare (strict_types=1);
 namespace ECSPrefix202606;
 
+use PhpCsFixer\Fixer\Import\NoUnneededImportAliasFixer;
 use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer;
 use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 use PhpCsFixer\Fixer\NamespaceNotation\SingleBlankLineBeforeNamespaceFixer;
 use Symplify\EasyCodingStandard\Config\ECSConfig;
-return ECSConfig::configure()->withRules([NoUnusedImportsFixer::class, OrderedImportsFixer::class, SingleBlankLineBeforeNamespaceFixer::class]);
+return ECSConfig::configure()->withRules([NoUnusedImportsFixer::class, OrderedImportsFixer::class, SingleBlankLineBeforeNamespaceFixer::class, NoUnneededImportAliasFixer::class]);
diff --git a/src/Application/Version/StaticVersionResolver.php b/src/Application/Version/StaticVersionResolver.php
@@ -15,12 +15,12 @@ final class StaticVersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '220941af384db6dff23ab93bf535276ded572ba1';
+    public const PACKAGE_VERSION = '9ead38096a2af3c28540a00c14e4d3137e883fea';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2026-06-20 14:10:29';
+    public const RELEASE_DATE = '2026-06-20 14:54:26';
     /**
      * @var int
      */
diff --git a/src/Config/ECSConfig.php b/src/Config/ECSConfig.php
@@ -170,7 +170,7 @@ public function reportingRealPath(bool $absolute = \true): void
         SimpleParameterProvider::setParameter(Option::REPORTING_REALPATH, $absolute);
     }
     /**
-     * @link https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst
+     * @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst
      * @param string[] $setNames
      */
     public function dynamicSets(array $setNames): void
diff --git a/src/Config/Level/ArrayLevel.php b/src/Config/Level/ArrayLevel.php
@@ -5,12 +5,15 @@
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
+use PhpCsFixer\Fixer\ArrayNotation\NoMultilineWhitespaceAroundDoubleArrowFixer;
 use PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceBeforeCommaInArrayFixer;
+use PhpCsFixer\Fixer\ArrayNotation\NoWhitespaceInEmptyArrayFixer;
 use PhpCsFixer\Fixer\ArrayNotation\TrimArraySpacesFixer;
 use PhpCsFixer\Fixer\ArrayNotation\WhitespaceAfterCommaInArrayFixer;
 use PhpCsFixer\Fixer\Basic\NoTrailingCommaInSinglelineFixer;
 use PhpCsFixer\Fixer\ControlStructure\TrailingCommaInMultilineFixer;
 use PhpCsFixer\Fixer\FixerInterface;
+use PhpCsFixer\Fixer\ListNotation\ListSyntaxFixer;
 use PhpCsFixer\Fixer\Whitespace\ArrayIndentationFixer;
 use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayListItemNewlineFixer;
 use Symplify\CodingStandard\Fixer\ArrayNotation\ArrayOpenerAndCloserNewlineFixer;
@@ -32,9 +35,12 @@ final class ArrayLevel
         NoWhitespaceBeforeCommaInArrayFixer::class,
         WhitespaceAfterCommaInArrayFixer::class,
         TrimArraySpacesFixer::class,
+        NoWhitespaceInEmptyArrayFixer::class,
+        NoMultilineWhitespaceAroundDoubleArrowFixer::class,
         NoTrailingCommaInSinglelineFixer::class,
         // syntax normalization
         ArraySyntaxFixer::class,
+        ListSyntaxFixer::class,
         TrailingCommaInMultilineFixer::class,
         // invasive layout changes
         ArrayIndentationFixer::class,
@@ -45,5 +51,5 @@ final class ArrayLevel
     /**
      * @var array<class-string<Sniff|FixerInterface>, mixed[]>
      */
-    public const RULE_CONFIGURATIONS = [NoTrailingCommaInSinglelineFixer::class => ['elements' => ['arguments', 'array_destructuring', 'array', 'group_import']], ArraySyntaxFixer::class => ['syntax' => 'short'], TrailingCommaInMultilineFixer::class => ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_ARRAYS]]];
+    public const RULE_CONFIGURATIONS = [NoTrailingCommaInSinglelineFixer::class => ['elements' => ['arguments', 'array_destructuring', 'array', 'group_import']], ArraySyntaxFixer::class => ['syntax' => 'short'], ListSyntaxFixer::class => ['syntax' => 'short'], TrailingCommaInMultilineFixer::class => ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_ARRAYS]]];
 }
diff --git a/src/Config/Level/ControlStructuresLevel.php b/src/Config/Level/ControlStructuresLevel.php
@@ -9,14 +9,27 @@
 use PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer;
 use PhpCsFixer\Fixer\ClassNotation\SelfAccessorFixer;
 use PhpCsFixer\Fixer\ClassNotation\SingleClassElementPerStatementFixer;
+use PhpCsFixer\Fixer\ControlStructure\IncludeFixer;
+use PhpCsFixer\Fixer\ControlStructure\NoAlternativeSyntaxFixer;
+use PhpCsFixer\Fixer\ControlStructure\NoSuperfluousElseifFixer;
 use PhpCsFixer\Fixer\ControlStructure\NoUselessElseFixer;
+use PhpCsFixer\Fixer\ControlStructure\SimplifiedIfReturnFixer;
+use PhpCsFixer\Fixer\ControlStructure\SwitchContinueToBreakFixer;
 use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
 use PhpCsFixer\Fixer\FixerInterface;
+use PhpCsFixer\Fixer\FunctionNotation\NullableTypeDeclarationForDefaultNullValueFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\ExplicitIndirectVariableFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\FunctionToConstantFixer;
 use PhpCsFixer\Fixer\LanguageConstruct\IsNullFixer;
+use PhpCsFixer\Fixer\Operator\AssignNullCoalescingToCoalesceEqualFixer;
+use PhpCsFixer\Fixer\Operator\LongToShorthandOperatorFixer;
 use PhpCsFixer\Fixer\Operator\NewWithBracesFixer;
+use PhpCsFixer\Fixer\Operator\NoUselessConcatOperatorFixer;
+use PhpCsFixer\Fixer\Operator\NoUselessNullsafeOperatorFixer;
+use PhpCsFixer\Fixer\Operator\ObjectOperatorWithoutWhitespaceFixer;
 use PhpCsFixer\Fixer\Operator\StandardizeIncrementFixer;
+use PhpCsFixer\Fixer\Operator\StandardizeNotEqualsFixer;
+use PhpCsFixer\Fixer\Operator\TernaryToNullCoalescingFixer;
 use PhpCsFixer\Fixer\PhpUnit\PhpUnitMethodCasingFixer;
 use PhpCsFixer\Fixer\StringNotation\ExplicitStringVariableFixer;
 use PhpCsFixer\Fixer\StringNotation\SingleQuoteFixer;
@@ -42,16 +55,31 @@ final class ControlStructuresLevel
         FunctionToConstantFixer::class,
         StandardizeIncrementFixer::class,
         NewWithBracesFixer::class,
+        NullableTypeDeclarationForDefaultNullValueFixer::class,
+        // operator spacing and simplification
+        ObjectOperatorWithoutWhitespaceFixer::class,
+        StandardizeNotEqualsFixer::class,
+        NoUselessConcatOperatorFixer::class,
+        NoUselessNullsafeOperatorFixer::class,
+        LongToShorthandOperatorFixer::class,
+        TernaryToNullCoalescingFixer::class,
+        AssignNullCoalescingToCoalesceEqualFixer::class,
         // string and variable handling
         ExplicitStringVariableFixer::class,
         ExplicitIndirectVariableFixer::class,
         // class-level tweaks
         SelfAccessorFixer::class,
         ClassDefinitionFixer::class,
         SingleClassElementPerStatementFixer::class,
+        // control-flow normalization
+        IncludeFixer::class,
+        NoAlternativeSyntaxFixer::class,
+        NoSuperfluousElseifFixer::class,
+        SwitchContinueToBreakFixer::class,
         // invasive control-flow / ordering changes
         YodaStyleFixer::class,
         NoUselessElseFixer::class,
+        SimplifiedIfReturnFixer::class,
         OrderedClassElementsFixer::class,
     ];
     /**
diff --git a/src/Config/Level/DocblockLevel.php b/src/Config/Level/DocblockLevel.php
@@ -6,12 +6,22 @@
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PhpCsFixer\Fixer\Comment\NoTrailingWhitespaceInCommentFixer;
 use PhpCsFixer\Fixer\FixerInterface;
+use PhpCsFixer\Fixer\Phpdoc\AlignMultilineCommentFixer;
+use PhpCsFixer\Fixer\Phpdoc\NoBlankLinesAfterPhpdocFixer;
 use PhpCsFixer\Fixer\Phpdoc\NoEmptyPhpdocFixer;
 use PhpCsFixer\Fixer\Phpdoc\NoSuperfluousPhpdocTagsFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocIndentFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocInlineTagNormalizerFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocLineSpanFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocNoAccessFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocNoAliasTagFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocNoDuplicateTypesFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocNoEmptyReturnFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocNoPackageFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocOrderByValueFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocReturnSelfReferenceFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer;
+use PhpCsFixer\Fixer\Phpdoc\PhpdocTagCasingFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTrimConsecutiveBlankLineSeparationFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTrimFixer;
 use PhpCsFixer\Fixer\Phpdoc\PhpdocTypesFixer;
@@ -61,12 +71,22 @@ final class DocblockLevel
         PhpdocTrimFixer::class,
         PhpdocTrimConsecutiveBlankLineSeparationFixer::class,
         PhpdocIndentFixer::class,
+        NoBlankLinesAfterPhpdocFixer::class,
+        AlignMultilineCommentFixer::class,
         // type / formatting normalization
+        PhpdocTagCasingFixer::class,
+        PhpdocInlineTagNormalizerFixer::class,
+        PhpdocNoDuplicateTypesFixer::class,
+        PhpdocScalarFixer::class,
         PhpdocTypesFixer::class,
         PhpdocLineSpanFixer::class,
         PhpdocVarWithoutNameFixer::class,
         PhpdocReturnSelfReferenceFixer::class,
+        PhpdocOrderByValueFixer::class,
         // dropping content
+        PhpdocNoAliasTagFixer::class,
+        PhpdocNoAccessFixer::class,
+        PhpdocNoPackageFixer::class,
         NoEmptyPhpdocFixer::class,
         PhpdocNoEmptyReturnFixer::class,
         RemoveUselessDefaultCommentFixer::class,
diff --git a/src/Config/Level/SpacesLevel.php b/src/Config/Level/SpacesLevel.php
@@ -27,6 +27,7 @@
 use PhpCsFixer\Fixer\Whitespace\NoSpacesAroundOffsetFixer;
 use PhpCsFixer\Fixer\Whitespace\NoWhitespaceInBlankLineFixer;
 use PhpCsFixer\Fixer\Whitespace\TypeDeclarationSpacesFixer;
+use PhpCsFixer\Fixer\Whitespace\TypesSpacesFixer;
 use Symplify\CodingStandard\Fixer\Spacing\StandaloneLinePromotedPropertyFixer;
 /**
  * Key 0 = level 0
@@ -62,6 +63,7 @@ final class SpacesLevel
         TernaryOperatorSpacesFixer::class,
         ReturnTypeDeclarationFixer::class,
         TypeDeclarationSpacesFixer::class,
+        TypesSpacesFixer::class,
         SuperfluousWhitespaceSniff::class,
         // configurable, more impactful
         ConcatSpaceFixer::class,
diff --git a/src/Configuration/ECSConfigBuilder.php b/src/Configuration/ECSConfigBuilder.php
@@ -56,7 +56,7 @@ final class ECSConfigBuilder
      */
     private $rules = [];
     /**
-     * @var array<class-string<(FixerInterface | Sniff)>, mixed>
+     * @var array<class-string<(FixerInterface|Sniff)>, mixed>
      */
     private $rulesWithConfiguration = [];
     /**
@@ -222,6 +222,10 @@ public function withPreparedSets(
         bool $namespaces = \false,
         /** @see SetList::CONTROL_STRUCTURES */
         bool $controlStructures = \false,
+        /** @see SetList::CASING */
+        bool $casing = \false,
+        /** @see SetList::CLEANUP */
+        bool $cleanup = \false,
         /**
          * @deprecated as never worked, used different rules. Use Rector instead.
          * @see SetList::PHPUNIT
@@ -245,7 +249,7 @@ public function withPreparedSets(
         if ($common) {
             // include all "common" sets
             $this->sets[] = SetList::COMMON;
-            if (($alreadyIncludedSets = array_keys(array_filter(['arrays' => $arrays, 'spaces' => $spaces, 'namespaces' => $namespaces, 'docblocks' => $docblocks, 'controlStructures' => $controlStructures, 'comments' => $comments]))) !== []) {
+            if (($alreadyIncludedSets = array_keys(array_filter(['arrays' => $arrays, 'spaces' => $spaces, 'namespaces' => $namespaces, 'docblocks' => $docblocks, 'controlStructures' => $controlStructures, 'comments' => $comments, 'casing' => $casing, 'cleanup' => $cleanup]))) !== []) {
                 throw new SuperfluousConfigurationException(sprintf('The following sets are already included in the "common" set: %s. Please remove them.', implode(', ', $alreadyIncludedSets)));
             }
         } else {
@@ -270,6 +274,12 @@ public function withPreparedSets(
             if ($comments) {
                 $this->sets[] = SetList::COMMENTS;
             }
+            if ($casing) {
+                $this->sets[] = SetList::CASING;
+            }
+            if ($cleanup) {
+                $this->sets[] = SetList::CLEANUP;
+            }
         }
         if ($strict) {
             // throw exception, as deprecated
@@ -524,7 +534,7 @@ public function withSpacing(?string $indentation = null, ?string $lineEnding = n
         return $this;
     }
     /**
-     * @param class-string<(FixerInterface | Sniff)> $checkerClass
+     * @param class-string<(FixerInterface|Sniff)> $checkerClass
      * @param mixed[] $configuration
      */
     public function withConfiguredRule(string $checkerClass, array $configuration): self
diff --git a/src/ValueObject/Set/SetList.php b/src/ValueObject/Set/SetList.php
@@ -70,6 +70,16 @@ final class SetList
      * @var string
      */
     public const STRICT = __DIR__ . '/../../../config/set/common/strict.php';
+    /**
+     * @api
+     * @var string
+     */
+    public const CASING = __DIR__ . '/../../../config/set/common/casing.php';
+    /**
+     * @api
+     * @var string
+     */
+    public const CLEANUP = __DIR__ . '/../../../config/set/common/cleanup.php';
     /**
      * @api
      * @var string
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public function reportingRealPath(bool $absolute = \true): void`
`170`	`170`	`SimpleParameterProvider::setParameter(Option::REPORTING_REALPATH, $absolute);`
`171`	`171`	`}`
`172`	`172`	`/**`
`173`		`- * @link https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst`
	`173`	`+ * @see https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/doc/ruleSets/index.rst`
`174`	`174`	`* @param string[] $setNames`
`175`	`175`	`*/`
`176`	`176`	`public function dynamicSets(array $setNames): void`