Skip to content

Commit 82ece19

Browse files
committed
chore: Reverts disabling custom fixers for PHP 7.4
1 parent 6a65664 commit 82ece19

File tree

4 files changed

+28
-44
lines changed

4 files changed

+28
-44
lines changed

.php-cs-fixer.dist.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,16 @@
4343
$overrides = [];
4444

4545
$options = [
46-
'cacheFile' => 'build/.php-cs-fixer.cache',
47-
'finder' => $finder,
46+
'cacheFile' => 'build/.php-cs-fixer.cache',
47+
'finder' => $finder,
48+
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
49+
'customRules' => [
50+
NoCodeSeparatorCommentFixer::name() => true,
51+
],
4852
];
4953

50-
$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
54+
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
5155
'CodeIgniter 4 framework',
5256
'CodeIgniter Foundation',
5357
5458
);
55-
56-
$config
57-
->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
58-
->setRules(array_merge($config->getRules(), [
59-
NoCodeSeparatorCommentFixer::name() => true,
60-
]));
61-
62-
return $config;

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@
3232
$overrides = [];
3333

3434
$options = [
35-
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
36-
'finder' => $finder,
37-
];
38-
39-
$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
40-
41-
$config
42-
->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
43-
->setRules(array_merge($config->getRules(), [
35+
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
36+
'finder' => $finder,
37+
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
38+
'customRules' => [
4439
NoCodeSeparatorCommentFixer::name() => true,
45-
]));
40+
],
41+
];
4642

47-
return $config;
43+
return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();

.php-cs-fixer.tests.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,16 @@
3838
];
3939

4040
$options = [
41-
'cacheFile' => 'build/.php-cs-fixer.tests.cache',
42-
'finder' => $finder,
41+
'cacheFile' => 'build/.php-cs-fixer.tests.cache',
42+
'finder' => $finder,
43+
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
44+
'customRules' => [
45+
NoCodeSeparatorCommentFixer::name() => true,
46+
],
4347
];
4448

45-
$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
49+
return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
4650
'CodeIgniter 4 framework',
4751
'CodeIgniter Foundation',
4852
4953
);
50-
51-
$config
52-
->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
53-
->setRules(array_merge($config->getRules(), [
54-
NoCodeSeparatorCommentFixer::name() => true,
55-
]));
56-
57-
return $config;

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,12 @@
4242
];
4343

4444
$options = [
45-
'cacheFile' => 'build/.php-cs-fixer.user-guide.cache',
46-
'finder' => $finder,
47-
];
48-
49-
$config = Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
50-
51-
$config
52-
->registerCustomFixers(FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'))
53-
->setRules(array_merge($config->getRules(), [
45+
'cacheFile' => 'build/.php-cs-fixer.user-guide.cache',
46+
'finder' => $finder,
47+
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
48+
'customRules' => [
5449
NoCodeSeparatorCommentFixer::name() => true,
55-
]));
50+
],
51+
];
5652

57-
return $config;
53+
return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();

0 commit comments

Comments
 (0)