Skip to content

Commit 98130c6

Browse files
composer(deps): bump friendsofphp/php-cs-fixer from 2.18.6 to 3.0.0 in /vendor-bin/php-cs-fixer (#330)
1 parent 1eb8e96 commit 98130c6

File tree

8 files changed

+186
-220
lines changed

8 files changed

+186
-220
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
/.editorconfig export-ignore
55
/.gitattributes export-ignore
66
/.gitignore export-ignore
7-
/.php_cs.dist export-ignore
7+
/.php-cs-fixer.dist.php export-ignore
88
/codecov.yml export-ignore
99
/Makefile export-ignore
1010
/phpstan-baseline.neon export-ignore

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Before proposing a pull request, please read these contribution guidelines.
1010

1111
* Communicate in English on issues and pull requests.
1212
* Pull requests should only contain related changes.
13-
* Your code should follow [our coding standard](/.php_cs.dist). Run `make cs` to fix code style issues.
13+
* Your code should follow [our coding standard](/.php-cs-fixer.dist.php). Run `make cs` to fix code style issues.
1414
* Your code should be covered by unit tests.
1515
* All checks must pass before your code is merged. Run `make test` to run unit tests.
1616

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ jobs:
6060
6161
- name: Run php-cs-fixer
6262
run: |
63-
vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run --verbose
63+
vendor/bin/php-cs-fixer fix --diff --dry-run --verbose

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
/vendor-bin/php-cs-fixer/vendor/
44
/vendor-bin/phpstan/vendor/
55
/vendor-bin/psalm/vendor/
6-
/.php_cs.cache
6+
/.php-cs-fixer.cache
77
/composer.lock

.php_cs.dist renamed to .php-cs-fixer.dist.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
'vendor-bin/',
1010
])
1111
->ignoreDotFiles(false)
12-
->in(__DIR__)
13-
->name('.php_cs.dist');
12+
->in(__DIR__);
1413

1514
$config = new PhpCsFixer\Config('faker');
1615

@@ -30,7 +29,6 @@
3029
'break',
3130
'continue',
3231
'default',
33-
'die',
3432
'do',
3533
'exit',
3634
'for',
@@ -183,7 +181,11 @@
183181
'switch_case_space' => true,
184182
'ternary_operator_spaces' => true,
185183
'ternary_to_null_coalescing' => true,
186-
'trailing_comma_in_multiline_array' => true,
184+
'trailing_comma_in_multiline' => [
185+
'elements' => [
186+
'arrays',
187+
],
188+
],
187189
'trim_array_spaces' => true,
188190
'unary_operator_spaces' => true,
189191
'visibility_required' => [

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ help:
1010

1111
.PHONY: cs
1212
cs: vendor ## Fixes coding standard issues with php-cs-fixer
13-
vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --verbose
13+
vendor/bin/php-cs-fixer fix --diff --verbose
1414

1515
.PHONY: coverage
1616
coverage: vendor ## Collects coverage with phpunit

vendor-bin/php-cs-fixer/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.1 || ^8.0",
4-
"friendsofphp/php-cs-fixer": "^2.18.6"
4+
"friendsofphp/php-cs-fixer": "^3.0.0"
55
},
66
"config": {
77
"platform": {

0 commit comments

Comments
 (0)