remove deprecated usage of getDoctrine() method

zikula-modules · Dec 2, 2021 · 902599d · 902599d
1 parent af114fb
commit 902599d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Controller/ProfileController.php b/Controller/ProfileController.php
@@ -13,6 +13,7 @@
 
 namespace Zikula\ProfileModule\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -64,6 +65,7 @@ public function display(
      */
     public function edit(
         Request $request,
+        ManagerRegistry $doctrine,
         CurrentUserApiInterface $currentUserApi,
         UserRepositoryInterface $userRepository,
         ProfileTypeFactory $profileTypeFactory,
@@ -108,14 +110,14 @@ public function edit(
                         $userEntity->delAttribute($attribute);
                     }
                 }
-                $this->getDoctrine()->getManager()->flush();
+                $doctrine->getManager()->flush();
             }
 
             return $this->redirectToRoute('zikulaprofilemodule_profile_display', ['uid' => $userEntity->getUid()]);
         }
 
         // detach user entity because attributes may be altered for the form (e.g. multiple choice fields)
-        $this->getDoctrine()->getManager()->detach($userEntity);
+        $doctrine->getManager()->detach($userEntity);
 
         return [
             'user' => $userEntity,

diff --git a/Controller/PropertyController.php b/Controller/PropertyController.php
@@ -13,6 +13,7 @@
 
 namespace Zikula\ProfileModule\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -52,7 +53,7 @@ public function listProperties(PropertyRepositoryInterface $propertyRepository):
      *
      * @return array|RedirectResponse
      */
-    public function edit(Request $request, PropertyEntity $propertyEntity = null)
+    public function edit(Request $request, ManagerRegistry $doctrine, PropertyEntity $propertyEntity = null)
     {
         if (!isset($propertyEntity)) {
             $propertyEntity = new PropertyEntity();
@@ -62,8 +63,8 @@ public function edit(Request $request, PropertyEntity $propertyEntity = null)
         if ($form->isSubmitted() && $form->isValid()) {
             if ($form->get('save')->isClicked()) {
                 $propertyEntity = $form->getData();
-                $this->getDoctrine()->getManager()->persist($propertyEntity);
-                $this->getDoctrine()->getManager()->flush();
+                $doctrine->getManager()->persist($propertyEntity);
+                $doctrine->getManager()->flush();
                 $this->addFlash('success', $this->trans('Property saved.'));
             }
             if ($form->get('cancel')->isClicked()) {
@@ -85,15 +86,15 @@ public function edit(Request $request, PropertyEntity $propertyEntity = null)
      *
      * @return array|RedirectResponse
      */
-    public function delete(Request $request, PropertyEntity $propertyEntity)
+    public function delete(Request $request, ManagerRegistry $doctrine, PropertyEntity $propertyEntity)
     {
         $form = $this->createForm(DeletionType::class, $propertyEntity);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             if ($form->get('delete')->isClicked()) {
                 $propertyEntity = $form->getData();
-                $this->getDoctrine()->getManager()->remove($propertyEntity);
-                $this->getDoctrine()->getManager()->flush();
+                $doctrine->getManager()->remove($propertyEntity);
+                $doctrine->getManager()->flush();
                 $this->addFlash('success', $this->trans('Property removed.'));
             }
             if ($form->get('cancel')->isClicked()) {

diff --git a/Controller/UserBlockController.php b/Controller/UserBlockController.php
@@ -13,6 +13,7 @@
 
 namespace Zikula\ProfileModule\Controller;
 
+use Doctrine\Persistence\ManagerRegistry;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -40,6 +41,7 @@ class UserBlockController extends AbstractController
      */
     public function edit(
         Request $request,
+        ManagerRegistry $doctrine,
         BlockRepositoryInterface $blockRepository,
         CurrentUserApiInterface $currentUserApi,
         UserRepositoryInterface $userRepository
@@ -68,7 +70,7 @@ public function edit(
 
                 $userEntity->setAttribute('ublockon', $formData['ublockon']);
                 $userEntity->setAttribute('ublock', $formData['ublock']);
-                $this->getDoctrine()->getManager()->flush();
+                $doctrine->getManager()->flush();
 
                 $this->addFlash('status', $this->trans('Done! Saved custom block.'));
             }