Skip to content

Commit

Permalink
Merge pull request #969 from ergebnis/dependabot/composer/friendsofph…
Browse files Browse the repository at this point in the history
…p/php-cs-fixer-3.45.0

composer(deps): Bump friendsofphp/php-cs-fixer from 3.43.1 to 3.45.0
  • Loading branch information
localheinz authored Dec 30, 2023
2 parents 0b9979c + c4b9fb8 commit 7d78d5d
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]"
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
+ ]
}
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7d78d5d

Please sign in to comment.