Refactor

Auto enable custom fixers.

Author: ruudk

src/Fixers.php

@@ -9,14 +9,17 @@
 final readonly class Fixers
 {
     /**
-     * @var list<FixerInterface>
+     * @var array<class-string<FixerInterface>, FixerInterface>
      */
     public array $value;
 
     public function __construct(
         FixerInterface ...$value,
     ) {
-        $this->value = array_values($value);
+        $this->value = array_combine(
+            array_map(fn($fixer) => $fixer::class, $value),
+            array_values($value),
+        );
     }
 
     public function merge(self $customFixers) : self

src/NameWrapper.php

@@ -14,7 +14,6 @@
 {
     public function __construct(
         private FixerInterface $inner,
-        private string $name,
     ) {}
 
     #[Override]
@@ -44,7 +43,7 @@ public function getDefinition() : FixerDefinitionInterface
     #[Override]
     public function getName() : string
     {
-        return $this->name;
+        return 'Custom/' . str_replace('\\', '_', strtolower($this->inner->getName()));
     }
 
     #[Override]

src/PhpCsFixerConfigFactory.php

@@ -17,7 +17,7 @@ final class PhpCsFixerConfigFactory
      */
     public static function create(RuleSet $ruleSet) : Config
     {
-        $config = new Config($ruleSet->name);
+        $config = new Config();
 
         $config->setUnsupportedPhpVersionAllowed(true);
         $config->registerCustomFixers($ruleSet->customFixers->value);

src/RuleSet.php

@@ -6,11 +6,22 @@
 
 final readonly class RuleSet
 {
+    public Fixers $customFixers;
+    public Rules $rules;
+
     public function __construct(
-        public Fixers $customFixers,
-        public string $name,
-        public Rules $rules,
-    ) {}
+        Fixers $customFixers,
+        Rules $rules,
+    ) {
+        $this->customFixers = $customFixers;
+
+        $enable = [];
+        foreach ($customFixers->value as $customFixer) {
+            $enable[$customFixer->getName()] = true;
+        }
+
+        $this->rules = new Rules($enable)->merge($rules);
+    }
 
     /**
      * Returns a new rule set with custom fixers.
@@ -19,7 +30,6 @@ public function withCustomFixers(Fixers $customFixers) : self
     {
         return new self(
             $this->customFixers->merge($customFixers),
-            $this->name,
             $this->rules,
         );
     }
@@ -31,8 +41,15 @@ public function withRules(Rules $rules) : self
     {
         return new self(
             $this->customFixers,
-            $this->name,
             $this->rules->merge($rules),
         );
     }
+
+    public function merge(self $other) : self
+    {
+        return new self(
+            $this->customFixers->merge($other->customFixers),
+            $this->rules->merge($other->rules),
+        );
+    }
 }

src/RuleSet/TicketSwapRuleSet.php

@@ -53,35 +53,13 @@ public static function create() : RuleSet
 
         return new RuleSet(
             new Fixers(
-                new NameWrapper(
-                    new LineBreakAfterStatementsFixer(),
-                    'ErickSkrauch/line_break_after_statements',
-                ),
-                new NameWrapper(
-                    new ArrayListItemNewlineFixer($arrayItemNewliner, $arrayAnalyzer, $arrayBlockInfoFinder),
-                    'Symplify/array_list_item_newline_fixer',
-                ),
-                new NameWrapper(
-                    new ArrayOpenerAndCloserNewlineFixer($arrayBlockInfoFinder, $whitespacesFixerConfig, $arrayAnalyzer),
-                    'Symplify/array_opener_and_closer_newline_fixer',
-                ),
-                new NameWrapper(
-                    new StandaloneLineInMultilineArrayFixer($arrayWrapperFactory, $tokensNewliner, $blockfinder),
-                    'Symplify/standalone_line_in_multiline_array_fixer',
-                ),
-                new NameWrapper(
-                    new StandaloneLineConstructorParamFixer($paramNewliner, $methodNameResolver),
-                    'Symplify/standalone_line_constructor_param_fixer',
-                ),
+                new LineBreakAfterStatementsFixer(),
+                new NameWrapper(new ArrayListItemNewlineFixer($arrayItemNewliner, $arrayAnalyzer, $arrayBlockInfoFinder)),
+                new NameWrapper(new ArrayOpenerAndCloserNewlineFixer($arrayBlockInfoFinder, $whitespacesFixerConfig, $arrayAnalyzer)),
+                new NameWrapper(new StandaloneLineInMultilineArrayFixer($arrayWrapperFactory, $tokensNewliner, $blockfinder)),
+                new NameWrapper(new StandaloneLineConstructorParamFixer($paramNewliner, $methodNameResolver)),
             ),
-            'TicketSwap',
             new Rules([
-                'ErickSkrauch/line_break_after_statements' => true,
-                'Symplify/array_list_item_newline_fixer' => true,
-                'Symplify/array_opener_and_closer_newline_fixer' => true,
-                'Symplify/standalone_line_in_multiline_array_fixer' => true,
-                'Symplify/standalone_line_constructor_param_fixer' => true,
-
                 // Rule sets
                 '@PER-CS2.0' => true,
 

src/RuleSet/TicketSwapTestingStyle.php

@@ -14,7 +14,6 @@ public static function create() : RuleSet
     {
         return new RuleSet(
             new Fixers(),
-            'TicketSwap Testing Style',
             new Rules([
                 'php_unit_method_casing' => [
                     'case' => 'snake_case',