ci: upgrade php-cs-fixer to next major release

Author: carlalexander

.gitignore

@@ -2,4 +2,4 @@
 /vendor
 .env
 .phpunit.result.cache
-.php_cs.cache
+.php-cs-fixer.cache

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

@@ -9,10 +9,17 @@
 file that was distributed with this source code.
 EOF;
 
-return PhpCsFixer\Config::create()
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+;
+
+$config = new PhpCsFixer\Config();
+$config
     ->setRiskyAllowed(true)
     ->setRules([
-        '@PHP56Migration' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'align_multiline_comment' => true,
@@ -26,13 +33,12 @@
         'header_comment' => ['header' => $header],
         'heredoc_to_nowdoc' => true,
         'list_syntax' => ['syntax' => 'long'],
-        'method_argument_space' => ['ensure_fully_multiline' => true],
         'method_chaining_indentation' => false,
         'native_function_invocation' => false,
         'native_constant_invocation' => false,
-        'no_extra_consecutive_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
+        'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block']],
         'no_null_property_initialization' => true,
-        'no_short_echo_tag' => true,
+        'echo_tag_syntax' => ['format' => 'long'],
         'no_superfluous_phpdoc_tags' => ['allow_mixed' => false],
         'no_unneeded_curly_braces' => true,
         'no_unneeded_final_method' => true,
@@ -61,7 +67,7 @@
                 'method_protected_abstract',
                 'method_private',
             ],
-            'sortAlgorithm' => 'alpha'
+            'sort_algorithm' => 'alpha'
         ],
         'ordered_imports' => true,
         'php_unit_construct' => true,
@@ -72,14 +78,9 @@
         'phpdoc_types_order' => ['null_adjustment' => 'always_last'],
         'semicolon_after_instruction' => true,
         'single_line_comment_style' => true,
-        'visibility_required' => ['const', 'property', 'method'],
         'yoda_style' => true,
     ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in([
-                __DIR__ . '/src',
-                __DIR__ . '/tests',
-            ])
-    )
+    ->setFinder($finder)
 ;
+
+return $config;

composer.json

@@ -20,7 +20,7 @@
         "dg/bypass-finals": "^1.2",
         "dms/phpunit-arraysubset-asserts": "^0.1 || ^0.2",
         "fakerphp/faker": "^1.12",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "php-mock/php-mock-phpunit": "^2.6",
         "php-parallel-lint/php-parallel-lint": "^1.2",
         "phpmd/phpmd": "^2.8",

grumphp.yml

@@ -25,7 +25,7 @@ grumphp:
         - 'src/Attachment/GDImageEditor.php'
     phpcsfixer2:
       allow_risky: true
-      config: '.php_cs'
+      config: '.php-cs-fixer.dist.php'
     phplint: ~
     phpmd:
       ruleset: ['phpmd.xml']