composer(deps): bump friendsofphp/php-cs-fixer from 2.18.6 to 3.0.0 i…

…n /vendor-bin/php-cs-fixer (#330)
FakerPHP · Jun 4, 2021 · 98130c6 · 98130c6
1 parent 1eb8e96
commit 98130c6
Show file tree

Hide file tree

Showing 8 changed files with 186 additions and 220 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,7 +4,7 @@
 /.editorconfig            export-ignore
 /.gitattributes           export-ignore
 /.gitignore               export-ignore
-/.php_cs.dist             export-ignore
+/.php-cs-fixer.dist.php   export-ignore
 /codecov.yml              export-ignore
 /Makefile                 export-ignore
 /phpstan-baseline.neon    export-ignore

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Before proposing a pull request, please read these contribution guidelines.
 
 * Communicate in English on issues and pull requests.
 * Pull requests should only contain related changes.
-* Your code should follow [our coding standard](/.php_cs.dist). Run `make cs` to fix code style issues.
+* Your code should follow [our coding standard](/.php-cs-fixer.dist.php). Run `make cs` to fix code style issues.
 * Your code should be covered by unit tests.
 * All checks must pass before your code is merged. Run `make test` to run unit tests.
 

diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
@@ -60,4 +60,4 @@ jobs:
 
       - name: Run php-cs-fixer
         run: |
-          vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --dry-run --verbose
+          vendor/bin/php-cs-fixer fix --diff --dry-run --verbose
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@
 /vendor-bin/php-cs-fixer/vendor/
 /vendor-bin/phpstan/vendor/
 /vendor-bin/psalm/vendor/
-/.php_cs.cache
+/.php-cs-fixer.cache
 /composer.lock
diff --git a/.php_cs.dist → .php-cs-fixer.dist.php b/.php_cs.dist → .php-cs-fixer.dist.php
@@ -9,8 +9,7 @@
         'vendor-bin/',
     ])
     ->ignoreDotFiles(false)
-    ->in(__DIR__)
-    ->name('.php_cs.dist');
+    ->in(__DIR__);
 
 $config = new PhpCsFixer\Config('faker');
 
@@ -30,7 +29,6 @@
                 'break',
                 'continue',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -183,7 +181,11 @@
         'switch_case_space' => true,
         'ternary_operator_spaces' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+            ],
+        ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
         'visibility_required' => [

diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ help:
 
 .PHONY: cs
 cs: vendor ## Fixes coding standard issues with php-cs-fixer
-	vendor/bin/php-cs-fixer fix --diff --diff-format=udiff --verbose
+	vendor/bin/php-cs-fixer fix --diff --verbose
 
 .PHONY: coverage
 coverage: vendor ## Collects coverage with phpunit

diff --git a/vendor-bin/php-cs-fixer/composer.json b/vendor-bin/php-cs-fixer/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^7.1 || ^8.0",
-        "friendsofphp/php-cs-fixer": "^2.18.6"
+        "friendsofphp/php-cs-fixer": "^3.0.0"
     },
     "config": {
         "platform": {