From 24fbe17b048a8d324ac2fd940d3ad611442ea85e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 20:24:32 +0000 Subject: [PATCH 1/2] composer(deps): Bump friendsofphp/php-cs-fixer from 3.43.1 to 3.44.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.43.1 to 3.44.0. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.43.1...v3.44.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6a638024..7db56b44 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ }, "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0", - "friendsofphp/php-cs-fixer": "~3.43.1" + "friendsofphp/php-cs-fixer": "~3.44.0" }, "require-dev": { "ergebnis/composer-normalize": "^2.41.1", diff --git a/composer.lock b/composer.lock index 3e091123..a35297c6 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": "c5383d5346f1eedc78b6127776c921c8", + "content-hash": "9a0c6bd1a8f8db9ef590c9a4c77771b3", "packages": [ { "name": "composer/pcre", @@ -226,16 +226,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.43.1", + "version": "v3.44.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "91c0b47216aa43b09656b4d99aa9dade2f3ad8fc" + "reference": "5445834057a744c1a434ed60fcac566b4de3a0f2" }, "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/5445834057a744c1a434ed60fcac566b4de3a0f2", + "reference": "5445834057a744c1a434ed60fcac566b4de3a0f2", "shasum": "" }, "require": { @@ -304,7 +304,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.44.0" }, "funding": [ { @@ -312,7 +312,7 @@ "type": "github" } ], - "time": "2023-12-29T09:42:16+00:00" + "time": "2023-12-29T20:21:16+00:00" }, { "name": "psr/container", From 9ace3369625f260bd877a359264ce782b71cf2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sat, 30 Dec 2023 09:25:16 +0100 Subject: [PATCH 2/2] Fix: Use --show-progress option to configure dots progress --- .github/workflows/integrate.yaml | 2 +- .github/workflows/renew.yaml | 2 +- Makefile | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 14e7907f..e08d03d8 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -192,7 +192,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 9dbaa5cc..141cb0e9 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/Makefile b/Makefile index 8d72c992..6f2dfddc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,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 b3250a22..ec91efaa 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,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 @@ -204,7 +204,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" + ] } } @@ -275,7 +275,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