diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index d7164789..5ba1becf 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -140,7 +140,7 @@ jobs: php-${{ matrix.php-version }}-php-cs-fixer- - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose" + run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --show-progress=dots --verbose" dependency-analysis: name: "Dependency Analysis" diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml index e18cd4cc..abf4273a 100644 --- a/.github/workflows/renew.yaml +++ b/.github/workflows/renew.yaml @@ -69,7 +69,7 @@ jobs: php-${{ matrix.php-version }}-php-cs-fixer- - name: "Run friendsofphp/php-cs-fixer" - run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --verbose" + run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --show-progress=dots --verbose" - name: "Commit modified files" uses: "stefanzweifel/git-auto-commit-action@v5.0.0" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dd8a446..5381e775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`6.16.1...main`][6.16.1...main]. +### Changed + +- Updated `friendsofphp/php-cs-fixer` ([#969]), by [@dependabot] + ## [`6.16.1`][6.16.1] For a full diff see [`6.16.0...6.16.1`][6.16.0...6.16.1]. @@ -1452,6 +1456,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0]. [#963]: https://github.com/ergebnis/php-cs-fixer-config/pull/963 [#967]: https://github.com/ergebnis/php-cs-fixer-config/pull/967 [#968]: https://github.com/ergebnis/php-cs-fixer-config/pull/968 +[#969]: https://github.com/ergebnis/php-cs-fixer-config/pull/969 [@dependabot]: https://github.com/apps/dependabot [@linuxjuggler]: https://github.com/linuxjuggler diff --git a/Makefile b/Makefile index c9c40a69..69151957 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ coding-standards: vendor ## Lints YAML files with yamllint, normalizes composer. yamllint -c .yamllint.yaml --strict . composer normalize mkdir -p .build/php-cs-fixer/ - vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose + vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose .PHONY: dependency-analysis dependency-analysis: phive vendor ## Runs a dependency analysis with maglnet/composer-require-checker diff --git a/README.md b/README.md index 3e320423..219f03f8 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ If you like [`Makefile`](https://www.gnu.org/software/make/manual/make.html#Intr +.PHONY: coding-standards +coding-standards: vendor + mkdir -p .build/php-cs-fixer -+ vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose ++ vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose vendor: composer.json composer.lock composer validate @@ -216,7 +216,7 @@ If you like [`composer` scripts](https://getcomposer.org/doc/articles/scripts.md + "scripts": { + "coding-standards": [ + "mkdir -p .build/php-cs-fixer", -+ "php-cs-fixer fix --diff --verbose" ++ "php-cs-fixer fix --diff --show-progress=dots --verbose" + ] } } @@ -287,7 +287,7 @@ If you like [GitHub Actions](https://github.com/features/actions), add a `coding + php-${{ matrix.php-version }}-php-cs-fixer- + + - name: "Run friendsofphp/php-cs-fixer" -+ run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --verbose" ++ run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --show-progress=dots --verbose" ``` ## Changelog diff --git a/composer.json b/composer.json index f59c4921..24f02477 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "ext-filter": "*", "erickskrauch/php-cs-fixer-custom-fixers": "~1.2.1", - "friendsofphp/php-cs-fixer": "~3.43.1", + "friendsofphp/php-cs-fixer": "~3.45.0", "kubawerlos/php-cs-fixer-custom-fixers": "~3.17.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 9e4e63d0..e386960f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6363a26998fc28d9f3da603fa6e7939e", + "content-hash": "a3b5f1bb43173841a6e4738d2c6b7c8f", "packages": [ { "name": "composer/pcre", @@ -288,16 +288,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.43.1", + "version": "v3.45.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "91c0b47216aa43b09656b4d99aa9dade2f3ad8fc" + "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/91c0b47216aa43b09656b4d99aa9dade2f3ad8fc", - "reference": "91c0b47216aa43b09656b4d99aa9dade2f3ad8fc", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/c0daa33cb2533cd73f48dde1c70c2afa3e7953b5", + "reference": "c0daa33cb2533cd73f48dde1c70c2afa3e7953b5", "shasum": "" }, "require": { @@ -366,7 +366,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.43.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.45.0" }, "funding": [ { @@ -374,7 +374,7 @@ "type": "github" } ], - "time": "2023-12-29T09:42:16+00:00" + "time": "2023-12-30T02:07:07+00:00" }, { "name": "kubawerlos/php-cs-fixer-custom-fixers",