upgrade php-cs-fixer

Author: garak

.gitignore

@@ -1,4 +1,5 @@
 .bowerrc
+.php_cs.cache
 bin
 !bin/bowerphp
 !bin/compile

.php_cs

@@ -1,11 +1,20 @@
 <?php
 // see https://github.com/FriendsOfPHP/PHP-CS-Fixer
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
+$finder = PhpCsFixer\Finder::create()
     ->in([__DIR__ . '/src', __DIR__ . '/tests'])
 ;
 
-return Symfony\CS\Config\Config::create()
-    ->fixers(['concat_with_spaces', 'align_double_arrow', 'short_array_syntax', '-concat_without_spaces', 'ordered_use', 'unused_use', '-phpdoc_short_description', '-phpdoc_separation'])
-    ->finder($finder)
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony'               => true,
+        'binary_operator_spaces' => ['align_double_arrow' => true],
+        'array_syntax'           => ['syntax' => 'short'],
+        'concat_space'           => ['spacing' => 'one'], 
+        'ordered_imports'        => true,
+        'no_unused_imports'      => true,
+        'phpdoc_summary'         => false,
+        'phpdoc_separation'      => false,
+    ])
+    ->setFinder($finder)
 ;

composer.json

@@ -37,7 +37,7 @@
         "ext-phar": "*",
         "phpunit/phpunit": "4.*|5.*",
         "mockery/mockery": "~0.9.3",
-        "friendsofphp/php-cs-fixer": "~1.5"
+        "friendsofphp/php-cs-fixer": "^2.0"
     },
     "autoload": {
         "psr-4": {