Fix the rule override in the set (#318)

* Fix the rule override in the set

* Add tests

Author: mspirkov

src/Config/ECSConfig.php

@@ -77,6 +77,16 @@ public function rule(string $checkerClass): void
 
         $this->singleton($checkerClass);
         $this->autowireWhitespaceAwareFixer($checkerClass);
+
+        if (is_a($checkerClass, ConfigurableFixerInterface::class, true)) {
+            $this->extend(
+                $checkerClass,
+                static function (ConfigurableFixerInterface $configurableFixer): ConfigurableFixerInterface {
+                    $configurableFixer->configure([]);
+                    return $configurableFixer;
+                }
+            );
+        }
     }
 
     /**

tests/FixerRunner/DependencyInjection/FixerServiceRegistrationTest.php

@@ -4,8 +4,11 @@
 
 namespace Symplify\EasyCodingStandard\Tests\FixerRunner\DependencyInjection;
 
+use Iterator;
 use PhpCsFixer\Fixer\ArrayNotation\ArraySyntaxFixer;
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
+use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Symplify\EasyCodingStandard\FixerRunner\Application\FixerFileProcessor;
 use Symplify\EasyCodingStandard\Testing\PHPUnit\AbstractTestCase;
 use Symplify\EasyCodingStandard\Utils\PrivatesAccessorHelper;
@@ -43,4 +46,67 @@ public function test(): void
             'elements' => ['property'],
         ], $visibilityRequiredConfiguration);
     }
+
+    /**
+     * See https://github.com/easy-coding-standard/easy-coding-standard/discussions/198
+     *
+     * @param array{
+     *     case_sensitive: bool,
+     *     imports_order: list<string>|null,
+     *     sort_algorithm: string,
+     * } $expectedConfiguration
+     */
+    #[DataProvider('provideRuleOverrideInSetData')]
+    public function testRuleOverrideInSet(string $filename, array $expectedConfiguration): void
+    {
+        $this->createContainerWithConfigs([__DIR__ . '/config/test-rule-override-in-set/' . $filename]);
+        $fixerFileProcessor = $this->make(FixerFileProcessor::class);
+
+        $checkers = $fixerFileProcessor->getCheckers();
+        $orderedImportsFixerInstances = [];
+
+        foreach ($checkers as $checker) {
+            if ($checker instanceof OrderedImportsFixer) {
+                $orderedImportsFixerInstances[] = $checker;
+            }
+        }
+
+        $this->assertCount(2, $orderedImportsFixerInstances);
+
+        foreach ($orderedImportsFixerInstances as $orderedImportFixerInstance) {
+            $configuration = PrivatesAccessorHelper::getPropertyValue($orderedImportFixerInstance, 'configuration');
+
+            $this->assertSame($expectedConfiguration, $configuration);
+        }
+    }
+
+    public static function provideRuleOverrideInSetData(): Iterator
+    {
+        yield [
+            'with-rules.php',
+            [
+                'case_sensitive' => false,
+                'imports_order' => null,
+                'sort_algorithm' => OrderedImportsFixer::SORT_ALPHA,
+            ],
+        ];
+
+        yield [
+            'with-configured-rule.php',
+            [
+                'case_sensitive' => true,
+                'imports_order' => ['const', 'class', 'function'],
+                'sort_algorithm' => 'alpha',
+            ],
+        ];
+
+        yield [
+            'with-configured-rule-and-empty-config.php',
+            [
+                'case_sensitive' => false,
+                'imports_order' => null,
+                'sort_algorithm' => OrderedImportsFixer::SORT_ALPHA,
+            ],
+        ];
+    }
 }

tests/FixerRunner/DependencyInjection/config/test-rule-override-in-set/with-configured-rule-and-empty-config.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return ECSConfig::configure()
+    ->withPhpCsFixerSets(perCS: true)
+    ->withConfiguredRule(OrderedImportsFixer::class, []);

tests/FixerRunner/DependencyInjection/config/test-rule-override-in-set/with-configured-rule.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return ECSConfig::configure()
+    ->withPhpCsFixerSets(perCS: true)
+    ->withConfiguredRule(OrderedImportsFixer::class, [
+        'case_sensitive' => true,
+        'imports_order' => ['const', 'class', 'function'],
+        'sort_algorithm' => 'alpha',
+    ]);

tests/FixerRunner/DependencyInjection/config/test-rule-override-in-set/with-rules.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
+use Symplify\EasyCodingStandard\Config\ECSConfig;
+
+return ECSConfig::configure()
+    ->withPhpCsFixerSets(perCS: true)
+    ->withRules([OrderedImportsFixer::class]);