Merge pull request #2051 from XWB/csfixer

Update to CS Fixer 2

Author: XWB

.php_cs

@@ -1,12 +1,5 @@
 <?php
 
-use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;
-
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in(__DIR__)
-    ->exclude('features/fixtures/TestApp/cache')
-;
-
 $header = <<<EOF
 This file is part of the FOSRestBundle package.
 
@@ -16,10 +9,14 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 EOF;
 
-HeaderCommentFixer::setHeader($header);
-
-return Symfony\CS\Config\Config::create()
-    ->setUsingCache(true)
-    ->fixers(['-psr0'])
-    ->finder($finder)
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        'psr0' => true,
+        'header_comment' => ['header' => $header],
+    ))
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    )
 ;

Tests/Fixtures/Controller/ParamConverterController.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\RestBundle\Tests\Fixtures\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;

Tests/Functional/app/Configuration/security.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Controller\UserValueResolver;
 

Tests/Functional/app/ConfigurationWithTwig/security.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Security\Http\Controller\UserValueResolver;
 

composer.json

@@ -62,7 +62,8 @@
         "phpoption/phpoption": "^1.1",
         "jms/serializer-bundle": "^2.3.1|^3.0",
         "jms/serializer": "^1.13|^2.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0",
+        "friendsofphp/php-cs-fixer": "^2.0"
     },
     "suggest": {
         "sensio/framework-extra-bundle": "Add support for the request body converter and the view response listener, requires ^3.0",