Sync php-cs-fixer configuration with that of PHPUnit

Author: sebastianbergmann

.gitignore

@@ -2,5 +2,6 @@
 /vendor
 /composer.lock
 /.idea
+/.php_cs
 /.php_cs.cache
 

.php_cs renamed to .php_cs.dist

@@ -22,13 +22,26 @@ return PhpCsFixer\Config::create()
                 'statements' => [
                     'break',
                     'continue',
+                    'declare',
+                    'do',
+                    'for',
+                    'foreach',
+                    'if',
+                    'include',
+                    'include_once',
+                    'require',
+                    'require_once',
                     'return',
+                    'switch',
                     'throw',
                     'try',
+                    'while',
+                    'yield',
                 ],
             ],
             'braces' => true,
             'cast_spaces' => true,
+            'class_attributes_separation' => ['elements' => ['method']],
             'compact_nullable_typehint' => true,
             'concat_space' => ['spacing' => 'one'],
             'declare_equal_normalize' => ['space' => 'none'],
@@ -46,7 +59,6 @@ return PhpCsFixer\Config::create()
             'lowercase_keywords' => true,
             'magic_constant_casing' => true,
             'method_argument_space' => ['ensure_fully_multiline' => true],
-            'method_separation' => true,
             'modernize_types_casting' => true,
             'native_function_casing' => true,
             'native_function_invocation' => true,
@@ -57,7 +69,7 @@ return PhpCsFixer\Config::create()
             'no_empty_comment' => true,
             'no_empty_phpdoc' => true,
             'no_empty_statement' => true,
-            'no_extra_consecutive_blank_lines' => true,
+            'no_extra_blank_lines' => true,
             'no_homoglyph_names' => true,
             'no_leading_import_slash' => true,
             'no_leading_namespace_whitespace' => true,
@@ -85,20 +97,28 @@ return PhpCsFixer\Config::create()
             'normalize_index_brace' => true,
             'object_operator_without_whitespace' => true,
             'ordered_class_elements' => [
-                'use_trait',
-                'constant_public',
-                'constant_protected',
-                'constant_private',
-                'property_public',
-                'property_protected',
-                'property_private',
-                'construct',
-                'destruct',
-                'magic',
-                'phpunit',
-                'method_public',
-                'method_protected',
-                'method_private'
+                'order' => [
+                    'use_trait',
+                    'constant_public',
+                    'constant_protected',
+                    'constant_private',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'method_public_static',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'phpunit',
+                    'method_public',
+                    'method_protected',
+                    'method_private',
+                    'method_protected_static',
+                    'method_private_static',
+                ],
             ],
             'ordered_imports' => true,
             'phpdoc_add_missing_param_annotation' => true,