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

Fix: Rename .php_cs to .php-cs-fixer.php #533

Merged
merged 1 commit into from
Jan 3, 2022
Merged

Fix: Rename .php_cs to .php-cs-fixer.php #533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/git-auto-commit-action@v4.12.0"
Expand Down
2 changes: 1 addition & 1 deletion .php_cs.fixture → .php-cs-fixer.fixture.php
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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