Add type hints

nucleos · Oct 1, 2021 · 83fbb0d · 83fbb0d
1 parent 1f199d6
commit 83fbb0d
Show file tree

Hide file tree

Showing 22 changed files with 83 additions and 261 deletions.
diff --git a/src/Action/CheckRegistrationMailAction.php b/src/Action/CheckRegistrationMailAction.php
@@ -20,24 +20,12 @@
 
 final class CheckRegistrationMailAction
 {
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
+    private UserManagerInterface $userManager;
 
-    /**
-     * @var Environment
-     */
-    private $twig;
+    private Environment $twig;
 
-    /**
-     * @var RouterInterface
-     */
-    private $router;
+    private RouterInterface $router;
 
-    /**
-     * CheckRegistrationMailAction constructor.
-     */
     public function __construct(UserManagerInterface $userManager, Environment $twig, RouterInterface $router)
     {
         $this->userManager = $userManager;

diff --git a/src/Action/ConfirmRegistrationAction.php b/src/Action/ConfirmRegistrationAction.php
@@ -23,20 +23,11 @@
 
 final class ConfirmRegistrationAction
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
+    private EventDispatcherInterface $eventDispatcher;
 
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
+    private UserManagerInterface $userManager;
 
-    /**
-     * @var RouterInterface
-     */
-    private $router;
+    private RouterInterface $router;
 
     public function __construct(
         EventDispatcherInterface $eventDispatcher,

diff --git a/src/Action/EditProfileAction.php b/src/Action/EditProfileAction.php
@@ -32,40 +32,19 @@
 
 final class EditProfileAction
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    private $formFactory;
-
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
-
-    /**
-     * @var Environment
-     */
-    private $twig;
-
-    /**
-     * @var RouterInterface
-     */
-    private $router;
-
-    /**
-     * @var Security
-     */
-    private $security;
-
-    /**
-     * @var string
-     */
-    private $formModel;
+    private EventDispatcherInterface $eventDispatcher;
+
+    private FormFactoryInterface $formFactory;
+
+    private UserManagerInterface $userManager;
+
+    private Environment $twig;
+
+    private RouterInterface $router;
+
+    private Security $security;
+
+    private string $formModel;
 
     public function __construct(
         EventDispatcherInterface $eventDispatcher,

diff --git a/src/Action/RegistrationAction.php b/src/Action/RegistrationAction.php
@@ -30,35 +30,17 @@
 
 final class RegistrationAction
 {
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $eventDispatcher;
-
-    /**
-     * @var FormFactoryInterface
-     */
-    private $formFactory;
-
-    /**
-     * @var UserManagerInterface
-     */
-    private $userManager;
-
-    /**
-     * @var Environment
-     */
-    private $twig;
-
-    /**
-     * @var RouterInterface
-     */
-    private $router;
-
-    /**
-     * @var string
-     */
-    private $formModel;
+    private EventDispatcherInterface $eventDispatcher;
+
+    private FormFactoryInterface $formFactory;
+
+    private UserManagerInterface $userManager;
+
+    private Environment $twig;
+
+    private RouterInterface $router;
+
+    private string $formModel;
 
     public function __construct(
         EventDispatcherInterface $eventDispatcher,

diff --git a/src/Action/RegistrationConfirmedAction.php b/src/Action/RegistrationConfirmedAction.php
@@ -22,20 +22,11 @@
 
 final class RegistrationConfirmedAction
 {
-    /**
-     * @var Environment
-     */
-    private $twig;
+    private Environment $twig;
 
-    /**
-     * @var Security
-     */
-    private $security;
+    private Security $security;
 
-    /**
-     * @var TokenStorageInterface
-     */
-    private $tokenStorage;
+    private TokenStorageInterface $tokenStorage;
 
     public function __construct(Environment $twig, Security $security, TokenStorageInterface $tokenStorage)
     {

diff --git a/src/Action/ShowProfileAction.php b/src/Action/ShowProfileAction.php
@@ -19,15 +19,9 @@
 
 final class ShowProfileAction
 {
-    /**
-     * @var Environment
-     */
-    private $twig;
-
-    /**
-     * @var Security
-     */
-    private $security;
+    private Environment $twig;
+
+    private Security $security;
 
     public function __construct(Environment $twig, Security $security)
     {

diff --git a/src/Event/GetResponseRegistrationEvent.php b/src/Event/GetResponseRegistrationEvent.php
@@ -18,28 +18,19 @@
 
 class GetResponseRegistrationEvent extends Event
 {
-    /**
-     * @var Request|null
-     */
-    protected $request;
+    protected ?Request $request;
 
-    /**
-     * @var Registration
-     */
-    protected $registration;
+    protected Registration $registration;
 
-    /**
-     * @var Response|null
-     */
-    private $response;
+    private ?Response $response = null;
 
     public function __construct(Registration $user, Request $request = null)
     {
         $this->registration = $user;
         $this->request      = $request;
     }
 
-    public function setResponse(Response $response): void
+    public function setResponse(?Response $response): void
     {
         $this->response = $response;
     }

diff --git a/src/Event/UserFormEvent.php b/src/Event/UserFormEvent.php
@@ -18,14 +18,12 @@
 
 final class UserFormEvent extends FormEvent
 {
-    /**
-     * @var UserInterface
-     */
-    private $user;
+    private UserInterface $user;
 
     public function __construct(UserInterface $user, FormInterface $form, Request $request)
     {
         parent::__construct($form, $request);
+
         $this->user = $user;
     }
 

diff --git a/src/EventListener/AlreadyLoggedinListener.php b/src/EventListener/AlreadyLoggedinListener.php
@@ -25,19 +25,10 @@
 
 final class AlreadyLoggedinListener implements EventSubscriberInterface
 {
-    /**
-     * @var Security
-     */
-    private $security;
-
-    /**
-     * @var RouterInterface
-     */
-    private $router;
-
-    /**
-     * AlreadyLoggedinListener constructor.
-     */
+    private Security $security;
+
+    private RouterInterface $router;
+
     public function __construct(Security $security, RouterInterface $router)
     {
         $this->security = $security;

diff --git a/src/EventListener/AuthenticationListener.php b/src/EventListener/AuthenticationListener.php
@@ -22,15 +22,9 @@
 
 final class AuthenticationListener implements EventSubscriberInterface
 {
-    /**
-     * @var LoginManagerInterface
-     */
-    private $loginManager;
+    private LoginManagerInterface $loginManager;
 
-    /**
-     * @var string
-     */
-    private $firewallName;
+    private string $firewallName;
 
     public function __construct(LoginManagerInterface $loginManager, string $firewallName)
     {

diff --git a/src/EventListener/EmailConfirmationListener.php b/src/EventListener/EmailConfirmationListener.php
@@ -22,25 +22,13 @@
 
 final class EmailConfirmationListener implements EventSubscriberInterface
 {
-    /**
-     * @var MailerInterface
-     */
-    private $mailer;
+    private MailerInterface $mailer;
 
-    /**
-     * @var TokenGeneratorInterface
-     */
-    private $tokenGenerator;
+    private TokenGeneratorInterface $tokenGenerator;
 
-    /**
-     * @var UrlGeneratorInterface
-     */
-    private $router;
+    private UrlGeneratorInterface $router;
 
-    /**
-     * @var SessionInterface
-     */
-    private $session;
+    private SessionInterface $session;
 
     public function __construct(
         MailerInterface $mailer,

diff --git a/src/EventListener/FlashListener.php b/src/EventListener/FlashListener.php
@@ -23,20 +23,14 @@ final class FlashListener implements EventSubscriberInterface
     /**
      * @var string[]
      */
-    private static $successMessages = [
+    private static array $successMessages = [
         NucleosProfileEvents::PROFILE_EDIT_COMPLETED => 'profile.flash.updated',
         NucleosProfileEvents::REGISTRATION_COMPLETED => 'registration.flash.user_created',
     ];
 
-    /**
-     * @var FlashBagInterface
-     */
-    private $flashBag;
+    private FlashBagInterface $flashBag;
 
-    /**
-     * @var TranslatorInterface
-     */
-    private $translator;
+    private TranslatorInterface $translator;
 
     public function __construct(FlashBagInterface $flashBag, TranslatorInterface $translator)
     {

diff --git a/src/Form/Model/Profile.php b/src/Form/Model/Profile.php
@@ -16,15 +16,9 @@
 
 class Profile
 {
-    /**
-     * @var string|null
-     */
-    protected $locale;
+    protected ?string $locale = null;
 
-    /**
-     * @var string|null
-     */
-    protected $timezone;
+    protected ?string $timezone = null;
 
     public static function fromUser(UserInterface $user): self
     {

diff --git a/src/Form/Model/Registration.php b/src/Form/Model/Registration.php
@@ -16,20 +16,11 @@
 
 class Registration
 {
-    /**
-     * @var string|null
-     */
-    protected $username;
+    protected ?string $username = null;
 
-    /**
-     * @var string|null
-     */
-    protected $email;
+    protected ?string $email = null;
 
-    /**
-     * @var string|null
-     */
-    protected $plainPassword;
+    protected ?string $plainPassword = null;
 
     public function getUsername(): ?string
     {