From 0e7e64a187fe421a4841590c62202e3504a1ef60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Tue, 28 Dec 2021 17:54:29 +0100 Subject: [PATCH] Fix: Rename .php_cs to .php-cs-fixer.php --- .gitattributes | 2 +- .github/workflows/integrate.yaml | 2 +- .github/workflows/renew.yaml | 2 +- .php_cs => .php-cs-fixer.php | 4 ++-- Makefile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename .php_cs => .php-cs-fixer.php (90%) diff --git a/.gitattributes b/.gitattributes index 4ce803a8..40b1c53f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index a403e4c1..c1960031 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -127,7 +127,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 --dry-run --verbose" + run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --dry-run --verbose" dependency-analysis: name: "Dependency Analysis" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 79f0bc02..ebd48474 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -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" diff --git a/.php_cs b/.php-cs-fixer.php similarity index 90% rename from .php_cs rename to .php-cs-fixer.php index d52a3e0a..8a9c9dc3 100644 --- a/.php_cs +++ b/.php-cs-fixer.php @@ -40,8 +40,8 @@ ]) ->ignoreDotFiles(false) ->in(__DIR__) - ->name('.php_cs'); + ->name('.php-cs-fixer.php'); -$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache'); +$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache'); return $config; diff --git a/Makefile b/Makefile index 732287ba..3406092e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm .phive/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