Merge pull request #3141 from movabletype/fix/MTC-29641-php-cs-fixer-…

…reconfig

fix php-cs-fixer for v3 and reconfigure rules

.gitignore

@@ -69,6 +69,7 @@ perltidy.LOG
 *.tdy
 *.ERR
 .php_cs.cache
+.php-cs-fixer.cache
 
 cover_db/
 

.php_cs.dist → .php-cs-fixer.php

@@ -1,16 +1,18 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+$finder = (new PhpCsFixer\Finder())
     ->exclude('php/extlib')
+    ->exclude('plugins/Markdown')
+    ->exclude('plugins/Textile')
     ->notPath('t/lib/JSON.php')
     ->in('.')
 ;
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setFinder($finder)
     ->setRules([
         '@PSR2' => true,
-        'array_syntax' => ['syntax' => 'long'],
+        'array_syntax' => ['syntax' => 'short'],
         'function_typehint_space' => true,
         'no_unused_imports' => true,
         'no_empty_comment' => true,
@@ -21,11 +23,9 @@
         'return_type_declaration' => true,
         'ternary_operator_spaces' => true,
         'whitespace_after_comma_in_array' => true,
-        'braces' => [
-            'allow_single_line_closure' => true,
-            'position_after_anonymous_constructs' => 'same',
-            'position_after_control_structures' => 'same',
-            'position_after_functions_and_oop_constructs' => 'same',
+        'braces_position' => [
+            'functions_opening_brace' => 'same_line',
+            'classes_opening_brace' => 'same_line',
         ],
     ])
 ;

MANIFEST.SKIP

@@ -366,6 +366,7 @@ build-language-stamp
 ^node_modules/
 \.node-version$
 \.php_cs\.dist$
+\.php-cs-fixer\.php
 ^rollup.config.ts
 ^tsconfig.json
 \.babelrc