ucfopen · rob-3 · Feb 24, 2022 · Feb 9, 2022
diff --git a/src/Controller/AuthController.php b/src/Controller/AuthController.php
@@ -8,6 +8,7 @@
 use App\Services\LmsUserService;
 use App\Services\SessionService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpFoundation\Request;
@@ -25,6 +26,13 @@ class AuthController extends AbstractController
     /** @var LmsApiService $lmsApi */
     private $lmsApi;
 
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/authorize", name="authorize")
      */
@@ -108,7 +116,7 @@ public function encryptDeveloperKey(Request $request, UtilityService $util)
         $instId = $request->query->get('id');
         $institution = $util->getInstitutionById($instId);
         $institution->encryptDeveloperKey();
-        $this->getDoctrine()->getManager()->flush();
+        $this->doctrine->getManager()->flush();
 
         return new Response('Updated.');
     }
@@ -127,7 +135,7 @@ protected function requestApiKeyFromLms()
 
         if (empty($clientSecret)) {
             $institution->encryptDeveloperKey();
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
             $clientSecret = $institution->getApiClientSecret();
         }
 

diff --git a/src/Controller/DashboardController.php b/src/Controller/DashboardController.php
@@ -9,6 +9,7 @@
 use App\Services\LmsUserService;
 use App\Services\SessionService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Routing\Annotation\Route;
 
@@ -23,6 +24,13 @@ class DashboardController extends AbstractController
     /** @var LmsApiService $lmsApi */
     protected $lmsApi;
 
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/dashboard", name="dashboard")
      */
@@ -57,7 +65,7 @@ public function index(
             $this->util->exitWithMessage('Missing LMS course ID.');
         }
 
-        $courseRepo = $this->getDoctrine()->getRepository(Course::class);
+        $courseRepo = $this->doctrine->getRepository(Course::class);
         /** @var Course $course */
         $course = $courseRepo->findOneBy(['lmsCourseId' => $lmsCourseId]);
 
@@ -134,8 +142,8 @@ protected function createCourse(Institution $institution, $lmsCourseId)
         $course->setActive(true);
         $course->setDirty(false);
 
-        $this->getDoctrine()->getManager()->persist($course);
-        $this->getDoctrine()->getManager()->flush();
+        $this->doctrine->getManager()->persist($course);
+        $this->doctrine->getManager()->flush();
 
         return $course;
     }

diff --git a/src/Controller/FileItemsController.php b/src/Controller/FileItemsController.php
@@ -6,12 +6,20 @@
 use App\Response\ApiResponse;
 use App\Services\LmsPostService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class FileItemsController extends ApiController
 {
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/api/files/{file}/review", name="review_file")
      */
@@ -35,7 +43,7 @@ public function reviewFile(FileItem $file, Request $request, UtilityService $uti
             // Update report stats
             $report = $course->getUpdatedReport();
 
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
 
             // Create response
             if ($file->getReviewed()) {
@@ -81,7 +89,7 @@ public function postFile(FileItem $file, Request $request, UtilityService $util,
             // Update report stats
             $report = $course->getUpdatedReport();
 
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
 
             // Create response
             $apiResponse->addMessage('form.msg.success_replaced', 'success', 5000);

diff --git a/src/Controller/IssuesController.php b/src/Controller/IssuesController.php
@@ -9,12 +9,20 @@
 use App\Services\LmsPostService;
 use App\Services\PhpAllyService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class IssuesController extends ApiController
 {
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * Save change to issue HTML to LMS
      * 
@@ -62,7 +70,7 @@ public function saveIssue(
 
             // Update issue HTML
             $issue->setNewHtml($newHtml);
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
 
             // Save content to LMS
             $lmsPost->saveContentToLms($issue, $user);
@@ -77,7 +85,7 @@ public function saveIssue(
                 $issue->setStatus(Issue::$issueStatusFixed);
                 $issue->setFixedBy($user);
                 $issue->setFixedOn($util->getCurrentTime());
-                $this->getDoctrine()->getManager()->flush();
+                $this->doctrine->getManager()->flush();
 
                 // Update report stats
                 $report = $course->getUpdatedReport();
@@ -121,7 +129,7 @@ public function markAsReviewed(Request $request, LmsPostService $lmsPost, Utilit
             $issueUpdate = \json_decode($request->getContent(), true);
 
             $issue->setNewHtml($issueUpdate['newHtml']);
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
 
             // Save content to LMS
             $response = $lmsPost->saveContentToLms($issue, $user);
@@ -138,7 +146,7 @@ public function markAsReviewed(Request $request, LmsPostService $lmsPost, Utilit
                 // Update report stats
                 $report = $course->getUpdatedReport();
 
-                $this->getDoctrine()->getManager()->flush();
+                $this->doctrine->getManager()->flush();
 
                 if ($issue->getStatus() == Issue::$issueStatusResolved) {
                     $apiResponse->addMessage('form.msg.success_resolved', 'success');
@@ -188,7 +196,7 @@ public function scanIssue(Issue $issue, PhpAllyService $phpAlly, UtilityService
                 'report' => $report
             ]);
 
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
             $apiResponse->addMessage('form.msg.manually_fixed', 'success');
         }
         else {

diff --git a/src/Controller/LtiController.php b/src/Controller/LtiController.php
@@ -7,6 +7,7 @@
 use App\Services\LmsApiService;
 use App\Services\SessionService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Firebase\JWT\JWK;
 use \Firebase\JWT\JWT;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -26,14 +27,21 @@ class LtiController extends AbstractController
     /** @var \App\Services\LmsApiService $lmsApi */
     private $lmsApi;
 
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/lti/authorize", name="lti_authorize")
      */
     public function ltiAuthorize(
         Request $request,
         SessionService $sessionService,
         UtilityService $util,
-        LmsApiService $lmsApi
+        LmsApiService $lmsApi,
     ) {
 
         $this->request = $request;
@@ -278,7 +286,7 @@ protected function saveRequestToSession()
                 $this->session->set('lms_api_domain', str_replace('https://', '', $domain));
             }
 
-            $this->getDoctrine()->getManager()->flush();
+            $this->doctrine->getManager()->flush();
         } catch (\Exception $e) {
             print_r($e->getMessage());
         }
@@ -341,13 +349,13 @@ protected function getInstitutionFromSession()
 
             if ($domain) {
                 $institution = $this
-                    ->getDoctrine()
+                    ->doctrine
                     ->getRepository(Institution::class)
                     ->findOneBy(['lmsDomain' => $domain]);
 
                 if (!$institution) {
                     $institution = $this
-                        ->getDoctrine()
+                        ->doctrine
                         ->getRepository(Institution::class)
                         ->findOneBy(['vanityUrl' => $domain]);
                 }
@@ -359,13 +367,13 @@ protected function getInstitutionFromSession()
 
             if ($cleanedDomain) {
                 $institution = $this
-                    ->getDoctrine()
+                    ->doctrine
                     ->getRepository(Institution::class)
                     ->findOneBy(['lmsDomain' => $cleanedDomain]);
 
                 if (!$institution) {
                     $institution = $this
-                        ->getDoctrine()
+                        ->doctrine
                         ->getRepository(Institution::class)
                         ->findOneBy(['vanityUrl' => $cleanedDomain]);
                 }
@@ -397,8 +405,8 @@ protected function createUser()
             $user->setName($this->session->get('lms_user_name'));
         }
 
-        $this->getDoctrine()->getManager()->persist($user);
-        $this->getDoctrine()->getManager()->flush();
+        $this->doctrine->getManager()->persist($user);
+        $this->doctrine->getManager()->flush();
 
         return $user;
     }
@@ -419,7 +427,7 @@ protected function saveUserToSession()
             $userId = $this->session->get('lms_user_id');
 
             if ($domain && $userId) {
-                $user = $this->getDoctrine()->getRepository(User::class)
+                $user = $this->doctrine->getRepository(User::class)
                     ->findOneBy(['username' => "{$domain}||{$userId}"]);
             }
         }
@@ -429,6 +437,6 @@ protected function saveUserToSession()
         }
 
         $this->session->set('userId', $user->getId());
-        $this->getDoctrine()->getManager()->flush();
+        $this->doctrine->getManager()->flush();
     }
 }
diff --git a/src/Controller/ReportsController.php b/src/Controller/ReportsController.php
@@ -10,6 +10,7 @@
 use App\Response\ApiResponse;
 use App\Services\SessionService;
 use App\Services\UtilityService;
+use Doctrine\Persistence\ManagerRegistry;
 use Knp\Bundle\SnappyBundle\Snappy\Response\PdfResponse;
 use Knp\Snappy\Pdf;
 use Mpdf\Mpdf;
@@ -29,6 +30,13 @@ class ReportsController extends ApiController
     private $request;
     private $util;
 
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/api/courses/{course}/reports", methods={"GET"}, name="get_reports")
      * @param Request $request
@@ -51,7 +59,7 @@ public function getAllReports(
             }
 
             /** @var ReportRepository $repository */
-            $repository = $this->getDoctrine()->getRepository(Report::class);
+            $repository = $this->doctrine->getRepository(Report::class);
             $reports = $repository->findAllInCourse($course);
 
             $apiResponse->setData($reports);
@@ -187,4 +195,4 @@ public function getPdfReport(
             return new JsonResponse($apiResponse);
         }
     }
-}
+}
diff --git a/src/Controller/SyncController.php b/src/Controller/SyncController.php
@@ -116,7 +116,7 @@ public function requestContentSync(ContentItem $contentItem, LmsFetchService $lm
     public function cronSync(LmsApiService $lmsApi)
     {
         /** @var CourseRepository $courseRepository */
-        $courseRepository = $this->getDoctrine()->getRepository(Course::class);
+        $courseRepository = $this->doctrine->getRepository(Course::class);
         $courses = $courseRepository->findCoursesNeedingUpdate($this->maxAge);
         $user = $this->getUser();
 

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
@@ -3,13 +3,21 @@
 namespace App\Controller;
 
 use App\Entity\User;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 
 class UserController extends AbstractController
 {
+    private ManagerRegistry $doctrine;
+
+    public function __construct(ManagerRegistry $doctrine)
+    {
+        $this->doctrine = $doctrine;
+    }
+
     /**
      * @Route("/api/users/{user}", name="user_put",  methods={"PUT"})
      */
@@ -26,7 +34,7 @@ public function update(User $user, Request $request): JsonResponse
             $user->setRefreshToken('');
         }
 
-        $this->getDoctrine()->getManager()->flush();
+        $this->doctrine->getManager()->flush();
 
         return $this->json($user);
     }