Cleanup (remove ManagerTrait in favor of dependency injection).

Author: thisismeonmounteverest

src/Controller/GroupController.php

@@ -18,7 +18,6 @@
 use App\Model\WikiModel;
 use App\Repository\GroupRepository;
 use App\Repository\WikiRepository;
-use App\Utilities\ManagerTrait;
 use App\Utilities\TranslatedFlashTrait;
 use App\Utilities\TranslatorTrait;
 use App\Utilities\UniqueFilenameTrait;
@@ -47,13 +46,13 @@
  */
 class GroupController extends AbstractController
 {
-    use ManagerTrait;
     use TranslatedFlashTrait;
     use TranslatorTrait;
     use UniqueFilenameTrait;
 
-    public function __construct(private GroupModel $groupModel)
-    {
+    public function __construct(
+        private GroupModel $groupModel,
+    ) {
     }
 
     /**

src/Controller/MemberController.php

@@ -7,7 +7,6 @@
 use App\Logger\Logger;
 use App\Model\MemberModel;
 use App\Utilities\ChangeProfilePictureGlobals;
-use App\Utilities\ManagerTrait;
 use App\Utilities\ProfileSubmenu;
 use App\Utilities\TranslatedFlashTrait;
 use App\Utilities\TranslatorTrait;
@@ -31,12 +30,13 @@
  */
 class MemberController extends AbstractController
 {
-    use ManagerTrait;
     use TranslatedFlashTrait;
     use TranslatorTrait;
 
-    public function __construct(private ProfileSubmenu $profileSubmenu, private ChangeProfilePictureGlobals $globals)
-    {
+    public function __construct(
+        private ProfileSubmenu $profileSubmenu,
+        private ChangeProfilePictureGlobals $globals,
+    ) {
     }
 
     #[Route(path: '/mydata', name: 'profile_personal_data_redirect')]

src/Controller/PasswordController.php

@@ -11,7 +11,6 @@
 use App\Repository\MemberRepository;
 use App\Service\Mailer;
 use App\Utilities\ChangeProfilePictureGlobals;
-use App\Utilities\ManagerTrait;
 use App\Utilities\ProfileSubmenu;
 use App\Utilities\TranslatedFlashTrait;
 use App\Utilities\TranslatorTrait;
@@ -27,12 +26,13 @@
 
 class PasswordController extends AbstractController
 {
-    use ManagerTrait;
     use TranslatedFlashTrait;
     use TranslatorTrait;
 
-    public function __construct(private PasswordModel $passwordModel, private EntityManagerInterface $entityManager)
-    {
+    public function __construct(
+        private PasswordModel $passwordModel,
+        private EntityManagerInterface $entityManager,
+    ) {
     }
 
     /**

src/Controller/RequestController.php

@@ -16,7 +16,6 @@
 use App\Service\Mailer;
 use App\Utilities\AllowContactCheck;
 use App\Utilities\ConversationThread;
-use App\Utilities\ManagerTrait;
 use App\Utilities\TranslatorTrait;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Form\Form;
@@ -34,7 +33,6 @@
  */
 class RequestController extends BaseRequestAndInvitationController
 {
-    use ManagerTrait;
     use TranslatorTrait;
 
     public function __construct(

src/Entity/GroupMembership.php

@@ -56,14 +56,14 @@ class GroupMembership
      * @var Member
      */
     #[ORM\JoinColumn(name: 'IdMember', referencedColumnName: 'id', nullable: false)]
-    #[ORM\ManyToOne(targetEntity: \Member::class, inversedBy: 'groupMemberships')]
+    #[ORM\ManyToOne(targetEntity: Member::class, inversedBy: 'groupMemberships')]
     private $member;
 
     /**
      * @var Group
      */
     #[ORM\JoinColumn(name: 'IdGroup', referencedColumnName: 'id', nullable: false)]
-    #[ORM\ManyToOne(targetEntity: \Group::class, inversedBy: 'groupMemberships')]
+    #[ORM\ManyToOne(targetEntity: Group::class, inversedBy: 'groupMemberships')]
     private $group;
 
     /**

src/Model/ActivityModel.php

@@ -4,38 +4,41 @@
 
 use App\Entity\Activity;
 use App\Repository\ActivityRepository;
-use App\Utilities\ManagerTrait;
+use Doctrine\ORM\EntityManagerInterface;
+use Pagerfanta\Pagerfanta;
 
 class ActivityModel
 {
-    use ManagerTrait;
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+    ) {
+    }
 
-    public function getLatest($page, $limit)
+    public function getLatest($page, $limit): Pagerfanta
     {
         /** @var ActivityRepository $repository */
-        $repository = $this->getManager()->getRepository(Activity::class);
+        $repository = $this->entityManager->getRepository(Activity::class);
 
         return $repository->findLatest($page, $limit);
     }
 
-    public function getProblematicActivities($page, $limit)
+    public function getProblematicActivities($page, $limit): Pagerfanta
     {
         /** @var ActivityRepository $repository */
-        $repository = $this->getManager()->getRepository(Activity::class);
+        $repository = $this->entityManager->getRepository(Activity::class);
 
         return $repository->findProblematicActivities($page, $limit);
     }
 
-    public function deleteAsSpamByChecker($activityIds)
+    public function deleteAsSpamByChecker($activityIds): void
     {
         // delete all activities based on there ids
-        $em = $this->getManager();
         /** @var ActivityRepository $activityRepository */
-        $activityRepository = $em->getRepository(Activity::class);
+        $activityRepository = $this->entityManager->getRepository(Activity::class);
         $activities = $activityRepository->findBy(['id' => $activityIds]);
         foreach ($activities as $activity) {
-            $em->remove($activity);
+            $this->entityManager->remove($activity);
         }
-        $em->flush();
+        $this->entityManager->flush();
     }
 }

src/Model/Admin/CommentModel.php

@@ -5,7 +5,6 @@
 use App\Entity\Comment;
 use App\Entity\Member;
 use App\Repository\CommentRepository;
-use App\Utilities\ManagerTrait;
 use Pagerfanta\Pagerfanta;
 
 /**
@@ -16,8 +15,6 @@
  */
 class CommentModel
 {
-    use ManagerTrait;
-
     /**
      * @param int $page
      * @param int $limit
@@ -27,7 +24,7 @@ class CommentModel
     public function getComments($page = 1, $limit = 10)
     {
         /** @var CommentRepository $repository */
-        $repository = $this->getManager()->getRepository(Comment::class);
+        $repository = $this->entityManager->getRepository(Comment::class);
 
         return $repository->pageAll($page, $limit);
     }
@@ -41,7 +38,7 @@ public function getComments($page = 1, $limit = 10)
     public function getCommentsForMember(Member $member, $page = 1, $limit = 10)
     {
         /** @var CommentRepository $repository */
-        $repository = $this->getManager()->getRepository(Comment::class);
+        $repository = $this->entityManager->getRepository(Comment::class);
 
         return $repository->pageAllForMember($member, $page, $limit);
     }
@@ -55,7 +52,7 @@ public function getCommentsForMember(Member $member, $page = 1, $limit = 10)
     public function getCommentsFromMember(Member $member, $page = 1, $limit = 10)
     {
         /** @var CommentRepository $repository */
-        $repository = $this->getManager()->getRepository(Comment::class);
+        $repository = $this->entityManager->getRepository(Comment::class);
 
         return $repository->pageAllFromMember($member, $page, $limit);
     }
@@ -69,7 +66,7 @@ public function getCommentsFromMember(Member $member, $page = 1, $limit = 10)
     public function getCommentsByQuality($quality, $page = 1, $limit = 10)
     {
         /** @var CommentRepository $repository */
-        $repository = $this->getManager()->getRepository(Comment::class);
+        $repository = $this->entityManager->getRepository(Comment::class);
 
         return $repository->pageAllByQuality($quality, $page, $limit);
     }
@@ -83,7 +80,7 @@ public function getCommentsByQuality($quality, $page = 1, $limit = 10)
     public function getCommentsByAdminAction($action, $page = 1, $limit = 10)
     {
         /** @var CommentRepository $repository */
-        $repository = $this->getManager()->getRepository(Comment::class);
+        $repository = $this->entityManager->getRepository(Comment::class);
 
         return $repository->pageAllByAdmiNAction($action, $page, $limit);
     }

src/Model/CommunityNewsModel.php

@@ -13,7 +13,7 @@
 use App\Entity\CommunityNewsComment;
 use App\Repository\CommunityNewsCommentRepository;
 use App\Repository\NotificationRepository;
-use App\Utilities\ManagerTrait;
+use Doctrine\ORM\EntityManagerInterface;
 use Pagerfanta\Doctrine\Collections\CollectionAdapter;
 use Pagerfanta\Pagerfanta;
 
@@ -22,7 +22,10 @@
  */
 class CommunityNewsModel
 {
-    use ManagerTrait;
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+    }
 
     /**
      * @param int $page
@@ -33,7 +36,7 @@ class CommunityNewsModel
     public function getPaginator($page, $limit)
     {
         /** @var NotificationRepository $repository */
-        $repository = $this->getManager()->getRepository(CommunityNews::class);
+        $repository = $this->entityManager->getRepository(CommunityNews::class);
 
         return $repository->pagePublic($page, $limit);
     }
@@ -47,15 +50,15 @@ public function getPaginator($page, $limit)
     public function getAdminPaginator($page, $limit)
     {
         /** @var NotificationRepository $repository */
-        $repository = $this->getManager()->getRepository(CommunityNews::class);
+        $repository = $this->entityManager->getRepository(CommunityNews::class);
 
         return $repository->pageAll($page, $limit);
     }
 
     public function getLatest()
     {
         /** @var NotificationRepository $repository */
-        $repository = $this->getManager()->getRepository(CommunityNews::class);
+        $repository = $this->entityManager->getRepository(CommunityNews::class);
 
         return $repository->getLatest();
     }
@@ -74,15 +77,15 @@ public function getCommentsPaginator(CommunityNews $communityNews, $page, $limit
     public function getLatestCommunityNewsComments($page, $limit)
     {
         /** @var CommunityNewsCommentRepository $repository */
-        $repository = $this->getManager()->getRepository(CommunityNewsComment::class);
+        $repository = $this->entityManager->getRepository(CommunityNewsComment::class);
 
         return $repository->findLatestCommunityNewsComments($page, $limit);
     }
 
     public function deleteAsSpamByChecker($commentIds)
     {
         // delete all activities based on there ids
-        $em = $this->getManager();
+        $em = $this->entityManager;
         /** @var CommunityNewsCommentRepository $repository */
         $communityNewsCommentRepository = $em->getRepository(CommunityNewsComment::class);
         $comments = $communityNewsCommentRepository->findBy(['id' => $commentIds]);

src/Model/DonateModel.php

@@ -3,12 +3,15 @@
 namespace App\Model;
 
 use App\Entity\Params;
-use App\Utilities\ManagerTrait;
 use Carbon\Carbon;
+use Doctrine\ORM\EntityManagerInterface;
 
 class DonateModel
 {
-    use ManagerTrait;
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+    }
 
     public function getStatForDonations()
     {
@@ -26,7 +29,7 @@ public function getStatForDonations()
                 WHERE
                     created > '" . $campaignValue['campaignstartdate']->format('Y-m-d H:i:s') . "'
                 ";
-            $connection = $this->getManager()->getConnection();
+            $connection = $this->entityManager->getConnection();
             $rowYear = $connection->executeQuery($sql)->fetchAssociative();
             switch ($rowYear['quarter']) {
                 case 1:
@@ -79,7 +82,7 @@ public function getStatForDonations()
     public function getCampaignValues()
     {
         $query = $this
-            ->getManager()
+            ->entityManager
             ->getRepository(Params::class)
             ->createQueryBuilder('d')
             ->select([

src/Model/FaqModel.php

@@ -5,14 +5,17 @@
 use App\Entity\Faq;
 use App\Entity\FaqCategory;
 use App\Repository\FaqRepository;
-use App\Utilities\ManagerTrait;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Pagerfanta\Pagerfanta;
 
 class FaqModel
 {
-    use ManagerTrait;
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+    }
 
     /**
      * Returns a Pagerfanta object that contains the currently selected logs.
@@ -25,14 +28,14 @@ class FaqModel
     public function getFilteredFaqs($page, $limit)
     {
         /** @var FaqRepository $repository */
-        $repository = $this->getManager()->getRepository(Faq::class);
+        $repository = $this->entityManager->getRepository(Faq::class);
 
         return $repository->findLatest($page, $limit);
     }
 
     public function getFaqsForCategory(FaqCategory $faqCategory): mixed
     {
-        $connection = $this->getManager()->getConnection();
+        $connection = $this->entityManager->getConnection();
         $stmt = $connection->prepare(
             "SELECT
     f.*
@@ -59,7 +62,7 @@ public function getFaqsForCategory(FaqCategory $faqCategory): mixed
     public function getFaqCategories()
     {
         /** @var EntityRepository $repository */
-        $repository = $this->getManager()->getRepository(FaqCategory::class);
+        $repository = $this->entityManager->getRepository(FaqCategory::class);
 
         return $repository->findBy([], ['sortOrder' => 'ASC']);
     }