Merge pull request #400 from ergebnis/dependabot/composer/friendsofph…

…p/php-cs-fixer-2.19.0 composer(deps): bump friendsofphp/php-cs-fixer from 2.18.6 to 2.19.0
ergebnis · May 4, 2021 · a392f1d · a392f1d
2 parents fa05206 + e5e4e50
commit a392f1d
Show file tree

Hide file tree

Showing 25 changed files with 125 additions and 65 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -4,7 +4,7 @@
 /.editorconfig                  export-ignore
 /.gitattributes                 export-ignore
 /.gitignore                     export-ignore
-/.php_cs                        export-ignore
+/.php-cs-fixer.php              export-ignore
 /composer-require-checker.json  export-ignore
 /infection.json                 export-ignore
 /Makefile                       export-ignore

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -77,7 +77,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"
-        run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose"
+        run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --dry-run --verbose"
 
   dependency-analysis:
     name: "Dependency Analysis"

diff --git a/.github/workflows/renew.yaml b/.github/workflows/renew.yaml
@@ -65,7 +65,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 
       - name: "Run friendsofphp/php-cs-fixer"
-        run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose"
+        run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --verbose"
 
       - name: "Commit modified files"
         uses: "stefanzweifel/[email protected]"

diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -36,8 +36,8 @@
     ])
     ->ignoreDotFiles(false)
     ->in(__DIR__)
-    ->name('.php_cs');
+    ->name('.php-cs-fixer.php');
 
-$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.cache');
+$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php-cs-fixer.cache');
 
 return $config;
diff --git 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 [`2.13.1...main`][2.13.1...main].
 
+### Changed
+
+* Updated `friendsofphp/php-cs-fixer` ([#400]), by [@dependabot]
+
 ## [`2.13.1`][2.13.1]
 
 For a full diff see [`2.13.0...2.13.1`][2.13.0...2.13.1].
@@ -390,6 +394,7 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [#352]: https://github.com/ergebnis/php-cs-fixer-config/pull/352
 [#354]: https://github.com/ergebnis/php-cs-fixer-config/pull/354
 [#392]: https://github.com/ergebnis/php-cs-fixer-config/pull/392
+[#400]: https://github.com/ergebnis/php-cs-fixer-config/pull/400
 
 [@dependabot]: https://github.com/apps/dependabot
 [@linuxjuggler]: https://github.com/linuxjuggler

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
 	composer normalize
 	yamllint -c .yamllint.yaml --strict .
 	mkdir -p .build/php-cs-fixer
-	vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --verbose
+	vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --verbose
 
 .PHONY: dependency-analysis
 dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Pick one of the rule sets:
 * [`Ergebnis\PhpCsFixer\RuleSet\Php80`](src/RuleSet/Php80.php)
 * [`Ergebnis\PhpCsFixer\RuleSet\PhpUnit`](src/RuleSet/PhpUnit.php)
 
-Create a configuration file `.php_cs` in the root of your project:
+Create a configuration file `.php-cs-fixer.php` in the root of your project:
 
 ```php
 <?php
@@ -134,7 +134,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 --diff --verbose
++    vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --verbose
 
  vendor: composer.json composer.lock
      composer validate
@@ -234,7 +234,7 @@ If you like [GitHub Actions](https://github.com/features/actions), add a `coding
 +          restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
 +
 +      - name: "Run friendsofphp/php-cs-fixer"
-+       run: "vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --dry-run --verbose"
++       run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --dry-run --verbose"
 ```
 
 ## Changelog

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   "require": {
     "php": "^7.2 || ^8.0",
     "ext-filter": "*",
-    "friendsofphp/php-cs-fixer": "~2.18.6"
+    "friendsofphp/php-cs-fixer": "~2.19.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.13.3",

diff --git a/composer.lock b/composer.lock
diff --git a/src/RuleSet/Faker.php b/src/RuleSet/Faker.php
@@ -33,7 +33,6 @@ final class Faker extends AbstractRuleSet
                 'break',
                 'continue',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -187,7 +186,11 @@ final class Faker extends AbstractRuleSet
         '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/src/RuleSet/Laravel6.php b/src/RuleSet/Laravel6.php
@@ -291,7 +291,11 @@ final class Laravel6 extends AbstractRuleSet
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => false,
         'ternary_to_null_coalescing' => false,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+            ],
+        ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,
         'use_arrow_functions' => false,

diff --git a/src/RuleSet/Php71.php b/src/RuleSet/Php71.php
@@ -39,7 +39,6 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
                 'continue',
                 'declare',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -888,6 +887,7 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         ],
         'phpdoc_to_comment' => false,
         'phpdoc_to_param_type' => false,
+        'phpdoc_to_property_type' => false,
         'phpdoc_to_return_type' => false,
         'phpdoc_trim' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
@@ -1020,8 +1020,11 @@ final class Php71 extends AbstractRuleSet implements ExplicitRuleSet
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => [
+        'trailing_comma_in_multiline' => [
             'after_heredoc' => false,
+            'elements' => [
+                'arrays',
+            ],
         ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,

diff --git a/src/RuleSet/Php72.php b/src/RuleSet/Php72.php
@@ -39,7 +39,6 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
                 'continue',
                 'declare',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -888,6 +887,7 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         ],
         'phpdoc_to_comment' => false,
         'phpdoc_to_param_type' => false,
+        'phpdoc_to_property_type' => false,
         'phpdoc_to_return_type' => false,
         'phpdoc_trim' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
@@ -1020,8 +1020,11 @@ final class Php72 extends AbstractRuleSet implements ExplicitRuleSet
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => [
+        'trailing_comma_in_multiline' => [
             'after_heredoc' => false,
+            'elements' => [
+                'arrays',
+            ],
         ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,

diff --git a/src/RuleSet/Php73.php b/src/RuleSet/Php73.php
@@ -39,7 +39,6 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
                 'continue',
                 'declare',
                 'default',
-                'die',
                 'do',
                 'exit',
                 'for',
@@ -888,6 +887,7 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         ],
         'phpdoc_to_comment' => false,
         'phpdoc_to_param_type' => false,
+        'phpdoc_to_property_type' => false,
         'phpdoc_to_return_type' => false,
         'phpdoc_trim' => true,
         'phpdoc_trim_consecutive_blank_line_separation' => true,
@@ -1020,8 +1020,11 @@ final class Php73 extends AbstractRuleSet implements ExplicitRuleSet
         'ternary_operator_spaces' => true,
         'ternary_to_elvis_operator' => true,
         'ternary_to_null_coalescing' => true,
-        'trailing_comma_in_multiline_array' => [
+        'trailing_comma_in_multiline' => [
             'after_heredoc' => false,
+            'elements' => [
+                'arrays',
+            ],
         ],
         'trim_array_spaces' => true,
         'unary_operator_spaces' => true,