Skip to content

Commit ecc7317

Browse files
authored
Merge pull request #5866 from kenjis/rename-php-cs-fixer-config-files
chore: rename php-cs-fixer config files
2 parents c0faafd + 70af24e commit ecc7317

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/test-coding-standards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
run: composer update --ansi --no-interaction
5353

5454
- name: Run lint on `app/`, `admin/`, `public/`
55-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.no-header.php-cs-fixer.dist.php --using-cache=no --diff
55+
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff
5656

5757
- name: Run lint on `system/`, `tests`, `utils/`, and root PHP files
5858
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
5959

6060
- name: Run lint on `user_guide_src/source/`
61-
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.user-guide.php-cs-fixer.dist.php --using-cache=no --diff
61+
run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff

.php-cs-fixer.dist.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
->notName('#Foobar.php$#')
3030
->append([
3131
__FILE__,
32-
__DIR__ . '/.no-header.php-cs-fixer.dist.php',
33-
__DIR__ . '/.user-guide.php-cs-fixer.dist.php',
32+
__DIR__ . '/.php-cs-fixer.no-header.php',
33+
__DIR__ . '/.php-cs-fixer.user-guide.php',
3434
__DIR__ . '/rector.php',
3535
__DIR__ . '/spark',
3636
__DIR__ . '/user_guide_src/renumerate.php',
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$overrides = [];
3434

3535
$options = [
36-
'cacheFile' => 'build/.no-header.php-cs-fixer.cache',
36+
'cacheFile' => 'build/.php-cs-fixer.no-header.cache',
3737
'finder' => $finder,
3838
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
3939
'customRules' => [
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
];
3838

3939
$options = [
40-
'cacheFile' => 'build/.user-guide.php-cs-fixer.cache',
40+
'cacheFile' => 'build/.php-cs-fixer.user-guide.cache',
4141
'finder' => $finder,
4242
'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
4343
'customRules' => [

admin/pre-commit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ if [ "$FILES" != "" ]; then
4242
# Run on whole codebase to skip on unnecessary filtering
4343
# Run first on app, admin, public
4444
if [ -d /proc/cygdrive ]; then
45-
./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
45+
./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
4646
else
47-
php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
47+
php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
4848
fi
4949

5050
if [ $? != 0 ]; then
@@ -66,9 +66,9 @@ if [ "$FILES" != "" ]; then
6666

6767
# Next, run on user_guide_src/source PHP files
6868
if [ -d /proc/cygdrive ]; then
69-
./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
69+
./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
7070
else
71-
php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
71+
php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
7272
fi
7373

7474
if [ $? != 0 ]; then

0 commit comments

Comments
 (0)