Merge remote-tracking branch 'origin/master' into issue133_user_current_location

src/Bundle/ChillMainBundle/Controller/AdminCountryCRUDController.php

@@ -1,20 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\CRUDController;
-use Chill\MainBundle\Entity\Country;
-use Chill\MainBundle\Pagination\PaginatorFactory;
 
-/**
- * 
- *
- */
 class AdminCountryCRUDController extends CRUDController
 {
-    
-    function __construct(PaginatorFactory $paginator)
-    {
-        $this->paginatorFactory = $paginator;
-    }
+
 }

src/Bundle/ChillMainBundle/Controller/UserController.php

@@ -137,17 +137,15 @@ class UserController extends CRUDController
         ]);
     }
 
-    /**
-     *
-     *
-     * @param User $user
-     * @return \Symfony\Component\Form\Form
-     */
-    private function createEditPasswordForm(User $user)
+    private function createEditPasswordForm(User $user): FormInterface
     {
-        return $this->createForm(UserPasswordType::class, null, array(
-            'user' => $user
-        ))
+        return $this->createForm(
+            UserPasswordType::class,
+            null,
+                [
+                    'user' => $user
+                ]
+            )
             ->add('submit', SubmitType::class, array('label' => 'Change password'))
             ->remove('actual_password');
     }
@@ -314,7 +312,7 @@ class UserController extends CRUDController
     {
         $user = $this->getUser();
         $form = $this->createForm(UserCurrentLocationType::class, $user)
-           ->add('submit', SubmitType::class, ['label' => 'Change current location'])
+           ->add('submit', SubmitType::class, ['label' => 'Save'])
            ->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {