diff --git a/app/bundles/ApiBundle/Tests/Controller/CommonApiControllerTest.php b/app/bundles/ApiBundle/Tests/Controller/CommonApiControllerTest.php
index 747edd1de31..4b5693d8c98 100644
--- a/app/bundles/ApiBundle/Tests/Controller/CommonApiControllerTest.php
+++ b/app/bundles/ApiBundle/Tests/Controller/CommonApiControllerTest.php
@@ -74,7 +74,7 @@ public function testgetWhereFromRequestWithSomeWhere()
         ];
 
         $request = $this->getMockBuilder(Request::class)
-            ->setMethods(['get'])
+            ->onlyMethods(['get'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php b/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php
index bf7951e2771..c89cb42b4e9 100644
--- a/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php
+++ b/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
         $this->random  = sha1((string) time());
         $this->adapter = $this->getMockBuilder(FilesystemTagAwareAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['clear', 'getCacheAdapter', 'commit'])
+            ->onlyMethods(['clear', 'getCacheAdapter', 'commit'])
             ->getMock();
         $this->adapter->method('clear')->willReturn($this->random);
         $this->adapter->method('commit')->willReturn(null);
diff --git a/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php b/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php
index 16c13818af2..aea536a4729 100644
--- a/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php
+++ b/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php
@@ -76,7 +76,7 @@ public function testFetchEmailIdsById(): void
 
         $queryBuilder = $this->getMockBuilder(QueryBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods(['select', 'from', 'where', 'setParameter', 'andWhere', 'getQuery'])
+            ->onlyMethods(['select', 'from', 'where', 'setParameter', 'andWhere', 'getQuery'])
             ->getMock();
 
         $this->entityManager
@@ -110,7 +110,7 @@ public function testFetchEmailIdsById(): void
 
         $query = $this->getMockBuilder(AbstractQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHydrationMode', 'getResult'])
+            ->onlyMethods(['setHydrationMode', 'getResult'])
             ->getMockForAbstractClass();
 
         $query->expects(self::once())
diff --git a/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php b/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php
index f94ae052ce1..f3fd5b3388e 100644
--- a/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php
+++ b/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
     {
         $this->eventModel = $this->getMockBuilder(EventModel::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getRepository',
                 'getLeadEventLogRepository',
                 'deleteEntities',
diff --git a/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php b/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php
index 81bbe259fcf..ef43503dccd 100644
--- a/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php
+++ b/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php
@@ -308,7 +308,7 @@ public function sendMarketingMessageSms(CampaignExecutionEvent $event)
     private function getEvent()
     {
         $event = $this->getMockBuilder(Event::class)
-            ->setMethods(['getId'])
+            ->onlyMethods(['getId'])
             ->getMock();
         $event->method('getId')
             ->willReturn(1);
@@ -375,7 +375,7 @@ private function getLogs()
             );
 
         $log = $this->getMockBuilder(LeadEventLog::class)
-            ->setMethods(['getLead', 'getId'])
+            ->onlyMethods(['getLead', 'getId'])
             ->getMock();
         $log->method('getLead')
             ->willReturn($lead);
@@ -400,7 +400,7 @@ private function getLogs()
             );
 
         $log2 = $this->getMockBuilder(LeadEventLog::class)
-            ->setMethods(['getLead', 'getId'])
+            ->onlyMethods(['getLead', 'getId'])
             ->getMock();
         $log2->method('getLead')
             ->willReturn($lead2);
diff --git a/app/bundles/CoreBundle/Test/EventListener/CoreSubscriberTest.php b/app/bundles/CoreBundle/Test/EventListener/CoreSubscriberTest.php
index 1d717d8c463..c9771a94407 100644
--- a/app/bundles/CoreBundle/Test/EventListener/CoreSubscriberTest.php
+++ b/app/bundles/CoreBundle/Test/EventListener/CoreSubscriberTest.php
@@ -171,7 +171,7 @@ public function testOnKernelController()
 
         $request    = $this->createMock(Request::class);
         $controller = $this->getMockBuilder(MauticController::class)
-            ->setMethods(['initialize', 'setRequest', 'setFactory', 'setUser', 'setCoreParametersHelper', 'setDispatcher', 'setTranslator', 'setFlashBag'])
+            ->onlyMethods(['initialize', 'setRequest', 'setFactory', 'setUser', 'setCoreParametersHelper', 'setDispatcher', 'setTranslator', 'setFlashBag'])
             ->getMock();
         $controllers = [$controller];
 
diff --git a/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php b/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php
index b78f7e5eec7..edb8da74754 100644
--- a/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php
+++ b/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php
@@ -40,7 +40,7 @@ class CommonRepositoryTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $emMock = $this->getMockBuilder(EntityManager::class)
-            ->setMethods(['none'])
+            ->onlyMethods(['none'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php b/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php
index 5c6f599c2dc..3e34a9b6e38 100644
--- a/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php
+++ b/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php
@@ -24,7 +24,7 @@ public function testGetDwcBySlotNameWithPublished(): void
     {
         $mockModel = $this->getMockBuilder(DynamicContentModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getEntities'])
+            ->onlyMethods(['getEntities'])
             ->getMock();
 
         $mockModel->expects($this->exactly(2))
diff --git a/app/bundles/EmailBundle/Tests/EventListener/TokenSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/TokenSubscriberTest.php
index 0c6235103b6..fc532e56ce2 100644
--- a/app/bundles/EmailBundle/Tests/EventListener/TokenSubscriberTest.php
+++ b/app/bundles/EmailBundle/Tests/EventListener/TokenSubscriberTest.php
@@ -101,7 +101,7 @@ public function testDynamicContentCustomTokens()
         /** @var TokenSubscriber $subscriber */
         $subscriber = $this->getMockBuilder(TokenSubscriber::class)
             ->setConstructorArgs([$dispatcher, $primaryCompanyHelper])
-            ->setMethods(null)
+            ->onlyMethods(null)
             ->getMock();
 
         $dispatcher->addSubscriber($subscriber);
diff --git a/app/bundles/EmailBundle/Tests/Helper/PointEventHelperTest.php b/app/bundles/EmailBundle/Tests/Helper/PointEventHelperTest.php
index 6edecc77ebb..8f5f69ed39c 100644
--- a/app/bundles/EmailBundle/Tests/Helper/PointEventHelperTest.php
+++ b/app/bundles/EmailBundle/Tests/Helper/PointEventHelperTest.php
@@ -52,7 +52,7 @@ private function getMockMauticFactory($published = true, $success = true)
     {
         $mock = $this->getMockBuilder(MauticFactory::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getModel'])
+            ->onlyMethods(['getModel'])
             ->getMock()
         ;
 
@@ -95,7 +95,7 @@ private function getMockEmail($published = true, $success = true)
 
         $mock = $this->getMockBuilder(EmailModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getEntity', 'sendEmail'])
+            ->onlyMethods(['getEntity', 'sendEmail'])
             ->getMock()
         ;
 
diff --git a/app/bundles/EmailBundle/Tests/Model/SendEmailToContactTest.php b/app/bundles/EmailBundle/Tests/Model/SendEmailToContactTest.php
index 3789612cc6f..1f9914daa93 100644
--- a/app/bundles/EmailBundle/Tests/Model/SendEmailToContactTest.php
+++ b/app/bundles/EmailBundle/Tests/Model/SendEmailToContactTest.php
@@ -257,7 +257,7 @@ function ($param) {
 
         $mailHelper = $this->getMockBuilder(MailHelper::class)
             ->setConstructorArgs([$factoryMock, $mailer])
-            ->setMethods(['createEmailStat'])
+            ->onlyMethods(['createEmailStat'])
             ->getMock();
 
         $mailHelper->method('createEmailStat')
@@ -416,7 +416,7 @@ function ($eventName, EmailSendEvent $event) {
 
         $mailHelper = $this->getMockBuilder(MailHelper::class)
             ->setConstructorArgs([$factoryMock, $mailer])
-            ->setMethods(null)
+            ->onlyMethods(null)
             ->getMock();
 
         // Enable queueing
@@ -519,7 +519,7 @@ function ($param) {
 
         $mailHelper = $this->getMockBuilder(MailHelper::class)
             ->setConstructorArgs([$factoryMock, $mailer])
-            ->setMethods(['createEmailStat'])
+            ->onlyMethods(['createEmailStat'])
             ->getMock();
 
         $mailHelper->expects($this->exactly(21))
@@ -656,7 +656,7 @@ function ($param) {
 
         $mailHelper = $this->getMockBuilder(MailHelper::class)
             ->setConstructorArgs([$factoryMock, $mailer])
-            ->setMethods(['createEmailStat'])
+            ->onlyMethods(['createEmailStat'])
             ->getMock();
 
         $mailHelper->method('createEmailStat')
diff --git a/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php
index 183d8ec40d9..61f315f08a1 100644
--- a/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php
+++ b/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php
@@ -46,7 +46,7 @@ public function testOnReportBuilderAddsFormAndFormSubmissionReports()
     {
         $mockEvent = $this->getMockBuilder(ReportBuilderEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'checkContext',
                 'addGraph',
                 'getStandardColumns',
@@ -117,7 +117,7 @@ public function testOnReportGenerateFormsContext()
         $mockQueryBuilder = $this->createMock(QueryBuilder::class);
         $mockEvent        = $this->getMockBuilder(ReportGeneratorEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getContext',
                 'getQueryBuilder',
                 'addCategoryLeftJoin',
@@ -145,7 +145,7 @@ public function testOnReportGenerateFormSubmissionContext()
         $mockQueryBuilder = $this->createMock(QueryBuilder::class);
         $mockEvent        = $this->getMockBuilder(ReportGeneratorEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getContext',
                 'getQueryBuilder',
                 'addCategoryLeftJoin',
diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php
index 744dae9df71..1c993ebef2d 100644
--- a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php
+++ b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php
@@ -63,7 +63,7 @@ protected function setUp(): void
         // This is terrible, but the Query class is final and AbstractQuery doesn't have some methods used.
         $this->query = $this->getMockBuilder(AbstractQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setParameters', 'setFirstResult', 'setMaxResults', 'getSingleResult', 'getSQL', '_doExecute'])
+            ->onlyMethods(['setParameters', 'setFirstResult', 'setMaxResults', 'getSingleResult', 'getSQL', '_doExecute'])
             ->getMock();
 
         $this->entityManager->expects($this->once())
diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php
index e3a34f92acf..c855f44a7dc 100644
--- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php
+++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     {
         $this->syncDateHelper = $this->getMockBuilder(SyncDateHelper::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getLastSyncDateForObject'])
+            ->onlyMethods(['getLastSyncDateForObject'])
             ->getMock();
     }
 
diff --git a/app/bundles/LeadBundle/Tests/Controller/Api/FieldApiControllerTest.php b/app/bundles/LeadBundle/Tests/Controller/Api/FieldApiControllerTest.php
index 04a1425574c..84e387c5343 100644
--- a/app/bundles/LeadBundle/Tests/Controller/Api/FieldApiControllerTest.php
+++ b/app/bundles/LeadBundle/Tests/Controller/Api/FieldApiControllerTest.php
@@ -47,7 +47,7 @@ public function testgetWhereFromRequestWithSomeWhere()
         ];
 
         $request = $this->getMockBuilder(Request::class)
-            ->setMethods(['get'])
+            ->onlyMethods(['get'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryTest.php b/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryTest.php
index 67f74efba1c..8f84b9233be 100644
--- a/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryTest.php
+++ b/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryTest.php
@@ -86,7 +86,7 @@ public function testBuildQueryForGetLeadsByFieldValue()
 
         $mock = $this->getMockBuilder(LeadRepository::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getEntityManager'])
+            ->onlyMethods(['getEntityManager'])
             ->getMock();
 
         $mock->method('getEntityManager')
@@ -110,13 +110,13 @@ public function testGetLeadsByFieldValueArrayMapReturn()
     {
         $mock = $this->getMockBuilder(LeadRepository::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getEntities', 'buildQueryForGetLeadsByFieldValue'])
+            ->onlyMethods(['getEntities', 'buildQueryForGetLeadsByFieldValue'])
             ->getMock();
 
         // Mock the
         $mockEntity = $this->getMockBuilder(Lead::class)
             ->disableOriginalConstructor()
-            ->setMethods(['loadMetadata'])
+            ->onlyMethods(['loadMetadata'])
             ->getMock();
 
         $mockEntity->setEmail('test@example.com');
diff --git a/app/bundles/LeadBundle/Tests/Entity/TagRepositoryTest.php b/app/bundles/LeadBundle/Tests/Entity/TagRepositoryTest.php
index 3cd57125623..1f4c7ca87b3 100644
--- a/app/bundles/LeadBundle/Tests/Entity/TagRepositoryTest.php
+++ b/app/bundles/LeadBundle/Tests/Entity/TagRepositoryTest.php
@@ -24,7 +24,7 @@ public function testGetTagByNameOrCreateNewOneWithSomeExistingTag()
 
         $mockRepository = $this->getMockBuilder(TagRepository::class)
             ->disableOriginalConstructor()
-            ->setMethods(['findOneBy'])
+            ->onlyMethods(['findOneBy'])
             ->getMock();
 
         $mockRepository->expects($this->once())
@@ -39,7 +39,7 @@ public function testGetTagByNameOrCreateNewOneWithSomeNewTag()
     {
         $mockRepository = $this->getMockBuilder(TagRepository::class)
             ->disableOriginalConstructor()
-            ->setMethods(['findOneBy'])
+            ->onlyMethods(['findOneBy'])
             ->getMock();
 
         $mockRepository->expects($this->once())
diff --git a/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php
index 3363ef54302..558c2b7f93b 100644
--- a/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php
+++ b/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php
@@ -891,7 +891,7 @@ public function testonReportGraphGenerate($event)
 
         $mockStmt = $this->getMockBuilder(PDOStatement::class)
             ->disableOriginalConstructor()
-            ->setMethods(['fetchAll'])
+            ->onlyMethods(['fetchAll'])
             ->getMock();
 
         $this->reportGraphEventMock->expects($this->once())
@@ -900,7 +900,7 @@ public function testonReportGraphGenerate($event)
 
         $mockChartQuery = $this->getMockBuilder(ChartQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'modifyCountQuery',
                 'modifyTimeDataQuery',
                 'loadAndBuildTimeData',
diff --git a/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php
index 93911dbf58a..3253835401f 100644
--- a/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php
+++ b/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
 
         $this->fieldRepository = $this->createMock(LeadFieldRepository::class);
         $this->fieldModel      = $this->getMockBuilder(FieldModel::class)
-            ->setMethods(['cleanAlias', 'getRepository'])
+            ->onlyMethods(['cleanAlias', 'getRepository'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php b/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php
index dfe6d9e62a6..6e51fa438de 100644
--- a/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php
+++ b/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php
@@ -26,7 +26,7 @@ public function testArrayValueIsFlattenedBeforeSave()
         /** @var CompanyModel $companyModel */
         $companyModel = $this->getMockBuilder(CompanyModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(null)
+            ->onlyMethods(null)
             ->getMock();
 
         $company = new Company();
diff --git a/app/bundles/LeadBundle/Tests/Model/ImportModelTest.php b/app/bundles/LeadBundle/Tests/Model/ImportModelTest.php
index 0dead04af01..6bb7b10aa9d 100644
--- a/app/bundles/LeadBundle/Tests/Model/ImportModelTest.php
+++ b/app/bundles/LeadBundle/Tests/Model/ImportModelTest.php
@@ -62,7 +62,7 @@ public function testCheckParallelImportLimitWhenMore()
     {
         $entity = $this->initImportEntity();
         $model  = $this->getMockBuilder(ImportModel::class)
-            ->setMethods(['getParallelImportLimit', 'getRepository'])
+            ->onlyMethods(['getParallelImportLimit', 'getRepository'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -71,7 +71,7 @@ public function testCheckParallelImportLimitWhenMore()
             ->will($this->returnValue(4));
 
         $repository = $this->getMockBuilder(ImportRepository::class)
-            ->setMethods(['countImportsWithStatuses'])
+            ->onlyMethods(['countImportsWithStatuses'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -92,7 +92,7 @@ public function testCheckParallelImportLimitWhenEqual()
     {
         $entity = $this->initImportEntity();
         $model  = $this->getMockBuilder(ImportModel::class)
-            ->setMethods(['getParallelImportLimit', 'getRepository'])
+            ->onlyMethods(['getParallelImportLimit', 'getRepository'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -101,7 +101,7 @@ public function testCheckParallelImportLimitWhenEqual()
             ->will($this->returnValue(4));
 
         $repository = $this->getMockBuilder(ImportRepository::class)
-            ->setMethods(['countImportsWithStatuses'])
+            ->onlyMethods(['countImportsWithStatuses'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -122,7 +122,7 @@ public function testCheckParallelImportLimitWhenLess()
     {
         $entity = $this->initImportEntity();
         $model  = $this->getMockBuilder(ImportModel::class)
-            ->setMethods(['getParallelImportLimit', 'getRepository'])
+            ->onlyMethods(['getParallelImportLimit', 'getRepository'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -131,7 +131,7 @@ public function testCheckParallelImportLimitWhenLess()
             ->will($this->returnValue(6));
 
         $repository = $this->getMockBuilder(ImportRepository::class)
-            ->setMethods(['countImportsWithStatuses'])
+            ->onlyMethods(['countImportsWithStatuses'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -151,7 +151,7 @@ public function testCheckParallelImportLimitWhenLess()
     public function testBeginImportWhenParallelLimitHit()
     {
         $model = $this->getMockBuilder(ImportModel::class)
-            ->setMethods(['checkParallelImportLimit', 'setGhostImportsAsFailed', 'saveEntity', 'getParallelImportLimit'])
+            ->onlyMethods(['checkParallelImportLimit', 'setGhostImportsAsFailed', 'saveEntity', 'getParallelImportLimit'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -187,7 +187,7 @@ public function testBeginImportWhenParallelLimitHit()
     public function testBeginImportWhenDatabaseException()
     {
         $model = $this->getMockBuilder(ImportModel::class)
-            ->setMethods(['checkParallelImportLimit', 'setGhostImportsAsFailed', 'saveEntity', 'logDebug', 'process'])
+            ->onlyMethods(['checkParallelImportLimit', 'setGhostImportsAsFailed', 'saveEntity', 'logDebug', 'process'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php b/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php
index d594c754233..582fe595124 100644
--- a/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php
+++ b/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php
@@ -14,7 +14,7 @@ protected function setUp(): void
     {
         $mockListModel = $this->getMockBuilder(ListModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getEntities', 'getEntity'])
+            ->onlyMethods(['getEntities', 'getEntity'])
             ->getMock();
 
         $mockListModel->expects($this->any())
@@ -22,7 +22,7 @@ protected function setUp(): void
             ->willReturnCallback(function ($id) {
                 $mockEntity = $this->getMockBuilder(LeadList::class)
                     ->disableOriginalConstructor()
-                    ->setMethods(['getName'])
+                    ->onlyMethods(['getName'])
                     ->getMock();
 
                 $mockEntity->expects($this->once())
diff --git a/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php b/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php
index 6715672e594..650d3cd5fc0 100644
--- a/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php
+++ b/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php
@@ -323,7 +323,7 @@ public function testCheckForDuplicateContact(): void
 
         $mockLeadModel = $this->getMockBuilder(LeadModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getRepository'])
+            ->onlyMethods(['getRepository'])
             ->getMock();
 
         $mockLeadModel->expects($this->once())
@@ -366,7 +366,7 @@ public function testCheckForDuplicateContactForOnlyPubliclyUpdatable(): void
 
         $mockLeadModel = $this->getMockBuilder(LeadModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getRepository'])
+            ->onlyMethods(['getRepository'])
             ->getMock();
 
         $mockLeadModel->expects($this->once())
@@ -398,7 +398,7 @@ public function testImportWillNotSetLeadToLeadEventLogWhenLeadSaveFails(): void
         $leadEventLog  = new LeadEventLog();
         $mockLeadModel = $this->getMockBuilder(LeadModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['saveEntity', 'checkForDuplicateContact'])
+            ->onlyMethods(['saveEntity', 'checkForDuplicateContact'])
             ->getMock();
 
         $mockUserModel = $this->getMockBuilder(UserHelper::class)
@@ -412,7 +412,7 @@ public function testImportWillNotSetLeadToLeadEventLogWhenLeadSaveFails(): void
 
         $mockCompanyModel = $this->getMockBuilder(CompanyModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['extractCompanyDataFromImport'])
+            ->onlyMethods(['extractCompanyDataFromImport'])
             ->getMock();
 
         $mockCompanyModel->expects($this->once())->method('extractCompanyDataFromImport')->willReturn([[], []]);
@@ -439,7 +439,7 @@ public function testImportWillSetLeadToLeadEventLogWhenLeadSaveSucceed()
         $lead          = new Lead();
         $mockLeadModel = $this->getMockBuilder(LeadModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['saveEntity', 'checkForDuplicateContact'])
+            ->onlyMethods(['saveEntity', 'checkForDuplicateContact'])
             ->getMock();
 
         $mockUserModel = $this->getMockBuilder(UserHelper::class)
@@ -453,7 +453,7 @@ public function testImportWillSetLeadToLeadEventLogWhenLeadSaveSucceed()
 
         $mockCompanyModel = $this->getMockBuilder(CompanyModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['extractCompanyDataFromImport'])
+            ->onlyMethods(['extractCompanyDataFromImport'])
             ->getMock();
 
         $mockCompanyModel->expects($this->once())->method('extractCompanyDataFromImport')->willReturn([[], []]);
diff --git a/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php
index 7453e2edc61..ad95e637fb9 100644
--- a/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php
+++ b/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php
@@ -67,7 +67,7 @@ public function testOnReportBuilderAddsPageAndPageHitReports()
     {
         $mockEvent = $this->getMockBuilder(ReportBuilderEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'checkContext',
                 'addGraph',
                 'getStandardColumns',
@@ -127,7 +127,7 @@ public function testOnReportGeneratePagesContext()
     {
         $mockEvent = $this->getMockBuilder(ReportGeneratorEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getContext',
                 'getQueryBuilder',
                 'addCategoryLeftJoin',
@@ -143,7 +143,7 @@ public function testOnReportGeneratePagesContext()
 
         $mockQueryBuilder = $this->getMockBuilder(QueryBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods(['from', 'leftJoin'])
+            ->onlyMethods(['from', 'leftJoin'])
             ->getMock();
 
         $mockQueryBuilder->expects($this->once())
@@ -173,7 +173,7 @@ public function testOnReportGeneratePageHitsContext()
     {
         $mockEvent = $this->getMockBuilder(ReportGeneratorEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'getContext',
                 'getQueryBuilder',
                 'addCategoryLeftJoin',
@@ -193,7 +193,7 @@ public function testOnReportGeneratePageHitsContext()
 
         $mockQueryBuilder = $this->getMockBuilder(QueryBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods(['from', 'leftJoin'])
+            ->onlyMethods(['from', 'leftJoin'])
             ->getMock();
 
         $mockQueryBuilder->expects($this->once())
@@ -223,7 +223,7 @@ public function testOnReportGraphGenerateBadContextWillReturn()
     {
         $mockEvent = $this->getMockBuilder(ReportGraphEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods(['checkContext', 'getRequestedGraphs'])
+            ->onlyMethods(['checkContext', 'getRequestedGraphs'])
             ->getMock();
 
         $mockEvent->expects($this->once())
@@ -240,7 +240,7 @@ public function testOnReportGraphGenerate()
     {
         $mockEvent = $this->getMockBuilder(ReportGraphEvent::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'checkContext',
                 'getQuerybuilder',
                 'getOptions',
@@ -258,12 +258,12 @@ public function testOnReportGraphGenerate()
 
         $mockQueryBuilder = $this->getMockBuilder(QueryBuilder::class)
             ->disableOriginalConstructor()
-            ->setMethods(['expr', 'execute'])
+            ->onlyMethods(['expr', 'execute'])
             ->getMock();
 
         $mockStmt = $this->getMockBuilder(PDOStatement::class)
             ->disableOriginalConstructor()
-            ->setMethods(['fetchAll'])
+            ->onlyMethods(['fetchAll'])
             ->getMock();
 
         $mockStmt->expects($this->exactly(2))
@@ -297,7 +297,7 @@ public function testOnReportGraphGenerate()
 
         $mockChartQuery = $this->getMockBuilder(ChartQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods([
+            ->onlyMethods([
                 'modifyCountQuery',
                 'modifyTimeDataQuery',
                 'loadAndBuildTimeData',
diff --git a/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php b/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
index 286fda59737..027da91f599 100644
--- a/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
+++ b/app/bundles/PageBundle/Tests/Model/TrackableModelTest.php
@@ -36,7 +36,7 @@ public function testHtmlIsDetectedInContent()
 
         $mockModel = $this->getMockBuilder(TrackableModel::class)
             ->setConstructorArgs([$mockRedirectModel, $mockLeadFieldRepository])
-            ->setMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'createTrackingTokens',  'extractTrackablesFromHtml'])
+            ->onlyMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'createTrackingTokens',  'extractTrackablesFromHtml'])
             ->getMock();
 
         $mockModel->expects($this->once())
@@ -84,7 +84,7 @@ public function testPlainTextIsDetectedInContent()
 
         $mockModel = $this->getMockBuilder(TrackableModel::class)
             ->setConstructorArgs([$mockRedirectModel, $mockLeadFieldRepository])
-            ->setMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'createTrackingTokens',  'extractTrackablesFromText'])
+            ->onlyMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'createTrackingTokens',  'extractTrackablesFromText'])
             ->getMock();
 
         $mockModel->expects($this->once())
@@ -616,7 +616,7 @@ protected function getModel($doNotTrack = [], $urlFieldsForPlaintext = [])
 
         $mockModel = $this->getMockBuilder(TrackableModel::class)
             ->setConstructorArgs([$mockRedirectModel, $mockLeadFieldRepository])
-            ->setMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'getContactFieldUrlTokens'])
+            ->onlyMethods(['getDoNotTrackList', 'getEntitiesFromUrls', 'getContactFieldUrlTokens'])
             ->getMock();
 
         $mockModel->expects($this->once())
diff --git a/app/bundles/SmsBundle/Tests/DependencyInjection/Compiler/SmsTransportPassTest.php b/app/bundles/SmsBundle/Tests/DependencyInjection/Compiler/SmsTransportPassTest.php
index 2c2a7bb1a53..cc4b68adf68 100644
--- a/app/bundles/SmsBundle/Tests/DependencyInjection/Compiler/SmsTransportPassTest.php
+++ b/app/bundles/SmsBundle/Tests/DependencyInjection/Compiler/SmsTransportPassTest.php
@@ -41,7 +41,7 @@ public function testProcess()
 
         $transport = $this->getMockBuilder(TransportChain::class)
             ->disableOriginalConstructor()
-            ->setMethods(['addTransport'])
+            ->onlyMethods(['addTransport'])
             ->getMock();
 
         $container
diff --git a/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php b/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php
index c580851eeb1..ec4f403d957 100644
--- a/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php
+++ b/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php
@@ -22,7 +22,7 @@ public function testGetLookupResultsWhenTypeIsClass()
         // Partial mock, mocks just getRepository
         $smsModel = $this->getMockBuilder(SmsModel::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getRepository'])
+            ->onlyMethods(['getRepository'])
             ->getMock();
         $smsModel->method('getRepository')
             ->willReturn($repositoryMock);
diff --git a/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php b/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php
index 1951f4d731e..f63bcf279bd 100644
--- a/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php
+++ b/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
         $this->ipCollection      = new ArrayCollection();
         $this->companyRepository = $this->getMockBuilder(CompanyRepository::class)
         ->disableOriginalConstructor()
-        ->setMethods(['getCompaniesByLeadId'])
+        ->onlyMethods(['getCompaniesByLeadId'])
         ->getMock();
 
         $this->companyRepository->method('getCompaniesByLeadId')
diff --git a/plugins/MauticCrmBundle/Tests/Integration/SalesforceIntegrationTest.php b/plugins/MauticCrmBundle/Tests/Integration/SalesforceIntegrationTest.php
index af427c0d2d6..d2883ed1511 100644
--- a/plugins/MauticCrmBundle/Tests/Integration/SalesforceIntegrationTest.php
+++ b/plugins/MauticCrmBundle/Tests/Integration/SalesforceIntegrationTest.php
@@ -1002,7 +1002,7 @@ protected function getSalesforceIntegration($maxUpdate = 100, $maxCreate = 200,
                 $integrationEntityModelMock,
                 $this->doNotContact,
             ])
-            ->setMethods($this->sfMockMethods)
+            ->onlyMethods($this->sfMockMethods)
             ->getMock();
 
         $sf->method('makeRequest')
diff --git a/tests/Mautic/StageBundle/Tests/Entity/StageRepositoryTest.php b/tests/Mautic/StageBundle/Tests/Entity/StageRepositoryTest.php
index db65b361603..76c4b4876f4 100644
--- a/tests/Mautic/StageBundle/Tests/Entity/StageRepositoryTest.php
+++ b/tests/Mautic/StageBundle/Tests/Entity/StageRepositoryTest.php
@@ -82,7 +82,7 @@ public function testFindByIdOrNameUseInt()
 
         $query = $this->getMockBuilder(AbstractQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getOneOrNullResult'])
+            ->onlyMethods(['getOneOrNullResult'])
             ->getMockForAbstractClass();
 
         $queryBuilder->expects($this->once())
@@ -128,7 +128,7 @@ public function testFindByIdOrNameUseString()
 
         $query = $this->getMockBuilder(AbstractQuery::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getOneOrNullResult'])
+            ->onlyMethods(['getOneOrNullResult'])
             ->getMockForAbstractClass();
 
         $queryBuilder->expects($this->once())