Applied fixes from StyleCI (#734)

sonata-project · May 14, 2016 · dc2fd77 · dc2fd77
1 parent e25f44a
commit dc2fd77
Show file tree

Hide file tree

Showing 72 changed files with 340 additions and 351 deletions.
diff --git a/Admin/Document/GroupAdmin.php b/Admin/Document/GroupAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/Document/UserAdmin.php b/Admin/Document/UserAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/Entity/GroupAdmin.php b/Admin/Entity/GroupAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/Entity/UserAdmin.php b/Admin/Entity/UserAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/Model/GroupAdmin.php b/Admin/Model/GroupAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Admin/Model/UserAdmin.php b/Admin/Model/UserAdmin.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -53,6 +53,31 @@ public function getExportFields()
         });
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function preUpdate($user)
+    {
+        $this->getUserManager()->updateCanonicalFields($user);
+        $this->getUserManager()->updatePassword($user);
+    }
+
+    /**
+     * @param UserManagerInterface $userManager
+     */
+    public function setUserManager(UserManagerInterface $userManager)
+    {
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * @return UserManagerInterface
+     */
+    public function getUserManager()
+    {
+        return $this->userManager;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -160,17 +185,17 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->end()
                 ->with('Profile')
                     ->add('dateOfBirth', 'sonata_type_date_picker', array(
-                        'years'       => range(1900, $now->format('Y')),
+                        'years' => range(1900, $now->format('Y')),
                         'dp_min_date' => '1-1-1900',
                         'dp_max_date' => $now->format('c'),
-                        'required'    => false,
+                        'required' => false,
                     ))
                     ->add('firstname', null, array('required' => false))
                     ->add('lastname', null, array('required' => false))
                     ->add('website', 'url', array('required' => false))
                     ->add('biography', 'text', array('required' => false))
                     ->add('gender', 'sonata_user_gender', array(
-                        'required'           => true,
+                        'required' => true,
                         'translation_domain' => $this->getTranslationDomain(),
                     ))
                     ->add('locale', 'locale', array('required' => false))
@@ -202,7 +227,7 @@ protected function configureFormFields(FormMapper $formMapper)
                 ->end()
                 ->with('Roles')
                     ->add('realRoles', 'sonata_security_roles', array(
-                        'label'    => 'form.label_roles',
+                        'label' => 'form.label_roles',
                         'expanded' => true,
                         'multiple' => true,
                         'required' => false,
@@ -215,29 +240,4 @@ protected function configureFormFields(FormMapper $formMapper)
             ->end()
         ;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function preUpdate($user)
-    {
-        $this->getUserManager()->updateCanonicalFields($user);
-        $this->getUserManager()->updatePassword($user);
-    }
-
-    /**
-     * @param UserManagerInterface $userManager
-     */
-    public function setUserManager(UserManagerInterface $userManager)
-    {
-        $this->userManager = $userManager;
-    }
-
-    /**
-     * @return UserManagerInterface
-     */
-    public function getUserManager()
-    {
-        return $this->userManager;
-    }
 }
diff --git a/Block/AccountBlockService.php b/Block/AccountBlockService.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -64,8 +64,8 @@ public function execute(BlockContextInterface $blockContext, Response $response
         }
 
         return $this->renderPrivateResponse($blockContext->getTemplate(), array(
-            'user'    => $user,
-            'block'   => $blockContext->getBlock(),
+            'user' => $user,
+            'block' => $blockContext->getBlock(),
             'context' => $blockContext,
         ));
     }
@@ -77,7 +77,7 @@ public function configureSettings(OptionsResolver $resolver)
     {
         $resolver->setDefaults(array(
             'template' => 'SonataUserBundle:Block:account.html.twig',
-            'ttl'      => 0,
+            'ttl' => 0,
         ));
     }
 

diff --git a/Block/Breadcrumb/BaseUserProfileBreadcrumbBlockService.php b/Block/Breadcrumb/BaseUserProfileBreadcrumbBlockService.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -29,7 +29,7 @@ protected function getRootMenu(BlockContextInterface $blockContext)
         $menu = parent::getRootMenu($blockContext);
 
         $menu->addChild('sonata_user_profile_breadcrumb_index', array(
-            'route'  => 'sonata_user_profile_show',
+            'route' => 'sonata_user_profile_show',
             'extras' => array('translation_domain' => 'SonataUserBundle'),
         ));
 

diff --git a/Block/Breadcrumb/UserIndexBreadcrumbBlockService.php b/Block/Breadcrumb/UserIndexBreadcrumbBlockService.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Block/Breadcrumb/UserProfileBreadcrumbBlockService.php b/Block/Breadcrumb/UserProfileBreadcrumbBlockService.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -36,7 +36,7 @@ protected function getMenu(BlockContextInterface $blockContext)
         $menu = $this->getRootMenu($blockContext);
 
         $menu->addChild('sonata_user_profile_breadcrumb_edit', array(
-            'route'  => 'sonata_user_profile_edit',
+            'route' => 'sonata_user_profile_edit',
             'extras' => array('translation_domain' => 'SonataUserBundle'),
         ));
 

diff --git a/Block/ProfileMenuBlockService.php b/Block/ProfileMenuBlockService.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -62,7 +62,7 @@ public function configureSettings(OptionsResolver $resolver)
         parent::configureSettings($resolver);
 
         $resolver->setDefaults(array(
-            'cache_policy'  => 'private',
+            'cache_policy' => 'private',
             'menu_template' => 'SonataBlockBundle:Block:block_side_menu_template.html.twig',
         ));
     }
@@ -80,7 +80,7 @@ protected function getMenu(BlockContextInterface $blockContext)
             $menu = $this->menuBuilder->createProfileMenu(
                 array(
                     'childrenAttributes' => array('class' => $settings['menu_class']),
-                    'attributes'         => array('class' => $settings['children_class']),
+                    'attributes' => array('class' => $settings['children_class']),
                 )
             );
 

diff --git a/Command/TwoStepVerificationCommand.php b/Command/TwoStepVerificationCommand.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *

diff --git a/Controller/AdminResettingController.php b/Controller/AdminResettingController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * This file is part of the Sonata package.
+ * This file is part of the Sonata Project package.
  *
  * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
@@ -33,7 +33,7 @@ public function requestAction()
 
         return $this->container->get('templating')->renderResponse('SonataUserBundle:Admin:Security/Resetting/request.html.'.$this->getEngine(), array(
             'base_template' => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
-            'admin_pool'    => $this->container->get('sonata.admin.pool'),
+            'admin_pool' => $this->container->get('sonata.admin.pool'),
         ));
     }
 
@@ -50,15 +50,15 @@ public function sendEmailAction()
         if (null === $user) {
             return $this->container->get('templating')->renderResponse('SonataUserBundle:Admin:Security/Resetting/request.html.'.$this->getEngine(), array(
                 'invalid_username' => $username,
-                'base_template'    => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
-                'admin_pool'       => $this->container->get('sonata.admin.pool'),
+                'base_template' => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
+                'admin_pool' => $this->container->get('sonata.admin.pool'),
             ));
         }
 
         if ($user->isPasswordRequestNonExpired($this->container->getParameter('fos_user.resetting.token_ttl'))) {
             return $this->container->get('templating')->renderResponse('SonataUserBundle:Admin:Security/Resetting/passwordAlreadyRequested.html.'.$this->getEngine(), array(
-                'base_template'    => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
-                'admin_pool'       => $this->container->get('sonata.admin.pool'),
+                'base_template' => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
+                'admin_pool' => $this->container->get('sonata.admin.pool'),
             ));
         }
 
@@ -91,9 +91,9 @@ public function checkEmailAction()
         }
 
         return $this->container->get('templating')->renderResponse('SonataUserBundle:Admin:Security/Resetting/checkEmail.html.'.$this->getEngine(), array(
-            'email'         => $email,
+            'email' => $email,
             'base_template' => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
-            'admin_pool'    => $this->container->get('sonata.admin.pool'),
+            'admin_pool' => $this->container->get('sonata.admin.pool'),
         ));
     }
 
@@ -129,10 +129,10 @@ public function resetAction($token)
         }
 
         return $this->container->get('templating')->renderResponse('SonataUserBundle:Admin:Security/Resetting/reset.html.'.$this->getEngine(), array(
-            'token'         => $token,
-            'form'          => $form->createView(),
+            'token' => $token,
+            'form' => $form->createView(),
             'base_template' => $this->container->get('sonata.admin.pool')->getTemplate('layout'),
-            'admin_pool'    => $this->container->get('sonata.admin.pool'),
+            'admin_pool' => $this->container->get('sonata.admin.pool'),
         ));
     }
 }
diff --git a/Controller/AdminSecurityController.php b/Controller/AdminSecurityController.php
@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the FOSUserBundle package.
+ * This file is part of the Sonata Project package.
  *
- * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -82,14 +82,24 @@ public function loginAction(Request $request = null)
 
         return $this->render('SonataUserBundle:Admin:Security/login.html.'.$this->container->getParameter('fos_user.template.engine'), array(
                 'last_username' => $lastUsername,
-                'error'         => $error,
-                'csrf_token'    => $csrfToken,
+                'error' => $error,
+                'csrf_token' => $csrfToken,
                 'base_template' => $this->get('sonata.admin.pool')->getTemplate('layout'),
-                'admin_pool'    => $this->get('sonata.admin.pool'),
-                'reset_route'   => $resetRoute, // TODO: Deprecated in 2.3, to be removed in 3.0
+                'admin_pool' => $this->get('sonata.admin.pool'),
+                'reset_route' => $resetRoute, // TODO: Deprecated in 2.3, to be removed in 3.0
             ));
     }
 
+    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.
@@ -104,14 +114,4 @@ protected function renderLogin(array $data)
 
         return $this->render($template, $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.');
-    }
 }