Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #533 from ergebnis/fix/php-cs-fixer
Browse files Browse the repository at this point in the history
Fix: Rename `.php_cs` to `.php-cs-fixer.php`
  • Loading branch information
localheinz authored Jan 3, 2022
2 parents 9abab79 + 1350a64 commit e90b331
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
/.php-cs-fixer.php export-ignore
/composer-require-checker.json export-ignore
/infection.json export-ignore
/Makefile export-ignore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ jobs:
restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"

- name: "Run friendsofphp/php-cs-fixer"
run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose"
run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --dry-run --verbose"

- name: "Run friendsofphp/php-cs-fixer for test fixtures"
run: "vendor/bin/php-cs-fixer fix --config=.php_cs.fixture --diff --diff-format=udiff --using-cache=no --verbose"
run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.fixture.php --diff --diff-format=udiff --using-cache=no --verbose"

dependency-analysis:
name: "Dependency Analysis"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"

- name: "Run friendsofphp/php-cs-fixer"
run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose"
run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --verbose"

- name: "Commit modified files"
uses: "stefanzweifel/[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion .php_cs.fixture → .php-cs-fixer.fixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@

$config->getFinder()->in(__DIR__ . '/test/Fixture');

$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache.fixtures');
$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.fixture.cache');

return $config;
8 changes: 3 additions & 5 deletions .php_cs → .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@
])
->ignoreDotFiles(false)
->in(__DIR__)
->name([
'.php_cs',
'.php_cs.fixture',
]);
->name('.php-cs-fixer.php')
->name('.php-cs-fixer.fixture.php');

$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache');
$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');

return $config;
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
composer normalize
yamllint -c .yamllint.yaml --strict .
mkdir -p .build/php-cs-fixer
vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --verbose

.PHONY: dependency-analysis
dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
Expand Down

0 comments on commit e90b331

Please sign in to comment.