minor #454 Updated PHP CS Fixer to 2.0 (ABM-Dan, javiereguiluz)

This PR was merged into the master branch.

Discussion
----------

Updated PHP CS Fixer to 2.0

This finishes #407.

Commits
-------

bcd3795 Added some changes back
2885e20 Fixed some merge conflicts
0aa68ef Use only Symfony CS rules
f263409 Exclude Fixtures from the PHP-CS-Fixer
928b747 More CS fixes
aeb1b40 Fixed a CS issue detected by PHP-CS-Fixer
b707953 Merge branch 'master' into pr/407
7a01fdd Reverted some wrong changes in composer.json
e07d0f8 Finished the implementation
a7ebbff Updated to php-cs-fixer 2.0

Author: javiereguiluz

.php_cs

@@ -1,29 +1,28 @@
 #!/usr/bin/env php
 <?php
 
-$finder = Symfony\CS\Finder::create()
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true)
-    ->exclude('app/config')
-    ->exclude('app/data')
-    ->exclude('app/Resources')
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
     ->exclude('var')
-    ->exclude('vendor')
     ->exclude('web/bundles')
     ->exclude('web/css')
     ->exclude('web/fonts')
     ->exclude('web/js')
     ->notPath('web/config.php')
-    ->in(__DIR__)
 ;
 
-return Symfony\CS\Config::create()
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers([
-        '-psr0', // Ignore Tests\ namespace prefix mismatch with tests/ directory
-        'ordered_use',
-        'phpdoc_order',
-        'short_array_syntax',
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'phpdoc_order' => true,
+        'php_unit_strict' => true,
+        'strict_comparison' => true,
     ])
-    ->finder($finder)
+    ->setFinder($finder)
 ;

composer.json

@@ -31,7 +31,7 @@
         "white-october/pagerfanta-bundle"      : "^1.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer"            : "^1.12",
+        "friendsofphp/php-cs-fixer"            : "^2.0",
         "phpunit/phpunit"                      : "^4.8 || ^5.0",
         "sensio/generator-bundle"              : "^3.0",
         "symfony/phpunit-bridge"               : "^3.0"