Merge pull request #9035 from paulbalandan/dry-cs

chore: make php-cs-fixer configs DRY

Author: paulbalandan

.php-cs-fixer.dist.php

@@ -28,8 +28,6 @@
         'ThirdParty',
         'Validation/Views',
     ])
-    ->notPath([
-    ])
     ->notName('#Foobar.php$#')
     ->append([
         __FILE__,
@@ -41,12 +39,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

.php-cs-fixer.no-header.php

@@ -11,12 +11,12 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
@@ -30,19 +30,10 @@
     ]);
 
 $overrides = [
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.no-header.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
+    'header_comment' => false,
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.no-header.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));

.php-cs-fixer.tests.php

@@ -11,47 +11,29 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
         __DIR__ . '/tests',
     ])
-    ->exclude([
-    ])
     ->notPath([
         '_support/View/Cells/multiplier.php',
         '_support/View/Cells/colors.php',
         '_support/View/Cells/addition.php',
     ])
-    ->notName('#Foobar.php$#')
-    ->append([
-    ]);
+    ->notName('#Foobar.php$#');
 
 $overrides = [
     'void_return' => true,
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.tests.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
-    'CodeIgniter 4 framework',
-    'CodeIgniter Foundation',
-    'admin@codeigniter.com'
-);
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.tests.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));

.php-cs-fixer.user-guide.php

@@ -11,12 +11,12 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\CodingStandard\CodeIgniter4;
-use Nexus\CsConfig\Factory;
-use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
-use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\ConfigInterface;
 use PhpCsFixer\Finder;
 
+/** @var ConfigInterface $config */
+$config = require __DIR__ . '/.php-cs-fixer.dist.php';
+
 $finder = Finder::create()
     ->files()
     ->in([
@@ -32,26 +32,17 @@
 
 $overrides = [
     'echo_tag_syntax'              => false,
+    'header_comment'               => false,
     'php_unit_internal_class'      => false,
     'no_unused_imports'            => false,
     'class_attributes_separation'  => false,
     'fully_qualified_strict_types' => [
         'import_symbols'                        => false,
         'leading_backslash_in_global_namespace' => true,
     ],
-    // for updating to coding-standard
-    'modernize_strpos'    => true,
-    'ordered_attributes'  => ['order' => [], 'sort_algorithm' => 'alpha'],
-    'php_unit_attributes' => true,
-];
-
-$options = [
-    'cacheFile'    => 'build/.php-cs-fixer.user-guide.cache',
-    'finder'       => $finder,
-    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
-    'customRules'  => [
-        NoCodeSeparatorCommentFixer::name() => true,
-    ],
 ];
 
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
+return $config
+    ->setFinder($finder)
+    ->setCacheFile('build/.php-cs-fixer.user-guide.cache')
+    ->setRules(array_merge($config->getRules(), $overrides));