Added php-cs-fixer to format and check code (FriendsOfSymfony#2240)

* Added php-cs-fixer to format and check code

* Fixed tests

* Execute php-cs-fixer

Author: core23

.gitattributes

@@ -1,6 +1,7 @@
 /Tests           export-ignore
 /.gitattributes  export-ignore
 /.gitignore      export-ignore
+/.php_cs         export-ignore
 /.travis.yml     export-ignore
 /README.markdown export-ignore
 /Upgrade.md      export-ignore

.gitignore

@@ -1,3 +1,4 @@
+.php_cs.cache
 composer.lock
 phpunit.xml
 Propel/om/*

.php_cs

@@ -0,0 +1,35 @@
+<?php
+
+$header = <<<EOF
+This file is part of the FOSUserBundle 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.
+EOF;
+
+Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header);
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->in(array(__DIR__))
+    ->exclude(array('Tests/Fixtures'))
+;
+
+return Symfony\CS\Config\Config::create()
+    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
+    ->fixers(array(
+        'combine_consecutive_unsets',
+        'header_comment',
+        'long_array_syntax',
+        'newline_after_open_tag',
+        'no_php4_constructor',
+        'no_useless_else',
+        'ordered_class_elements',
+        'ordered_use',
+        'php_unit_construct',
+        'php_unit_strict',
+    ))
+    ->setUsingCache(true)
+    ->finder($finder)
+;

.travis.yml

@@ -8,9 +8,15 @@ php:
   - 7.0
   - hhvm
 
+env:
+  global:
+    - TARGET=test
+
 matrix:
   fast_finish: true
   include:
+    - php: 7.0
+      env: TARGET=cs_dry_run
     - php: 5.3
       env: COMPOSER_FLAGS="--prefer-lowest"
     - php: 5.6
@@ -36,7 +42,7 @@ before_install:
 install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 
 script:
-  - phpunit --coverage-text
+ - make $TARGET
 
 notifications:
   email: [email protected]

Command/ActivateUserCommand.php

@@ -33,7 +33,7 @@ protected function configure()
             ->setDefinition(array(
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
             ))
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:activate</info> command activates a user (so they will be able to log in):
 
   <info>php %command.full_name% matthieu</info>
@@ -61,7 +61,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function($username) {
+            $question->setValidator(function ($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }

Command/ChangePasswordCommand.php

@@ -18,7 +18,7 @@
 use Symfony\Component\Console\Question\Question;
 
 /**
- * ChangePasswordCommand
+ * ChangePasswordCommand.
  */
 class ChangePasswordCommand extends ContainerAwareCommand
 {
@@ -34,7 +34,7 @@ protected function configure()
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
                 new InputArgument('password', InputArgument::REQUIRED, 'The password'),
             ))
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:change-password</info> command changes the password of a user:
 
   <info>php %command.full_name% matthieu</info>
@@ -72,7 +72,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please give the username:');
-            $question->setValidator(function($username) {
+            $question->setValidator(function ($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -84,7 +84,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('password')) {
             $question = new Question('Please enter the new password:');
-            $question->setValidator(function($password) {
+            $question->setValidator(function ($password) {
                 if (empty($password)) {
                     throw new \Exception('Password can not be empty');
                 }

Command/CreateUserCommand.php

@@ -13,8 +13,8 @@
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 
@@ -40,7 +40,7 @@ protected function configure()
                 new InputOption('super-admin', null, InputOption::VALUE_NONE, 'Set the user as super admin'),
                 new InputOption('inactive', null, InputOption::VALUE_NONE, 'Set the user as inactive'),
             ))
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:create</info> command creates a user:
 
   <info>php %command.full_name% matthieu</info>
@@ -68,10 +68,10 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $username   = $input->getArgument('username');
-        $email      = $input->getArgument('email');
-        $password   = $input->getArgument('password');
-        $inactive   = $input->getOption('inactive');
+        $username = $input->getArgument('username');
+        $email = $input->getArgument('email');
+        $password = $input->getArgument('password');
+        $inactive = $input->getOption('inactive');
         $superadmin = $input->getOption('super-admin');
 
         $manipulator = $this->getContainer()->get('fos_user.util.user_manipulator');
@@ -89,7 +89,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function($username) {
+            $question->setValidator(function ($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -101,7 +101,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('email')) {
             $question = new Question('Please choose an email:');
-            $question->setValidator(function($email) {
+            $question->setValidator(function ($email) {
                 if (empty($email)) {
                     throw new \Exception('Email can not be empty');
                 }
@@ -113,7 +113,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('password')) {
             $question = new Question('Please choose a password:');
-            $question->setValidator(function($password) {
+            $question->setValidator(function ($password) {
                 if (empty($password)) {
                     throw new \Exception('Password can not be empty');
                 }

Command/DeactivateUserCommand.php

@@ -33,7 +33,7 @@ protected function configure()
             ->setDefinition(array(
                 new InputArgument('username', InputArgument::REQUIRED, 'The username'),
             ))
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:deactivate</info> command deactivates a user (will not be able to log in)
 
   <info>php %command.full_name% matthieu</info>
@@ -61,7 +61,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
     {
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function($username) {
+            $question->setValidator(function ($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }

Command/DemoteUserCommand.php

@@ -11,8 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Component\Console\Output\OutputInterface;
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * @author Antoine Hérault <[email protected]>
@@ -30,7 +30,7 @@ protected function configure()
         $this
             ->setName('fos:user:demote')
             ->setDescription('Demote a user by removing a role')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:demote</info> command demotes a user by removing a role
 
   <info>php %command.full_name% matthieu ROLE_CUSTOM</info>

Command/PromoteUserCommand.php

@@ -11,8 +11,8 @@
 
 namespace FOS\UserBundle\Command;
 
-use Symfony\Component\Console\Output\OutputInterface;
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * @author Matthieu Bontemps <[email protected]>
@@ -32,7 +32,7 @@ protected function configure()
         $this
             ->setName('fos:user:promote')
             ->setDescription('Promotes a user by adding a role')
-            ->setHelp(<<<EOT
+            ->setHelp(<<<'EOT'
 The <info>fos:user:promote</info> command promotes a user by adding a role
 
   <info>php %command.full_name% matthieu ROLE_CUSTOM</info>

Command/RoleCommand.php

@@ -11,12 +11,12 @@
 
 namespace FOS\UserBundle\Command;
 
+use FOS\UserBundle\Util\UserManipulator;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use FOS\UserBundle\Util\UserManipulator;
 use Symfony\Component\Console\Question\Question;
 
 /**
@@ -64,10 +64,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
      * @param UserManipulator $manipulator
      * @param OutputInterface $output
      * @param string          $username
-     * @param boolean         $super
+     * @param bool            $super
      * @param string          $role
-     *
-     * @return void
      */
     abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role);
 
@@ -80,7 +78,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function($username) {
+            $question->setValidator(function ($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -92,7 +90,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
         if ((true !== $input->getOption('super')) && !$input->getArgument('role')) {
             $question = new Question('Please choose a role:');
-            $question->setValidator(function($role) {
+            $question->setValidator(function ($role) {
                 if (empty($role)) {
                     throw new \Exception('Role can not be empty');
                 }

Controller/ChangePasswordController.php

@@ -11,30 +11,30 @@
 
 namespace FOS\UserBundle\Controller;
 
-use FOS\UserBundle\Form\Factory\FactoryInterface;
-use FOS\UserBundle\FOSUserEvents;
-use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\FilterUserResponseEvent;
+use FOS\UserBundle\Event\FormEvent;
 use FOS\UserBundle\Event\GetResponseUserEvent;
+use FOS\UserBundle\Form\Factory\FactoryInterface;
+use FOS\UserBundle\FOSUserEvents;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 
 /**
- * Controller managing the password change
+ * Controller managing the password change.
  *
  * @author Thibault Duplessis <[email protected]>
  * @author Christophe Coevoet <[email protected]>
  */
 class ChangePasswordController extends Controller
 {
     /**
-     * Change user password
+     * Change user password.
      *
      * @param Request $request
      *
@@ -85,7 +85,7 @@ public function changePasswordAction(Request $request)
         }
 
         return $this->render('FOSUserBundle:ChangePassword:change_password.html.twig', array(
-            'form' => $form->createView()
+            'form' => $form->createView(),
         ));
     }
 }