replace the Controller class to AbstractController, fix tests

Author: volha-pivavarchyk

Controller/JsonController.php

@@ -4,10 +4,10 @@
 
 namespace MauticPlugin\CustomObjectsBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
-class JsonController extends Controller
+class JsonController extends AbstractController
 {
     /**
      * Adds flashes stored in session (by addFlash() method) to the JsonResponse.

Tests/Unit/Controller/ControllerTestCase.php

@@ -12,7 +12,7 @@
 use Mautic\CoreBundle\Model\NotificationModel;
 use Mautic\CoreBundle\Security\Permissions\CorePermissions;
 use PHPUnit\Framework\MockObject\MockObject;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\HeaderBag;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -73,7 +73,7 @@ protected function setUp(): void
         $this->managerRegistry = $this->createMock(ManagerRegistry::class);
     }
 
-    protected function addSymfonyDependencies(CommonController|Controller $controller): void
+    protected function addSymfonyDependencies(AbstractController $controller): void
     {
         $requestStack = empty($this->requestStack) ? $this->createMock(RequestStack::class) : $this->requestStack;
         $request      = empty($this->request) ? $this->createMock(Request::class) : $this->request;

Tests/Unit/Controller/CustomField/FormControllerTest.php

@@ -49,7 +49,7 @@ protected function setUp(): void
 
         $this->translator          = $this->createMock(Translator::class);
 
-        $this->formController      = new FormController();
+        $this->formController      = new FormController($this->managerRegistry);
         $this->formController->setTranslator($this->translator);
         $this->formController->setSecurity($this->security);
 

Tests/Unit/Controller/CustomField/SaveControllerTest.php

@@ -51,7 +51,7 @@ protected function setUp(): void
 
         $this->translator          = $this->createMock(Translator::class);
         $this->security            = $this->createMock(CorePermissions::class);
-        $this->saveController      = new SaveController();
+        $this->saveController      = new SaveController($this->managerRegistry);
         $this->saveController->setTranslator($this->translator);
         $this->saveController->setSecurity($this->security);
 

Tests/Unit/Controller/CustomItem/BatchDeleteControllerTest.php

@@ -64,7 +64,7 @@ protected function setUp(): void
             ->method('getModel')
             ->willReturn($this->model);
 
-        $this->batchDeleteController  = new BatchDeleteController();
+        $this->batchDeleteController  = new BatchDeleteController($this->managerRegistry);
         $this->batchDeleteController->setTranslator($this->translator);
         $this->batchDeleteController->setSecurity($this->security);
         $this->batchDeleteController->setModelFactory($this->modelFactory);

Tests/Unit/Controller/CustomItem/CancelControllerTest.php

@@ -44,7 +44,7 @@ protected function setUp(): void
             ->method('getCurrentRequest')
             ->willReturn($this->request);
 
-        $this->cancelController       = new CancelController();
+        $this->cancelController       = new CancelController($this->managerRegistry);
 
         $this->addSymfonyDependencies($this->cancelController);
 

Tests/Unit/Controller/CustomItem/DeleteControllerTest.php

@@ -64,7 +64,7 @@ protected function setUp(): void
         $this->modelFactory           = $this->createMock(ModelFactory::class);
         $this->model                  = $this->createMock(NotificationModel::class);
 
-        $this->deleteController       = new DeleteController();
+        $this->deleteController       = new DeleteController($this->managerRegistry);
         $this->deleteController->setTranslator($this->translator);
         $this->deleteController->setSecurity($this->security);
         $this->deleteController->setModelFactory($this->modelFactory);

Tests/Unit/Controller/CustomItem/ListControllerTest.php

@@ -60,7 +60,7 @@ protected function setUp(): void
         $this->modelFactory           = $this->createMock(ModelFactory::class);
         $this->model                  = $this->createMock(NotificationModel::class);
 
-        $this->listController         = new ListController();
+        $this->listController         = new ListController($this->managerRegistry);
         $this->listController->setTranslator($this->translator);
         $this->listController->setModelFactory($this->modelFactory);
         $this->listController->setSecurity($this->security);

Tests/Unit/Controller/CustomItem/SaveControllerTest.php

@@ -103,7 +103,7 @@ protected function setUp(): void
         $this->form                   = $this->createMock(FormInterface::class);
 
         $this->translator             = $this->createMock(Translator::class);
-        $this->saveController         = new SaveController($this->security, $this->userHelper);
+        $this->saveController         = new SaveController($this->security, $this->userHelper, $this->managerRegistry);
         $this->saveController->setTranslator($this->translator);
 
         $this->addSymfonyDependencies($this->saveController);

Tests/Unit/Controller/CustomItem/ViewControllerTest.php

@@ -63,7 +63,7 @@ protected function setUp(): void
 
         $this->translator                 = $this->createMock(Translator::class);
 
-        $this->viewController             = new ViewController();
+        $this->viewController             = new ViewController($this->managerRegistry);
         $this->viewController->setTranslator($this->translator);
         $this->viewController->setSecurity($this->security);