Refactorisation des classes services

src/Security/LoginFormAuthenticator.php

@@ -60,7 +60,7 @@ class LoginFormAuthenticator extends AbstractLoginFormAuthenticator
         );
     }
 
-    public function checkCredentials($credentials, UserInterface $user)
+    public function checkCredentials($credentials, UserInterface $user): bool
     {
         // Check the user's password or other credentials and return true or false
         // If there are no credentials to check, you can just return true

src/Security/UserChecker.php

@@ -9,7 +9,7 @@ use Symfony\Component\Security\Core\User\UserInterface;
 
 class UserChecker implements UserCheckerInterface
 {
-    public function checkPreAuth(UserInterface $user)
+    public function checkPreAuth(UserInterface $user): void
     {
         if (!$user instanceof AppUser)
         {
@@ -17,7 +17,7 @@ class UserChecker implements UserCheckerInterface
         }
     }
 
-    public function checkPostAuth(UserInterface $user)
+    public function checkPostAuth(UserInterface $user): void
     {
         if (!$user instanceof AppUser)
         {

src/Service/ActivityListener.php

@@ -8,16 +8,11 @@ use Symfony\Component\Security\Core\Security;
 
 class ActivityListener
 {
-    private $em;
-    private $security;
-
-    public function __construct(EntityManagerInterface $em, Security $security)
+    public function __construct(protected EntityManagerInterface $em, protected Security $security)
     {
-        $this->em = $em;
-        $this->security = $security;
     }
 
-    public function onKernelController(ControllerEvent $event)
+    public function onKernelController(ControllerEvent $event): void
     {
         // Check that the current request is a "MASTER_REQUEST"
         // Ignore any sub-request

src/Service/CommentaireManager.php

@@ -3,25 +3,28 @@
 namespace App\Service;
 
 use App\Entity\Commentaire;
+use App\Entity\Film;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * Class CommentaireManager
  */
 class CommentaireManager {
-    private $em;
-    private $uc;
-    private $user;
 
-    public function __construct(EntityManagerInterface $em, UniciteCollections $uc, Security $security)
+    protected UserInterface $user;
+
+    public function __construct(
+        protected EntityManagerInterface $em,
+        protected UniciteCollections $uc,
+        Security $security
+    )
     {
-        $this->em = $em;
-        $this->uc = $uc;
         $this->user = $security->getUser();
     }
 
-    public function addCommentaire (Commentaire $commentaire, \App\Entity\Film $film)
+    public function addCommentaire (Commentaire $commentaire, Film $film): void
     {
         $commentaire->setUser($this->user);
         $commentaire->setFilm(($film));
@@ -30,26 +33,26 @@ class CommentaireManager {
         $this->em->flush();
     }
 
-    public function editCommentaire(Commentaire $commentaire)
+    public function editCommentaire(Commentaire $commentaire): void
     {
         $this->em->flush();
     }
 
-    public function delCommentaire(Commentaire $commentaire)
+    public function delCommentaire(Commentaire $commentaire): void
     {
         $commentaire->getFilm()->removeCommentaire($commentaire);
         $this->em->remove($commentaire);
         $this->em->flush();
     }
 
-    private function isEmpty (Commentaire $commentaire)
+    private function isEmpty (Commentaire $commentaire): bool
     {
         return (
             is_null($commentaire->getContenu()) &&
             is_null($commentaire->getNote()));
     }
 
-    public function delEditAdd(Commentaire $commentaire, \App\Entity\Film $film)
+    public function delEditAdd(Commentaire $commentaire, Film $film): void
     {
         if (!$this->isEmpty($commentaire))
         {

src/Service/FilmCreationListener.php

@@ -9,17 +9,11 @@ use Symfony\Component\Config\Definition\Exception\Exception;
 
 class FilmCreationListener
 {
-    /**
-     * var mattermostSender
-     */
-    private $mattermostSender;
-
-    public function __construct(Mattermost $mattermostSender)
+    public function __construct(protected Mattermost $mattermostSender)
     {
-        $this->mattermostSender = $mattermostSender;
     }
 
-    public function postPersist(LifecycleEventArgs $args)
+    public function postPersist(LifecycleEventArgs $args): void
     {
         $entity = $args->getObject();
         if (!$entity instanceof Film and !$entity instanceof Commentaire)

src/Service/GenreManager.php

@@ -10,25 +10,23 @@ use Doctrine\ORM\EntityManagerInterface;
  * Class GenreManager
  */
 class GenreManager {
-    private $em;
 
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(protected EntityManagerInterface $em)
     {
-        $this->em = $em;
     }
 
-    public function add(Genre $genre)
+    public function add(Genre $genre): void
     {
         $this->em->persist($genre);
         $this->em->flush();
     }
 
-    public function edit(Genre $genre)
+    public function edit(Genre $genre): void
     {
         $this->em->flush();
     }
 
-    public function del(Genre $genre)
+    public function del(Genre $genre): void
     {
         $films = $this->em->getRepository(Film::class)->findFilmWithGenre(array($genre->getName()));
         foreach ($films as $film)

src/Service/Mail.php

@@ -12,11 +12,6 @@ use Twig\Environment;
  */
 class Mail
 {
-    protected $mailer;
-    protected $templating;
-    protected $from;
-    protected $reply;
-    protected $name;
     /**
      * Mail Manager
      * @param $mailer
@@ -25,16 +20,18 @@ class Mail
      * @param $reply
      * @param $name
      */
-    public function __construct(MailerInterface $mailer, Environment $templating, $from, $reply, $name)
+    public function __construct(
+        protected MailerInterface $mailer,
+        protected Environment $templating,
+        protected string $from,
+        protected string $reply,
+        protected string $name
+    )
     {
-        $this->mailer = $mailer;
-        $this->templating = $templating;
-        $this->from = $from;
-        $this->reply = $reply;
-        $this->name = $name;
+
     }
 
-    protected function sendMessage($subject, $to, $body)
+    protected function sendMessage($subject, $to, $body): void
     {
         $mail = (new Email())
             ->from(new Address($this->from, $this->name))
@@ -43,10 +40,10 @@ class Mail
             ->text($body)
             ->replyTo(new Address($this->reply, $this->name));
 
-        return $this->mailer->send($mail);
+        $this->mailer->send($mail);
     }
 
-    public function sendMailActivation(\App\Entity\User $user, $lien)
+    public function sendMailActivation(\App\Entity\User $user, $lien): void
     {
         $subject = "Activation de votre compte";
         $template = 'security/mail_activate.html.twig';
@@ -55,7 +52,7 @@ class Mail
         $this->sendMessage($subject, $to, $body);
     }
 
-    public function sendMailTokenMp(\App\Entity\User $user, $lien)
+    public function sendMailTokenMp(\App\Entity\User $user, $lien): void
     {
         $subject = "Mot de passe perdu";
         $template = 'security/mail_tokenmdp.html.twig';

src/Service/Mattermost.php

@@ -13,24 +13,18 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;;
  */
 class Mattermost
 {
-    protected $url;
-    protected $token;
-    protected $channelId;
-    protected $channelIdAdmin;
-    protected $router;
-    protected $flashBagInterface;
-
     /**
      * Mattermost Manager
      */
-    public function __construct($url, $token, $channelId, $channelIdAdmin, UrlGeneratorInterface $router, FlashBagInterface $flashBagInterface)
+    public function __construct(
+        protected string $url,
+        protected string $token,
+        protected string $channelId,
+        protected string $channelIdAdmin,
+        protected UrlGeneratorInterface $router,
+        protected FlashBagInterface $flashBagInterface)
     {
         $this->url = $url . "/api/v4/posts";
-        $this->token = $token;
-        $this->channelId = $channelId;
-        $this->channelIdAdmin = $channelIdAdmin;
-        $this->router = $router;
-        $this->flashBagInterface = $flashBagInterface;
     }
 
     protected function SendNotif($message, $isChanAdmin = False) :void

src/Service/NoteListener.php

@@ -8,30 +8,28 @@ use Doctrine\Persistence\Event\LifecycleEventArgs;
 
 class NoteListener
 {
-    private $noteMoyenne;
-
-    public function __construct(NoteMoyenne $noteMoyenne)
+    public function __construct(protected NoteMoyenne $noteMoyenne)
     {
-        $this->noteMoyenne = $noteMoyenne;
     }
 
-    public function postPersist(LifecycleEventArgs $args)
+    public function postPersist(LifecycleEventArgs $args): void
     {
         $this->calculer($args);
 
     }
 
-    public function postUpdate (LifecycleEventArgs $args)
+    public function postUpdate (LifecycleEventArgs $args): void
     {
         $this->calculer($args);
     }
 
-    public function postRemove (LifecycleEventArgs $args)
+    public function postRemove (LifecycleEventArgs $args): void
     {
         $this->calculer($args);
     }
 
-    private function calculer (LifecycleEventArgs $args) {
+    private function calculer (LifecycleEventArgs $args): void
+    {
         $entity = $args->getObject();
 
         if (!$entity instanceof Commentaire) {

src/Service/NoteMoyenne.php

@@ -11,14 +11,12 @@ use Exception;
  * Calculer moyenne pour un film
  */
 class NoteMoyenne {
-    private $em;
 
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(protected EntityManagerInterface $em)
     {
-        $this->em = $em;
     }
 
-    public function calculerMoyenne (Film $film)
+    public function calculerMoyenne (Film $film): void
     {
         $commentaires = $film->getCommentaires();
 

src/Service/Nouveautes.php

@@ -8,16 +8,16 @@ use Twig\Extension\RuntimeExtensionInterface;
 
 class Nouveautes implements RuntimeExtensionInterface
 {
-    private $twig;
-    private $repoCommentaire;
 
-    public function __construct(CommentaireRepository $repoCommentaire, Environment $twig)
+    public function __construct(
+        protected CommentaireRepository $repoCommentaire,
+        protected Environment $twig
+    )
     {
-        $this->repoCommentaire = $repoCommentaire;
-        $this->twig = $twig;
     }
 
-    public function afficher () {
+    public function afficher(): string
+    {
         $commentaires = $this->repoCommentaire->findLast(5);
 
         return $this->twig->render('nouveautes/nouveautes.html.twig', [

src/Service/OptionsManager.php

@@ -8,7 +8,7 @@ use Symfony\Component\Security\Core\Security;
 
 class OptionsManager
 {
-    protected $options;
+    protected Profile $options;
 
     public function __construct(Security $security)
     {

src/Service/RealisateurManager.php

@@ -9,26 +9,23 @@ use Doctrine\ORM\EntityManagerInterface;
  * Class RealisateurManager
  */
 class RealisateurManager {
-    private $em;
 
-
-    public function __construct(EntityManagerInterface $em)
+    public function __construct(protected EntityManagerInterface $em)
     {
-        $this->em = $em;
     }
 
-    public function add(Realisateur $realisateur)
+    public function add(Realisateur $realisateur): void
     {
         $this->em->persist($realisateur);
         $this->em->flush();
     }
 
-    public function edit(Realisateur $realisateur)
+    public function edit(Realisateur $realisateur): void
     {
         $this->em->flush();
     }
 
-    public function del(Realisateur $realisateur)
+    public function del(Realisateur $realisateur): void
     {
         foreach ($realisateur->getFilms() as $film)
         {

src/Service/RegisterListener.php

@@ -8,14 +8,11 @@ use Doctrine\Persistence\Event\LifecycleEventArgs;
 
 class RegisterListener
 {
-    private $mattermostSender;
-
-    public function __construct(Mattermost $mattermostSender)
+    public function __construct(protected Mattermost $mattermostSender)
     {
-        $this->mattermostSender = $mattermostSender;
     }
 
-    public function postPersist(LifecycleEventArgs $args)
+    public function postPersist(LifecycleEventArgs $args): void
     {
         $entity = $args->getObject();
         if (!$entity instanceof User) {

src/Service/Search.php

@@ -10,24 +10,23 @@ use App\Repository\FilmRepository;
  */
 class Search
 {
-    protected $em;
-    protected $repoFilm;
-
     /**
      * Search constructor.
      * @param EntityManagerInterface $em
      */
-    public function __construct(EntityManagerInterface $em, FilmRepository $repoFilm)
+    public function __construct(
+        protected EntityManagerInterface $em,
+        protected FilmRepository $repoFilm
+    )
     {
-        $this->em = $em;
-        $this->repoFilm = $repoFilm;
+
     }
 
     /**
      * @param string $query
      * @return \App\Entity\Film[]
      */
-    public function search($query)
+    public function search(string $query): array
     {
         return \array_merge(
             $this->searchByFilm($query),
@@ -40,12 +39,12 @@ class Search
      * @param $query
      * @return array
      */
-    protected function searchByFilm($query)
+    protected function searchByFilm(string $query): array
     {
         $q = $this->em
             ->createQuery('SELECT f from App:Film f WHERE f.titre like :titre')
-        ->setParameter('titre', '%'.$query.'%')
-        ->getResult();
+            ->setParameter('titre', '%'.$query.'%')
+            ->getResult();
         return $q;
     }
 
@@ -53,7 +52,7 @@ class Search
      * @param $query
      * @return array
      */
-    protected function searchByRealisateur($query)
+    protected function searchByRealisateur(string $query): array
     {
         return $this->repoFilm->findFilmWithRealLike($query);
     }
@@ -62,11 +61,8 @@ class Search
      * @param $query
      * @return array
      */
-    protected function searchByGenre($query)
+    protected function searchByGenre(string $query): array
     {
         return $this->repoFilm->findFilmWithGenreLike($query);
     }
-
-
-
 }

src/Service/UniciteCollections.php

@@ -12,24 +12,23 @@ use App\Entity\Film;
  */
 class UniciteCollections
 {
-    protected $repoReal;
-    protected $repoGenre;
-
     /**
      * Search constructor.
      * @param EntityManagerInterface $em
      */
-    public function __construct(RealisateurRepository $repoReal, GenreRepository $repoGenre)
+    public function __construct(
+        protected RealisateurRepository $repoReal,
+        protected GenreRepository $repoGenre
+    )
     {
-        $this->repoGenre = $repoGenre;
-        $this->repoReal = $repoReal;
+
     }
 
     /**
      * @param \App\Entity\Film $film
      * @return \App\Entity\Film
      */
-    public function assureUniciteCollections(Film $film)
+    public function assureUniciteCollections(Film $film): Film
     {
         $film = $this->checkRealisateurs($film);
         $film = $this->checkGenres($film);
@@ -40,7 +39,7 @@ class UniciteCollections
      * @param \App\Entity\Film $film
      * @return \App\Entity\Film
      */
-    protected function checkRealisateurs(Film $film)
+    protected function checkRealisateurs(Film $film): Film
     {
         $realisateurs = $film->getRealisateurs();
         foreach ($realisateurs as $realisateur)
@@ -63,7 +62,7 @@ class UniciteCollections
      * @param \App\Entity\Film $film
      * @return \App\Entity\Film
      */
-    protected function checkGenres(Film $film)
+    protected function checkGenres(Film $film): Film
     {
         $genres = $film->getGenres();
         foreach ($genres as $genre)

src/Service/UserManager.php

@@ -13,21 +13,20 @@ use Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface;
  */
 class UserManager
 {
-    protected $em;
-    protected $passwordEncoder;
-    protected $tokenGenerator;
     /**
      * UserManager constructor.
      * @param EntityManagerInterface $em
      */
-    public function __construct(EntityManagerInterface $em, UserPasswordHasherInterface $passwordEncoder, TokenGeneratorInterface $tokenGenerator)
+    public function __construct(
+        protected EntityManagerInterface $em,
+        protected UserPasswordHasherInterface $passwordEncoder,
+        protected TokenGeneratorInterface $tokenGenerator
+    )
     {
-        $this->em = $em;
-        $this->passwordEncoder = $passwordEncoder;
-        $this->tokenGenerator = $tokenGenerator;
+
     }
 
-    public function createUser($username, $password, $nom, $prenom, $mail, $roles, $activated)
+    public function createUser(string $username, string $password, string $nom, string $prenom, string $mail, array $roles, bool $activated): void
     {
         $user = new User();
         $options = new Profile();
@@ -42,7 +41,7 @@ class UserManager
         $this->enregistrerUser($user);
     }
 
-    public function register(User $user)
+    public function register(User $user): void
     {
         $user->setActivated(false);
         $user->setRoles(array('ROLE_USER'));
@@ -50,12 +49,12 @@ class UserManager
     }
 
 
-    public function resetPassword(User $user)
+    public function resetPassword(User $user): void
     {
         $user->setActivated($user);
         $this->enregistrerUser($user);
     }
-    public function enregistrerUser (User $user)
+    public function enregistrerUser (User $user): void
     {
         $encoded = $this->passwordEncoder->hashPassword($user, $user->getPassword());
         $user->setPassword($encoded);
@@ -69,18 +68,18 @@ class UserManager
         $this->em->flush();
     }
 
-    public function editUser ()
+    public function editUser (): void
     {
         $this->em->flush();
     }
 
-    public function removeUser(User $user)
+    public function removeUser(User $user): void
     {
         $this->em->remove($user);
         $this->em->flush();
     }
 
-    public function generateToken(User $user)
+    public function generateToken(User $user): void
     {
         $user->setToken($this->tokenGenerator->generateToken());
     }