Fix phpstan issues

src/Bundle/ChillMainBundle/Controller/PasswordController.php

@@ -13,6 +13,7 @@ namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\UserPasswordType;
+use Chill\MainBundle\Security\ChillSecurity;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverEvent;
 use Chill\MainBundle\Security\PasswordRecover\PasswordRecoverVoter;
 use Chill\MainBundle\Security\PasswordRecover\RecoverPasswordHelper;
@@ -24,6 +25,7 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Validator\Constraints\Callback;
@@ -33,56 +35,12 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /**
  * Class PasswordController.
  */
-class PasswordController extends AbstractController
+final class PasswordController extends AbstractController
 {
-    /**
-     * @var LoggerInterface
-     */
-    protected $chillLogger;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    protected $eventDispatcher;
-
-    /**
-     * @var UserPasswordEncoderInterface
-     */
-    protected $passwordEncoder;
-
-    /**
-     * @var RecoverPasswordHelper
-     */
-    protected $recoverPasswordHelper;
-
-    /**
-     * @var TokenManager
-     */
-    protected $tokenManager;
-
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
     /**
      * PasswordController constructor.
      */
-    public function __construct(
-        LoggerInterface $chillLogger,
-        UserPasswordEncoderInterface $passwordEncoder,
-        RecoverPasswordHelper $recoverPasswordHelper,
-        TokenManager $tokenManager,
-        TranslatorInterface $translator,
-        EventDispatcherInterface $eventDispatcher
-    ) {
-        $this->chillLogger = $chillLogger;
-        $this->passwordEncoder = $passwordEncoder;
-        $this->translator = $translator;
-        $this->tokenManager = $tokenManager;
-        $this->recoverPasswordHelper = $recoverPasswordHelper;
-        $this->eventDispatcher = $eventDispatcher;
-    }
+    public function __construct(private readonly LoggerInterface $chillLogger, private readonly UserPasswordEncoderInterface $passwordEncoder, private readonly RecoverPasswordHelper $recoverPasswordHelper, private readonly TokenManager $tokenManager, private readonly TranslatorInterface $translator, private readonly EventDispatcherInterface $eventDispatcher, private readonly ChillSecurity $security) {}
 
     /**
      * @return Response
@@ -250,8 +208,11 @@ class PasswordController extends AbstractController
      */
     public function UserPasswordAction(Request $request)
     {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
         // get authentified user
-        $user = $this->getUser();
+        $user = $this->security->getUser();
 
         // create a form for password_encoder
         $form = $this->passwordForm($user);
@@ -269,7 +230,7 @@ class PasswordController extends AbstractController
                     'update password for an user',
                     [
                         'method' => $request->getMethod(),
-                        'user' => $user->getUsername(),
+                        'user' => $user->getUserIdentifier(),
                     ]
                 );