Upgrade CS fixer

andolini · Dec 19, 2017 · 0451881 · 0451881
1 parent 3d8f8f4
commit 0451881
Show file tree

Hide file tree

Showing 23 changed files with 192 additions and 187 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.php_cs
 .php_cs.cache
 composer.lock
 phpunit.xml

diff --git a/.php_cs b/.php_cs
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,33 @@
+<?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;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'array_syntax' => ['syntax' => 'long'],
+        'combine_consecutive_unsets' => true,
+        'header_comment' => ['header' => $header],
+        'linebreak_after_opening_tag' => true,
+        'no_php4_constructor' => true,
+        'no_useless_else' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_construct' => true,
+        'php_unit_strict' => true,
+        'phpdoc_no_empty_return' => false,
+    ])
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+    )
+;
diff --git a/Controller/ProfileController.php b/Controller/ProfileController.php
@@ -27,7 +27,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\TranslatorInterface;
 
 /**

diff --git a/Controller/SecurityController.php b/Controller/SecurityController.php
@@ -81,6 +81,16 @@ public function loginAction(Request $request)
         ));
     }
 
+    public function checkAction()
+    {
+        throw new \RuntimeException('You must configure the check path to be handled by the firewall using form_login in your security firewall configuration.');
+    }
+
+    public function logoutAction()
+    {
+        throw new \RuntimeException('You must activate the logout in your security firewall configuration.');
+    }
+
     /**
      * Renders the login template with the given parameters. Overwrite this function in
      * an extended controller to provide additional data for the login template.
@@ -93,14 +103,4 @@ protected function renderLogin(array $data)
     {
         return $this->render('@FOSUser/Security/login.html.twig', $data);
     }
-
-    public function checkAction()
-    {
-        throw new \RuntimeException('You must configure the check path to be handled by the firewall using form_login in your security firewall configuration.');
-    }
-
-    public function logoutAction()
-    {
-        throw new \RuntimeException('You must activate the logout in your security firewall configuration.');
-    }
 }
diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -133,6 +133,54 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getNamespace()
+    {
+        return 'http://friendsofsymfony.github.io/schema/dic/user';
+    }
+
+    /**
+     * @param array            $config
+     * @param ContainerBuilder $container
+     * @param array            $map
+     */
+    protected function remapParameters(array $config, ContainerBuilder $container, array $map)
+    {
+        foreach ($map as $name => $paramName) {
+            if (array_key_exists($name, $config)) {
+                $container->setParameter($paramName, $config[$name]);
+            }
+        }
+    }
+
+    /**
+     * @param array            $config
+     * @param ContainerBuilder $container
+     * @param array            $namespaces
+     */
+    protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces)
+    {
+        foreach ($namespaces as $ns => $map) {
+            if ($ns) {
+                if (!array_key_exists($ns, $config)) {
+                    continue;
+                }
+                $namespaceConfig = $config[$ns];
+            } else {
+                $namespaceConfig = $config;
+            }
+            if (is_array($map)) {
+                $this->remapParameters($namespaceConfig, $container, $map);
+            } else {
+                foreach ($namespaceConfig as $name => $value) {
+                    $container->setParameter(sprintf($map, $name), $value);
+                }
+            }
+        }
+    }
+
     /**
      * @param array            $config
      * @param ContainerBuilder $container
@@ -254,52 +302,4 @@ private function loadGroups(array $config, ContainerBuilder $container, XmlFileL
             'form' => 'fos_user.group.form.%s',
         ));
     }
-
-    /**
-     * @param array            $config
-     * @param ContainerBuilder $container
-     * @param array            $map
-     */
-    protected function remapParameters(array $config, ContainerBuilder $container, array $map)
-    {
-        foreach ($map as $name => $paramName) {
-            if (array_key_exists($name, $config)) {
-                $container->setParameter($paramName, $config[$name]);
-            }
-        }
-    }
-
-    /**
-     * @param array            $config
-     * @param ContainerBuilder $container
-     * @param array            $namespaces
-     */
-    protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces)
-    {
-        foreach ($namespaces as $ns => $map) {
-            if ($ns) {
-                if (!array_key_exists($ns, $config)) {
-                    continue;
-                }
-                $namespaceConfig = $config[$ns];
-            } else {
-                $namespaceConfig = $config;
-            }
-            if (is_array($map)) {
-                $this->remapParameters($namespaceConfig, $container, $map);
-            } else {
-                foreach ($namespaceConfig as $name => $value) {
-                    $container->setParameter(sprintf($map, $name), $value);
-                }
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNamespace()
-    {
-        return 'http://friendsofsymfony.github.io/schema/dic/user';
-    }
 }
diff --git a/Doctrine/UserManager.php b/Doctrine/UserManager.php
@@ -46,14 +46,6 @@ public function __construct(PasswordUpdaterInterface $passwordUpdater, Canonical
         $this->class = $class;
     }
 
-    /**
-     * @return ObjectRepository
-     */
-    protected function getRepository()
-    {
-        return $this->objectManager->getRepository($this->getClass());
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -113,4 +105,12 @@ public function updateUser(UserInterface $user, $andFlush = true)
             $this->objectManager->flush();
         }
     }
+
+    /**
+     * @return ObjectRepository
+     */
+    protected function getRepository()
+    {
+        return $this->objectManager->getRepository($this->getClass());
+    }
 }
diff --git a/Form/Type/ChangePasswordFormType.php b/Form/Type/ChangePasswordFormType.php
@@ -86,6 +86,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     // BC for SF < 3.0
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Type/GroupFormType.php b/Form/Type/GroupFormType.php
@@ -50,6 +50,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     // BC for SF < 3.0
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Type/ProfileFormType.php b/Form/Type/ProfileFormType.php
@@ -75,6 +75,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     // BC for SF < 3.0
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Type/RegistrationFormType.php b/Form/Type/RegistrationFormType.php
@@ -68,6 +68,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     // BC for SF < 3.0
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Type/ResettingFormType.php b/Form/Type/ResettingFormType.php
@@ -63,6 +63,7 @@ public function configureOptions(OptionsResolver $resolver)
     }
 
     // BC for SF < 3.0
+
     /**
      * {@inheritdoc}
      */

diff --git a/Form/Type/UsernameFormType.php b/Form/Type/UsernameFormType.php
@@ -55,6 +55,7 @@ public function getParent()
     }
 
     // BC for SF < 3.0
+
     /**
      * @return string
      */

diff --git a/Mailer/TwigSwiftMailer.php b/Mailer/TwigSwiftMailer.php
@@ -87,6 +87,26 @@ public function sendResettingEmailMessage(UserInterface $user)
         $this->sendMessage($template, $context, $this->parameters['from_email']['resetting'], (string) $user->getEmail());
     }
 
+    /**
+     * Send confirmation link to specified new user email.
+     *
+     * @param UserInterface $user
+     * @param $confirmationUrl
+     * @param $toEmail
+     *
+     * @return bool
+     */
+    public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail)
+    {
+        $template = $this->parameters['template']['email_updating'];
+        $context = array(
+            'user' => $user,
+            'confirmationUrl' => $confirmationUrl,
+        );
+
+        $this->sendMessage($template, $context, $this->parameters['from_email']['confirmation'], $toEmail);
+    }
+
     /**
      * @param string $templateName
      * @param array  $context
@@ -119,24 +139,4 @@ protected function sendMessage($templateName, $context, $fromEmail, $toEmail)
 
         $this->mailer->send($message);
     }
-
-    /**
-     * Send confirmation link to specified new user email.
-     *
-     * @param UserInterface $user
-     * @param $confirmationUrl
-     * @param $toEmail
-     *
-     * @return bool
-     */
-    public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail)
-    {
-        $template = $this->parameters['template']['email_updating'];
-        $context = array(
-            'user' => $user,
-            'confirmationUrl' => $confirmationUrl,
-        );
-
-        $this->sendMessage($template, $context, $this->parameters['from_email']['confirmation'], $toEmail);
-    }
 }
diff --git a/Model/GroupManager.php b/Model/GroupManager.php
@@ -28,6 +28,7 @@ public function createGroup($name)
 
         return new $class($name);
     }
+
     /**
      * {@inheritdoc}
      */

diff --git a/Model/User.php b/Model/User.php
@@ -109,6 +109,14 @@ public function __construct()
         $this->roles = array();
     }
 
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->getUsername();
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -546,12 +554,4 @@ public function removeGroup(GroupInterface $group)
 
         return $this;
     }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->getUsername();
-    }
 }
diff --git a/Model/UserManager.php b/Model/UserManager.php
@@ -65,7 +65,7 @@ public function findUserByUsernameOrEmail($usernameOrEmail)
     {
         if (preg_match('/^.+\@\S+\.\S+$/', $usernameOrEmail)) {
             $user = $this->findUserByEmail($usernameOrEmail);
-            if ($user !== null) {
+            if (null !== $user) {
                 return $user;
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ public function configureOptions(OptionsResolver $resolver) @@
         }
         // BC for SF < 3.0
         /**
          * {@inheritdoc}
          */
@@ Expand Down @@