From 1350a64829b7ba4ab5a47852336dfe289a9b6b26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 3 Jan 2022 18:38:54 +0100 Subject: [PATCH] Fix: Rename .php_cs to .php-cs-fixer.php --- .gitattributes | 2 +- .github/workflows/integrate.yaml | 4 ++-- .github/workflows/renew.yaml | 2 +- .php_cs.fixture => .php-cs-fixer.fixture.php | 2 +- .php_cs => .php-cs-fixer.php | 8 +++----- Makefile | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) rename .php_cs.fixture => .php-cs-fixer.fixture.php (85%) rename .php_cs => .php-cs-fixer.php (86%) 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 fd996d7f..438101c5 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -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" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index 25f79e7d..fef0ea5e 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.fixture b/.php-cs-fixer.fixture.php similarity index 85% rename from .php_cs.fixture rename to .php-cs-fixer.fixture.php index 938f12e5..a8d51f70 100644 --- a/.php_cs.fixture +++ b/.php-cs-fixer.fixture.php @@ -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; diff --git a/.php_cs b/.php-cs-fixer.php similarity index 86% rename from .php_cs rename to .php-cs-fixer.php index 5275f2bb..18e3cca4 100644 --- a/.php_cs +++ b/.php-cs-fixer.php @@ -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; diff --git a/Makefile b/Makefile index 79760e9c..ec8af4c5 100644 --- a/Makefile +++ b/Makefile @@ -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