diff --git a/app/bundles/ApiBundle/Tests/EventListener/ApiSubscriberTest.php b/app/bundles/ApiBundle/Tests/EventListener/ApiSubscriberTest.php index ecf7d7a4c71..9fb95d0739f 100644 --- a/app/bundles/ApiBundle/Tests/EventListener/ApiSubscriberTest.php +++ b/app/bundles/ApiBundle/Tests/EventListener/ApiSubscriberTest.php @@ -17,27 +17,24 @@ class ApiSubscriberTest extends CommonMocks /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var Translator&MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var Request&MockObject */ - private $request; + private \PHPUnit\Framework\MockObject\MockObject $request; /** * @var RequestEvent&MockObject */ - private $event; + private \PHPUnit\Framework\MockObject\MockObject $event; - /** - * @var ApiSubscriber - */ - private $subscriber; + private \Mautic\ApiBundle\EventListener\ApiSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/ApiBundle/Tests/Form/Type/ClientTypeTest.php b/app/bundles/ApiBundle/Tests/Form/Type/ClientTypeTest.php index d70fe555501..e2a39023408 100644 --- a/app/bundles/ApiBundle/Tests/Form/Type/ClientTypeTest.php +++ b/app/bundles/ApiBundle/Tests/Form/Type/ClientTypeTest.php @@ -19,45 +19,42 @@ class ClientTypeTest extends TestCase { - /** - * @var ClientType - */ - private $clientType; + private \Mautic\ApiBundle\Form\Type\ClientType $clientType; /** * @var RequestStack */ - private $requestStack; + private \PHPUnit\Framework\MockObject\MockObject $requestStack; /** * @var TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var ValidatorInterface */ - private $validator; + private \PHPUnit\Framework\MockObject\MockObject $validator; /** * @var Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; /** * @var RouterInterface */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var FormBuilderInterface */ - private $builder; + private \PHPUnit\Framework\MockObject\MockObject $builder; /** * @var Request */ - private $request; + private \PHPUnit\Framework\MockObject\MockObject $request; private Client $client; diff --git a/app/bundles/ApiBundle/Tests/Helper/RequestHelperTest.php b/app/bundles/ApiBundle/Tests/Helper/RequestHelperTest.php index 5a92232d81b..aa81daf3e08 100644 --- a/app/bundles/ApiBundle/Tests/Helper/RequestHelperTest.php +++ b/app/bundles/ApiBundle/Tests/Helper/RequestHelperTest.php @@ -12,7 +12,7 @@ class RequestHelperTest extends TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|Request */ - private $request; + private \PHPUnit\Framework\MockObject\MockObject $request; protected function setUp(): void { diff --git a/app/bundles/AssetBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php b/app/bundles/AssetBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php index 8df99c131d1..c079d7dce00 100644 --- a/app/bundles/AssetBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php +++ b/app/bundles/AssetBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php @@ -17,17 +17,14 @@ class DetermineWinnerSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EntityManagerInterface */ - private $em; + private \PHPUnit\Framework\MockObject\MockObject $em; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DetermineWinnerSubscriber - */ - private $subscriber; + private \Mautic\AssetBundle\EventListener\DetermineWinnerSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/AssetBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/AssetBundle/Tests/EventListener/ReportSubscriberTest.php index e6682e773e9..a324487ab00 100644 --- a/app/bundles/AssetBundle/Tests/EventListener/ReportSubscriberTest.php +++ b/app/bundles/AssetBundle/Tests/EventListener/ReportSubscriberTest.php @@ -20,30 +20,24 @@ class ReportSubscriberTest extends \PHPUnit\Framework\TestCase { - /** - * @var ChannelListHelper - */ - private $channelListHelper; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; /** * @var CompanyReportData|\PHPUnit\Framework\MockObject\MockObject */ - private $companyReportData; + private \PHPUnit\Framework\MockObject\MockObject $companyReportData; /** * @var DownloadRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $downloadRepository; + private \PHPUnit\Framework\MockObject\MockObject $downloadRepository; /** * @var QueryBuilder|\PHPUnit\Framework\MockObject\MockObject */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; - /** - * @var ReportHelper - */ - private $reportHelper; + private \Mautic\ReportBundle\Helper\ReportHelper $reportHelper; public function setUp(): void { diff --git a/app/bundles/CacheBundle/Tests/Cache/CacheProviderTest.php b/app/bundles/CacheBundle/Tests/Cache/CacheProviderTest.php index 9f5524b3a9b..1595bafeba7 100644 --- a/app/bundles/CacheBundle/Tests/Cache/CacheProviderTest.php +++ b/app/bundles/CacheBundle/Tests/Cache/CacheProviderTest.php @@ -15,25 +15,22 @@ class CacheProviderTest extends TestCase { - /** - * @var CacheProvider - */ - private $cacheProvider; + private \Mautic\CacheBundle\Cache\CacheProvider $cacheProvider; /** * @var MockObject|FilesystemTagAwareAdapter */ - private $adapter; + private \PHPUnit\Framework\MockObject\MockObject $adapter; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var MockObject|ContainerInterface */ - private $container; + private \PHPUnit\Framework\MockObject\MockObject $container; public function setUp(): void { diff --git a/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php b/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php index e20f4b25b42..c32a1c3a8a5 100644 --- a/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php +++ b/app/bundles/CacheBundle/Tests/EventListener/CacheClearSubscriberTest.php @@ -16,10 +16,7 @@ class CacheClearSubscriberTest extends \PHPUnit\Framework\TestCase */ private MockObject $adapter; - /** - * @var string - */ - private $random; + private string $random; public function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php b/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php index ebf9bc70675..eeab4daa2a4 100644 --- a/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php +++ b/app/bundles/CampaignBundle/Tests/Entity/CampaignRepositoryTest.php @@ -20,7 +20,7 @@ class CampaignRepositoryTest extends TestCase /** * @var MockObject&QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; private CampaignRepository $repository; diff --git a/app/bundles/CampaignBundle/Tests/Entity/ContactLimiterTraitTest.php b/app/bundles/CampaignBundle/Tests/Entity/ContactLimiterTraitTest.php index c35e4e2fb06..c5adcd00255 100644 --- a/app/bundles/CampaignBundle/Tests/Entity/ContactLimiterTraitTest.php +++ b/app/bundles/CampaignBundle/Tests/Entity/ContactLimiterTraitTest.php @@ -19,12 +19,12 @@ class ContactLimiterTraitTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|Connection */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var \PHPUnit\Framework\MockObject\MockObject|EntityManagerInterface */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/EventListener/CampaignSubscriberTest.php b/app/bundles/CampaignBundle/Tests/EventListener/CampaignSubscriberTest.php index c038c12f83c..a3f87f1adb7 100644 --- a/app/bundles/CampaignBundle/Tests/EventListener/CampaignSubscriberTest.php +++ b/app/bundles/CampaignBundle/Tests/EventListener/CampaignSubscriberTest.php @@ -16,15 +16,12 @@ class CampaignSubscriberTest extends TestCase { - private $ipLookupHelper; - private $auditLogModel; - private $campaignService; - private $flashBag; - - /** - * @var CampaignSubscriber - */ - private $subscriber; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $auditLogModel; + private \PHPUnit\Framework\MockObject\MockObject $campaignService; + private \PHPUnit\Framework\MockObject\MockObject $flashBag; + + private \Mautic\CampaignBundle\EventListener\CampaignSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/InactiveContactFinderTest.php b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/InactiveContactFinderTest.php index b0ddd991068..93d4f87f1d1 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/InactiveContactFinderTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/InactiveContactFinderTest.php @@ -17,12 +17,12 @@ class InactiveContactFinderTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadRepository */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var \PHPUnit\Framework\MockObject\MockObject|CampaignLeadRepository */ - private $campaignLeadRepository; + private \PHPUnit\Framework\MockObject\MockObject $campaignLeadRepository; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/KickoffContactFinderTest.php b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/KickoffContactFinderTest.php index 1e4335da8ec..5246da1b00b 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/KickoffContactFinderTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/KickoffContactFinderTest.php @@ -16,12 +16,12 @@ class KickoffContactFinderTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadRepository */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var \PHPUnit\Framework\MockObject\MockObject|CampaignRepository */ - private $campaignRepository; + private \PHPUnit\Framework\MockObject\MockObject $campaignRepository; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/ScheduledContactFinderTest.php b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/ScheduledContactFinderTest.php index dc7fee56f19..5a04403813e 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/ScheduledContactFinderTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/ContactFinder/ScheduledContactFinderTest.php @@ -16,12 +16,12 @@ class ScheduledContactFinderTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadRepository */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var \PHPUnit\Framework\MockObject\MockObject|CampaignRepository */ - private $campaignRepository; + private \PHPUnit\Framework\MockObject\MockObject $campaignRepository; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ActionDispatcherTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ActionDispatcherTest.php index 9f72371fe0b..cc32f620e02 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ActionDispatcherTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ActionDispatcherTest.php @@ -29,22 +29,22 @@ class ActionDispatcherTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|EventScheduler */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; /** * @var MockObject|LegacyEventDispatcher */ - private $legacyDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $legacyDispatcher; /** * @var MockObject|NotificationHelper */ - private $notificationHelper; + private \PHPUnit\Framework\MockObject\MockObject $notificationHelper; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ConditionDispatcherTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ConditionDispatcherTest.php index 8cb7dd21c0b..4486e1fbc8e 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ConditionDispatcherTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/ConditionDispatcherTest.php @@ -17,12 +17,12 @@ class ConditionDispatcherTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|ConditionAccessor */ - private $config; + private \PHPUnit\Framework\MockObject\MockObject $config; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/DecisionDispatcherTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/DecisionDispatcherTest.php index 4dd5c3005dc..e21ba903017 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/DecisionDispatcherTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/DecisionDispatcherTest.php @@ -22,22 +22,19 @@ class DecisionDispatcherTest extends TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|LegacyEventDispatcher */ - private $legacyDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $legacyDispatcher; /** * @var MockObject|DecisionAccessor */ - private $config; + private \PHPUnit\Framework\MockObject\MockObject $config; - /** - * @var DecisionDispatcher - */ - private $decisionDispatcher; + private \Mautic\CampaignBundle\Executioner\Dispatcher\DecisionDispatcher $decisionDispatcher; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/LegacyEventDispatcherTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/LegacyEventDispatcherTest.php index 466de24fc78..21b5f66556f 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/LegacyEventDispatcherTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Dispatcher/LegacyEventDispatcherTest.php @@ -31,37 +31,37 @@ class LegacyEventDispatcherTest extends TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|EventScheduler */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; /** * @var MockObject|NotificationHelper */ - private $notificationHelper; + private \PHPUnit\Framework\MockObject\MockObject $notificationHelper; /** * @var MockObject|MauticFactory */ - private $mauticFactory; + private \PHPUnit\Framework\MockObject\MockObject $mauticFactory; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject|AbstractEventAccessor */ - private $config; + private \PHPUnit\Framework\MockObject\MockObject $config; /** * @var MockObject|PendingEvent */ - private $pendingEvent; + private \PHPUnit\Framework\MockObject\MockObject $pendingEvent; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/EventExecutionerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/EventExecutionerTest.php index d6f31eab3bc..6e52119a8eb 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/EventExecutionerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/EventExecutionerTest.php @@ -34,57 +34,57 @@ class EventExecutionerTest extends \PHPUnit\Framework\TestCase /** * @var EventCollector|\PHPUnit\Framework\MockObject\MockObject */ - private $eventCollector; + private \PHPUnit\Framework\MockObject\MockObject $eventCollector; /** * @var EventLogger|\PHPUnit\Framework\MockObject\MockObject */ - private $eventLogger; + private \PHPUnit\Framework\MockObject\MockObject $eventLogger; /** * @var ActionExecutioner|\PHPUnit\Framework\MockObject\MockObject */ - private $actionExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $actionExecutioner; /** * @var ConditionExecutioner|\PHPUnit\Framework\MockObject\MockObject */ - private $conditionExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $conditionExecutioner; /** * @var DecisionExecutioner|\PHPUnit\Framework\MockObject\MockObject */ - private $decisionExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $decisionExecutioner; /** * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var EventScheduler|\PHPUnit\Framework\MockObject\MockObject */ - private $eventScheduler; + private \PHPUnit\Framework\MockObject\MockObject $eventScheduler; /** * @var RemovedContactTracker|\PHPUnit\Framework\MockObject\MockObject */ - private $removedContactTracker; + private \PHPUnit\Framework\MockObject\MockObject $removedContactTracker; /** * @var LeadRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var EventRepository|MockBuilder */ - private $eventRepository; + private \PHPUnit\Framework\MockObject\MockObject $eventRepository; /** * @var Translator|MockBuilder */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/InactiveExecutionerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/InactiveExecutionerTest.php index 20e1ffb2be2..48a391429fe 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/InactiveExecutionerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/InactiveExecutionerTest.php @@ -21,27 +21,27 @@ class InactiveExecutionerTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|InactiveContactFinder */ - private $inactiveContactFinder; + private \PHPUnit\Framework\MockObject\MockObject $inactiveContactFinder; /** * @var \PHPUnit\Framework\MockObject\MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventScheduler */ - private $eventScheduler; + private \PHPUnit\Framework\MockObject\MockObject $eventScheduler; /** * @var \PHPUnit\Framework\MockObject\MockObject|InactiveHelper */ - private $inactiveHelper; + private \PHPUnit\Framework\MockObject\MockObject $inactiveHelper; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventExecutioner */ - private $eventExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $eventExecutioner; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/KickoffExecutionerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/KickoffExecutionerTest.php index 4e532ea575c..48c34747b23 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/KickoffExecutionerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/KickoffExecutionerTest.php @@ -25,22 +25,22 @@ class KickoffExecutionerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|KickoffContactFinder */ - private $kickoffContactFinder; + private \PHPUnit\Framework\MockObject\MockObject $kickoffContactFinder; /** * @var MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|EventExecutioner */ - private $executioner; + private \PHPUnit\Framework\MockObject\MockObject $executioner; /** * @var MockObject|EventScheduler */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Logger/EventLoggerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Logger/EventLoggerTest.php index c756d3530a0..75b14c75660 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Logger/EventLoggerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Logger/EventLoggerTest.php @@ -22,27 +22,27 @@ class EventLoggerTest extends TestCase /** * @var LeadRepository|MockObject */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var ContactTracker|MockObject */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var LeadEventLogRepository|MockObject */ - private $leadEventLogRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadEventLogRepository; /** * @var LeadRepository|MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var SummaryModel|MockObject */ - private $summaryModel; + private \PHPUnit\Framework\MockObject\MockObject $summaryModel; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/RealTimeExecutionerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/RealTimeExecutionerTest.php index 5e7f4efc1f8..d4eb7ad4716 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/RealTimeExecutionerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/RealTimeExecutionerTest.php @@ -23,47 +23,44 @@ class RealTimeExecutionerTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventRepository */ - private $eventRepository; + private \PHPUnit\Framework\MockObject\MockObject $eventRepository; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventExecutioner */ - private $executioner; + private \PHPUnit\Framework\MockObject\MockObject $executioner; /** * @var \PHPUnit\Framework\MockObject\MockObject|DecisionExecutioner */ - private $decisionExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $decisionExecutioner; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventCollector */ - private $eventCollector; + private \PHPUnit\Framework\MockObject\MockObject $eventCollector; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventScheduler */ - private $eventScheduler; + private \PHPUnit\Framework\MockObject\MockObject $eventScheduler; /** * @var \PHPUnit\Framework\MockObject\MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadRepository */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; - /** - * @var DecisionHelper - */ - private $decisionHelper; + private \Mautic\CampaignBundle\Executioner\Helper\DecisionHelper $decisionHelper; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/ScheduledExecutionerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/ScheduledExecutionerTest.php index ee24a1e0d30..1739fbd183b 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/ScheduledExecutionerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/ScheduledExecutionerTest.php @@ -21,27 +21,27 @@ class ScheduledExecutionerTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadEventLogRepository */ - private $repository; + private \PHPUnit\Framework\MockObject\MockObject $repository; /** * @var \PHPUnit\Framework\MockObject\MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventExecutioner */ - private $executioner; + private \PHPUnit\Framework\MockObject\MockObject $executioner; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventScheduler */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; /** * @var \PHPUnit\Framework\MockObject\MockObject|ScheduledContactFinder */ - private $contactFinder; + private \PHPUnit\Framework\MockObject\MockObject $contactFinder; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Executioner/Scheduler/EventSchedulerTest.php b/app/bundles/CampaignBundle/Tests/Executioner/Scheduler/EventSchedulerTest.php index 6d07515e9cc..f323eafe03b 100644 --- a/app/bundles/CampaignBundle/Tests/Executioner/Scheduler/EventSchedulerTest.php +++ b/app/bundles/CampaignBundle/Tests/Executioner/Scheduler/EventSchedulerTest.php @@ -19,51 +19,38 @@ use Mautic\LeadBundle\Entity\Lead; use PHPUnit\Framework\Assert; use PHPUnit\Framework\MockObject\MockObject; -use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Symfony\Component\EventDispatcher\EventDispatcherInterface; class EventSchedulerTest extends \PHPUnit\Framework\TestCase { - /** - * @var LoggerInterface|MockObject - */ - private $logger; + private \Psr\Log\NullLogger $logger; /** * @var EventLogger|MockObject */ - private $eventLogger; + private \PHPUnit\Framework\MockObject\MockObject $eventLogger; - /** - * @var Interval - */ - private $intervalScheduler; + private \Mautic\CampaignBundle\Executioner\Scheduler\Mode\Interval $intervalScheduler; - /** - * @var DateTime - */ - private $dateTimeScheduler; + private \Mautic\CampaignBundle\Executioner\Scheduler\Mode\DateTime $dateTimeScheduler; /** * @var EventCollector|MockObject */ - private $eventCollector; + private \PHPUnit\Framework\MockObject\MockObject $eventCollector; /** * @var EventDispatcherInterface|MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var CoreParametersHelper|MockObject */ - private $coreParamtersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParamtersHelper; - /** - * @var EventScheduler - */ - private $scheduler; + private \Mautic\CampaignBundle\Executioner\Scheduler\EventScheduler $scheduler; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Helper/InactiveHelperTest.php b/app/bundles/CampaignBundle/Tests/Helper/InactiveHelperTest.php index 7da7a1dc9cb..cf7be5ee850 100644 --- a/app/bundles/CampaignBundle/Tests/Helper/InactiveHelperTest.php +++ b/app/bundles/CampaignBundle/Tests/Helper/InactiveHelperTest.php @@ -23,42 +23,36 @@ class InactiveHelperTest extends TestCase /** * @var EventScheduler|MockObject */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; /** * @var InactiveContactFinder|MockObject */ - private $inactiveContactFinder; + private \PHPUnit\Framework\MockObject\MockObject $inactiveContactFinder; /** * @var LeadEventLogRepository|MockObject */ - private $eventLogRepository; + private \PHPUnit\Framework\MockObject\MockObject $eventLogRepository; /** * @var EventRepository|MockObject */ - private $eventRepository; + private \PHPUnit\Framework\MockObject\MockObject $eventRepository; /** * @var LeadRepository|MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var LoggerInterface|MockObject */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; - /** - * @var InactiveHelper - */ - private $inactiveHelper; + private \Mautic\CampaignBundle\Executioner\Helper\InactiveHelper $inactiveHelper; - /** - * @var DecisionHelper - */ - private $decisionHelper; + private \Mautic\CampaignBundle\Executioner\Helper\DecisionHelper $decisionHelper; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Helper/NotificationHelperTest.php b/app/bundles/CampaignBundle/Tests/Helper/NotificationHelperTest.php index 2d4f5a643cb..30835bf3a5c 100644 --- a/app/bundles/CampaignBundle/Tests/Helper/NotificationHelperTest.php +++ b/app/bundles/CampaignBundle/Tests/Helper/NotificationHelperTest.php @@ -18,27 +18,27 @@ class NotificationHelperTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|UserModel */ - private $userModel; + private \PHPUnit\Framework\MockObject\MockObject $userModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|NotificationModel */ - private $notificationModel; + private \PHPUnit\Framework\MockObject\MockObject $notificationModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|Router */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var \PHPUnit\Framework\MockObject\MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var \PHPUnit\Framework\MockObject\MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php b/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php index 82b94912edb..eebe763ae92 100644 --- a/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php +++ b/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php @@ -15,12 +15,12 @@ class AdderTest extends \PHPUnit\Framework\TestCase /** * @var LeadRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var LeadEventLogRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadEventLogRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadEventLogRepository; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Membership/Action/RemoverTest.php b/app/bundles/CampaignBundle/Tests/Membership/Action/RemoverTest.php index 11dfd32c2b2..71b91ed2c0b 100644 --- a/app/bundles/CampaignBundle/Tests/Membership/Action/RemoverTest.php +++ b/app/bundles/CampaignBundle/Tests/Membership/Action/RemoverTest.php @@ -15,12 +15,12 @@ class RemoverTest extends \PHPUnit\Framework\TestCase /** * @var LeadRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var LeadEventLogRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadEventLogRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadEventLogRepository; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Membership/EventDispatcherTest.php b/app/bundles/CampaignBundle/Tests/Membership/EventDispatcherTest.php index e5e314f1b2a..9e59137b917 100644 --- a/app/bundles/CampaignBundle/Tests/Membership/EventDispatcherTest.php +++ b/app/bundles/CampaignBundle/Tests/Membership/EventDispatcherTest.php @@ -15,7 +15,7 @@ class EventDispatcherTest extends \PHPUnit\Framework\TestCase /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Membership/MembershipBuilderTest.php b/app/bundles/CampaignBundle/Tests/Membership/MembershipBuilderTest.php index 2e278cbe3d7..869b195a5ee 100644 --- a/app/bundles/CampaignBundle/Tests/Membership/MembershipBuilderTest.php +++ b/app/bundles/CampaignBundle/Tests/Membership/MembershipBuilderTest.php @@ -20,27 +20,24 @@ final class MembershipBuilderTest extends \PHPUnit\Framework\TestCase /** * @var MembershipManager|\PHPUnit\Framework\MockObject\MockObject */ - private $manager; + private \PHPUnit\Framework\MockObject\MockObject $manager; /** * @var CampaignMemberRepository|MockObject */ - private $campaignMemberRepository; + private \PHPUnit\Framework\MockObject\MockObject $campaignMemberRepository; /** * @var LeadRepository|MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var TranslatorInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var MembershipBuilder - */ - private $membershipBuilder; + private \Mautic\CampaignBundle\Membership\MembershipBuilder $membershipBuilder; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Membership/MembershipManagerTest.php b/app/bundles/CampaignBundle/Tests/Membership/MembershipManagerTest.php index 5241225515d..2a8b8f2c51e 100644 --- a/app/bundles/CampaignBundle/Tests/Membership/MembershipManagerTest.php +++ b/app/bundles/CampaignBundle/Tests/Membership/MembershipManagerTest.php @@ -18,27 +18,27 @@ class MembershipManagerTest extends \PHPUnit\Framework\TestCase /** * @var Adder|\PHPUnit\Framework\MockObject\MockObject */ - private $adder; + private \PHPUnit\Framework\MockObject\MockObject $adder; /** * @var Remover|\PHPUnit\Framework\MockObject\MockObject */ - private $remover; + private \PHPUnit\Framework\MockObject\MockObject $remover; /** * @var EventDispatcher|\PHPUnit\Framework\MockObject\MockObject */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; /** * @var LeadRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var NullLogger|\PHPUnit\Framework\MockObject\MockObject */ - private $logger; + private \Psr\Log\NullLogger $logger; protected function setUp(): void { diff --git a/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php b/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php index 5ed3f85c9c0..b36920ddb93 100644 --- a/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php +++ b/app/bundles/CampaignBundle/Tests/Model/EventModelTest.php @@ -13,12 +13,12 @@ class EventModelTest extends TestCase /** * @var LeadEventLogRepository */ - private $leadEventLogRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadEventLogRepository; /** * @var EventModel */ - private $eventModel; + private \PHPUnit\Framework\MockObject\MockObject $eventModel; protected function setUp(): void { diff --git a/app/bundles/CategoryBundle/Tests/Model/ContactActionModelTest.php b/app/bundles/CategoryBundle/Tests/Model/ContactActionModelTest.php index 6d860273422..1181dfdb69d 100644 --- a/app/bundles/CategoryBundle/Tests/Model/ContactActionModelTest.php +++ b/app/bundles/CategoryBundle/Tests/Model/ContactActionModelTest.php @@ -11,25 +11,16 @@ class ContactActionModelTest extends \PHPUnit\Framework\TestCase { - /** - * @var Lead - */ - private $contactMock5; + private \Mautic\LeadBundle\Entity\Lead $contactMock5; - /** - * @var Lead - */ - private $contactMock6; + private \Mautic\LeadBundle\Entity\Lead $contactMock6; /** * @var MockObject|LeadModel */ - private $contactModelMock; + private \PHPUnit\Framework\MockObject\MockObject $contactModelMock; - /** - * @var ContactActionModel - */ - private $actionModel; + private \Mautic\CategoryBundle\Model\ContactActionModel $actionModel; protected function setUp(): void { diff --git a/app/bundles/ChannelBundle/Tests/Event/ChannelBroadcastEventTest.php b/app/bundles/ChannelBundle/Tests/Event/ChannelBroadcastEventTest.php index 0031a64f443..c5385654071 100644 --- a/app/bundles/ChannelBundle/Tests/Event/ChannelBroadcastEventTest.php +++ b/app/bundles/ChannelBundle/Tests/Event/ChannelBroadcastEventTest.php @@ -9,15 +9,9 @@ class ChannelBroadcastEventTest extends TestCase { - /** - * @var string - */ - private $channel; + private string $channel; - /** - * @var int|string - */ - private $channelId; + private int $channelId; private OutputInterface $output; protected function setUp(): void diff --git a/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php b/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php index 4e835a43527..021f5ad5806 100644 --- a/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php +++ b/app/bundles/ChannelBundle/Tests/EventListener/CampaignSubscriberTest.php @@ -33,40 +33,34 @@ class CampaignSubscriberTest extends \PHPUnit\Framework\TestCase { - /** - * @var EventDispatcher - */ - private $dispatcher; + private \Symfony\Component\EventDispatcher\EventDispatcher $dispatcher; /** * @var \PHPUnit\Framework\MockObject\MockObject|MessageModel */ - private $messageModel; + private \PHPUnit\Framework\MockObject\MockObject $messageModel; - /** - * @var ActionDispatcher - */ - private $eventDispatcher; + private \Mautic\CampaignBundle\Executioner\Dispatcher\ActionDispatcher $eventDispatcher; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventCollector */ - private $eventCollector; + private \PHPUnit\Framework\MockObject\MockObject $eventCollector; /** * @var \PHPUnit\Framework\MockObject\MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventScheduler */ - private $scheduler; + private \PHPUnit\Framework\MockObject\MockObject $scheduler; /** * @var \PHPUnit\Framework\MockObject\MockObject|LegacyEventDispatcher */ - private $legacyDispatcher; + private \Mautic\CampaignBundle\Executioner\Dispatcher\LegacyEventDispatcher $legacyDispatcher; protected function setUp(): void { diff --git a/app/bundles/ChannelBundle/Tests/Model/ChannelActionModelTest.php b/app/bundles/ChannelBundle/Tests/Model/ChannelActionModelTest.php index dbd84121ee9..13e224aa2ff 100644 --- a/app/bundles/ChannelBundle/Tests/Model/ChannelActionModelTest.php +++ b/app/bundles/ChannelBundle/Tests/Model/ChannelActionModelTest.php @@ -9,40 +9,21 @@ use Mautic\LeadBundle\Entity\Lead; use Mautic\LeadBundle\Model\DoNotContact; use Mautic\LeadBundle\Model\LeadModel; -use PHPUnit\Framework\MockObject\MockObject; use Symfony\Contracts\Translation\TranslatorInterface; class ChannelActionModelTest extends \PHPUnit\Framework\TestCase { - /** - * @var MockObject - */ - private $contactMock5; - - /** - * @var MockObject - */ - private $contactMock6; - - /** - * @var MockObject - */ - private $contactModelMock; - - /** - * @var MockObject - */ - private $doNotContactMock; - - /** - * @var MockObject - */ - private $translatorMock; - - /** - * @var ChannelActionModel - */ - private $actionModel; + private \PHPUnit\Framework\MockObject\MockObject $contactMock5; + + private \PHPUnit\Framework\MockObject\MockObject $contactMock6; + + private \PHPUnit\Framework\MockObject\MockObject $contactModelMock; + + private \PHPUnit\Framework\MockObject\MockObject $doNotContactMock; + + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; + + private \Mautic\ChannelBundle\Model\ChannelActionModel $actionModel; protected function setUp(): void { diff --git a/app/bundles/ChannelBundle/Tests/Model/FrequencyActionModelTest.php b/app/bundles/ChannelBundle/Tests/Model/FrequencyActionModelTest.php index ae1ac743608..7202cd8ebdf 100644 --- a/app/bundles/ChannelBundle/Tests/Model/FrequencyActionModelTest.php +++ b/app/bundles/ChannelBundle/Tests/Model/FrequencyActionModelTest.php @@ -15,32 +15,29 @@ class FrequencyActionModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Lead */ - private $contactMock5; + private \PHPUnit\Framework\MockObject\MockObject $contactMock5; /** * @var MockObject|LeadModel */ - private $contactModelMock; + private \PHPUnit\Framework\MockObject\MockObject $contactModelMock; /** * @var MockObject|FrequencyRuleRepository */ - private $frequencyRepoMock; + private \PHPUnit\Framework\MockObject\MockObject $frequencyRepoMock; /** * @var MockObject|FrequencyRule */ - private $frequencyRuleEmailMock; + private \PHPUnit\Framework\MockObject\MockObject $frequencyRuleEmailMock; /** * @var MockObject|FrequencyRule */ - private $frequencyRuleSmsMock; + private \PHPUnit\Framework\MockObject\MockObject $frequencyRuleSmsMock; - /** - * @var FrequencyActionModel - */ - private $actionModel; + private \Mautic\ChannelBundle\Model\FrequencyActionModel $actionModel; protected function setUp(): void { diff --git a/app/bundles/ConfigBundle/Tests/EventListener/ConfigSubscriberTest.php b/app/bundles/ConfigBundle/Tests/EventListener/ConfigSubscriberTest.php index 64e9dfeaf01..b82a83e4bbf 100644 --- a/app/bundles/ConfigBundle/Tests/EventListener/ConfigSubscriberTest.php +++ b/app/bundles/ConfigBundle/Tests/EventListener/ConfigSubscriberTest.php @@ -16,12 +16,9 @@ class ConfigSubscriberTest extends TestCase /** * @var ConfigChangeLogger|MockObject */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; - /** - * @var ConfigSubscriber - */ - private $subscriber; + private \Mautic\ConfigBundle\EventListener\ConfigSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php b/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php index bcbae6c687f..f8615d9ce0d 100644 --- a/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php +++ b/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php @@ -13,10 +13,7 @@ class MaintenanceSubscriberTest extends \PHPUnit\Framework\TestCase { - /** - * @var MaintenanceSubscriber - */ - private $subscriber; + private \Mautic\CoreBundle\EventListener\MaintenanceSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Form/RequestTraitTest.php b/app/bundles/CoreBundle/Tests/Form/RequestTraitTest.php index 6b40efdf7a4..7ea468d9a7f 100644 --- a/app/bundles/CoreBundle/Tests/Form/RequestTraitTest.php +++ b/app/bundles/CoreBundle/Tests/Form/RequestTraitTest.php @@ -15,10 +15,7 @@ class RequestTraitTest extends \PHPUnit\Framework\TestCase { use RequestTrait; - /** - * @var Form - */ - private $form; + private \Symfony\Component\Form\Form $form; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Service/FlashBagTest.php b/app/bundles/CoreBundle/Tests/Service/FlashBagTest.php index 7a3d166cb5e..2cf2675ee38 100644 --- a/app/bundles/CoreBundle/Tests/Service/FlashBagTest.php +++ b/app/bundles/CoreBundle/Tests/Service/FlashBagTest.php @@ -17,32 +17,29 @@ class FlashBagTest extends TestCase /** * @var MockObject|SymfonyFlashBag */ - private $symfonyFlashBag; + private \PHPUnit\Framework\MockObject\MockObject $symfonyFlashBag; /** * @var MockObject|Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|RequestStack */ - private $requestStack; + private \PHPUnit\Framework\MockObject\MockObject $requestStack; /** * @var NotificationModel|MockObject */ - private $notificationModel; + private \PHPUnit\Framework\MockObject\MockObject $notificationModel; - /** - * @var FlashBag - */ - private $flashBag; + private \Mautic\CoreBundle\Service\FlashBag $flashBag; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Command/ModeratedCommandTest.php b/app/bundles/CoreBundle/Tests/Unit/Command/ModeratedCommandTest.php index bd03958839a..6102a34c1ec 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Command/ModeratedCommandTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Command/ModeratedCommandTest.php @@ -20,22 +20,16 @@ class ModeratedCommandTest extends TestCase /** * @var MockObject|InputInterface */ - private $input; + private \PHPUnit\Framework\MockObject\MockObject $input; /** * @var MockObject|PathsHelper */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; - /** - * @var NullOutput - */ - private $output; + private \Symfony\Component\Console\Output\NullOutput $output; - /** - * @var FakeModeratedCommand - */ - private $fakeModeratedCommand; + private \Mautic\CoreBundle\Tests\Unit\Command\src\FakeModeratedCommand $fakeModeratedCommand; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Controller/AbstractFormControllerTest.php b/app/bundles/CoreBundle/Tests/Unit/Controller/AbstractFormControllerTest.php index f6baddee54e..d4b3abb8ac4 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Controller/AbstractFormControllerTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Controller/AbstractFormControllerTest.php @@ -22,12 +22,12 @@ class AbstractFormControllerTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|AbstractFormController */ - private $classFromAbstractFormController; + private \Mautic\CoreBundle\Controller\AbstractFormController $classFromAbstractFormController; /** * @var \PHPUnit\Framework\MockObject\MockObject|Form */ - private $formMock; + private \PHPUnit\Framework\MockObject\MockObject $formMock; private RequestStack $requestStack; diff --git a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/BundleMetadataBuilderTest.php b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/BundleMetadataBuilderTest.php index 41a508f4689..9fc96e468a9 100644 --- a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/BundleMetadataBuilderTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/BundleMetadataBuilderTest.php @@ -9,10 +9,7 @@ class BundleMetadataBuilderTest extends TestCase { - /** - * @var array - */ - private $paths; + private array $paths; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/ConfigMetadataTest.php b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/ConfigMetadataTest.php index 58f74a0a985..fe853e58588 100644 --- a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/ConfigMetadataTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/ConfigMetadataTest.php @@ -12,7 +12,7 @@ class ConfigMetadataTest extends TestCase /** * @var BundleMetadata|MockObject */ - private $metadata; + private \PHPUnit\Framework\MockObject\MockObject $metadata; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/EntityMetadataTest.php b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/EntityMetadataTest.php index 906228a9d5e..6cfcd6e5e34 100644 --- a/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/EntityMetadataTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/DependencyInjection/Builder/Metadata/EntityMetadataTest.php @@ -8,10 +8,7 @@ class EntityMetadataTest extends TestCase { - /** - * @var BundleMetadata - */ - private $metadata; + private \Mautic\CoreBundle\DependencyInjection\Builder\BundleMetadata $metadata; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Doctrine/ArrayTypeTest.php b/app/bundles/CoreBundle/Tests/Unit/Doctrine/ArrayTypeTest.php index 6e85cdbd8e0..a421884a7a4 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Doctrine/ArrayTypeTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Doctrine/ArrayTypeTest.php @@ -2,7 +2,6 @@ namespace Mautic\CoreBundle\Tests\Unit\Doctrine; -use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Types\Type; @@ -31,8 +30,7 @@ class ArrayTypeTest extends \PHPUnit\Framework\TestCase /** @var Type */ private $arrayType; - /** @var AbstractPlatform */ - private $platform; + private \Doctrine\DBAL\Platforms\MySQLPlatform $platform; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Mapping/ClassMetadataBuilderTest.php b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Mapping/ClassMetadataBuilderTest.php index 3c4763d2b70..e5790abe66d 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Mapping/ClassMetadataBuilderTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Mapping/ClassMetadataBuilderTest.php @@ -12,12 +12,9 @@ class ClassMetadataBuilderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|ClassMetadataInfo */ - private $classMetadataInfo; + private \PHPUnit\Framework\MockObject\MockObject $classMetadataInfo; - /** - * @var ClassMetadataBuilder - */ - private $classMetadataBuilder; + private \Mautic\CoreBundle\Doctrine\Mapping\ClassMetadataBuilder $classMetadataBuilder; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/GeneratedColumnsProviderTest.php b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/GeneratedColumnsProviderTest.php index cb6a2db3a52..ddc2a03f985 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/GeneratedColumnsProviderTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/GeneratedColumnsProviderTest.php @@ -18,17 +18,14 @@ final class GeneratedColumnsProviderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|VersionProviderInterface */ - private $versionProvider; + private \PHPUnit\Framework\MockObject\MockObject $versionProvider; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; - /** - * @var GeneratedColumnsProvider - */ - private $provider; + private \Mautic\CoreBundle\Doctrine\Provider\GeneratedColumnsProvider $provider; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/VersionProviderTest.php b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/VersionProviderTest.php index fbf85303f4f..cffe66841b7 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/VersionProviderTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Doctrine/Provider/VersionProviderTest.php @@ -14,17 +14,14 @@ class VersionProviderTest extends \PHPUnit\Framework\TestCase /** * @var Connection|MockObject */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var MockObject&Result */ - private $result; + private \PHPUnit\Framework\MockObject\MockObject $result; - /** - * @var VersionProvider - */ - private $provider; + private \Mautic\CoreBundle\Doctrine\Provider\VersionProvider $provider; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php b/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php index e1b048e267a..d5225732f44 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Entity/CommonRepositoryTest.php @@ -17,17 +17,14 @@ class CommonRepositoryTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&CommonRepository */ - private $repo; + private \PHPUnit\Framework\MockObject\MockObject $repo; - /** - * @var QueryBuilder - */ - private $qb; + private \Doctrine\ORM\QueryBuilder $qb; /** * @var MockObject|Connection */ - private $connectionMock; + private \PHPUnit\Framework\MockObject\MockObject $connectionMock; /** * Sets up objects used in the tests. diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/CommonStatsSubscriberTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/CommonStatsSubscriberTest.php index 525bcd36bf2..c581a640991 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/CommonStatsSubscriberTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/CommonStatsSubscriberTest.php @@ -18,32 +18,32 @@ class CommonStatsSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var CorePermissions|MockObject */ - private $security; + private \PHPUnit\Framework\MockObject\MockObject $security; /** * @var EntityManager|MockObject */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var User|MockObject */ - private $user; + private \PHPUnit\Framework\MockObject\MockObject $user; /** * @var MockObject&CommonRepository */ - private $repository; + private \PHPUnit\Framework\MockObject\MockObject $repository; /** * @var StatsEvent|MockObject */ - private $statsEvent; + private \PHPUnit\Framework\MockObject\MockObject $statsEvent; /** * @var CommonStatsSubscriber|MockObject */ - private $subscirber; + private \PHPUnit\Framework\MockObject\MockObject $subscirber; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/ConsoleErrorListenerTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/ConsoleErrorListenerTest.php index c51d9712c91..fb747b7df21 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/ConsoleErrorListenerTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/ConsoleErrorListenerTest.php @@ -16,17 +16,17 @@ class ConsoleErrorListenerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var MockObject|InputInterface */ - private $input; + private \PHPUnit\Framework\MockObject\MockObject $input; /** * @var MockObject|OutputInterface */ - private $output; + private \PHPUnit\Framework\MockObject\MockObject $output; private ?ConsoleErrorListener $listener; diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/DoctrineGeneratedColumnsListenerTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/DoctrineGeneratedColumnsListenerTest.php index 84ac8978c8d..00d281946dd 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/DoctrineGeneratedColumnsListenerTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/DoctrineGeneratedColumnsListenerTest.php @@ -18,32 +18,29 @@ class DoctrineGeneratedColumnsListenerTest extends \PHPUnit\Framework\TestCase /** * @var GeneratedColumnsProviderInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $generatedColumnsProvider; + private \PHPUnit\Framework\MockObject\MockObject $generatedColumnsProvider; /** * @var \PHPUnit\Framework\MockObject\MockObject|LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var GenerateSchemaEventArgs|\PHPUnit\Framework\MockObject\MockObject */ - private $event; + private \PHPUnit\Framework\MockObject\MockObject $event; /** * @var Schema|\PHPUnit\Framework\MockObject\MockObject */ - private $schema; + private \PHPUnit\Framework\MockObject\MockObject $schema; /** * @var Table|\PHPUnit\Framework\MockObject\MockObject */ - private $table; + private \PHPUnit\Framework\MockObject\MockObject $table; - /** - * @var DoctrineGeneratedColumnsListener - */ - private $listener; + private \Mautic\CoreBundle\EventListener\DoctrineGeneratedColumnsListener $listener; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/EnvironmentSubscriberTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/EnvironmentSubscriberTest.php index b7ae5230fca..e071df56ca7 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/EnvironmentSubscriberTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/EnvironmentSubscriberTest.php @@ -21,7 +21,7 @@ class EnvironmentSubscriberTest extends TestCase /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php index 1bb05472ccd..eb74eec9b90 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/MigrationCommandSubscriberTest.php @@ -22,47 +22,41 @@ class MigrationCommandSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|VersionProviderInterface */ - private $versionProvider; + private \PHPUnit\Framework\MockObject\MockObject $versionProvider; /** * @var MockObject|GeneratedColumnsProviderInterface */ - private $generatedColumnsProvider; + private \PHPUnit\Framework\MockObject\MockObject $generatedColumnsProvider; /** * @var MockObject|Connection */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; - /** - * @var MockObject|ConsoleCommandEvent - */ - private $event; + private \Symfony\Component\Console\Event\ConsoleCommandEvent $event; /** * @var MockObject|Command */ - private $command; + private \PHPUnit\Framework\MockObject\MockObject $command; /** * @var MockObject|MySqlSchemaManager */ - private $schemaManager; + private \PHPUnit\Framework\MockObject\MockObject $schemaManager; /** * @var MockObject|OutputInterface */ - private $output; + private \PHPUnit\Framework\MockObject\MockObject $output; /** * @var GeneratedColumns */ - private $generatedColumns; + private \Mautic\CoreBundle\Doctrine\GeneratedColumn\GeneratedColumns $generatedColumns; - /** - * @var MigrationCommandSubscriber - */ - private $subscriber; + private \Mautic\CoreBundle\EventListener\MigrationCommandSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/EventListener/RequestSubscriberTest.php b/app/bundles/CoreBundle/Tests/Unit/EventListener/RequestSubscriberTest.php index 17878b5d0e2..c67dac4aa54 100644 --- a/app/bundles/CoreBundle/Tests/Unit/EventListener/RequestSubscriberTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/EventListener/RequestSubscriberTest.php @@ -14,20 +14,14 @@ class RequestSubscriberTest extends \PHPUnit\Framework\TestCase { - /** - * @var RequestSubscriber - */ - private $subscriber; + private \Mautic\CoreBundle\EventListener\RequestSubscriber $subscriber; - /** - * @var Request - */ - private $request; + private \Symfony\Component\HttpFoundation\Request $request; /** * @var MockObject&RequestEvent */ - private $event; + private \PHPUnit\Framework\MockObject\MockObject $event; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Factory/ModelFactoryTest.php b/app/bundles/CoreBundle/Tests/Unit/Factory/ModelFactoryTest.php index debec040aca..4a860a03dab 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Factory/ModelFactoryTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Factory/ModelFactoryTest.php @@ -13,12 +13,12 @@ class ModelFactoryTest extends TestCase /** * @var MockObject|ContainerInterface */ - private $container; + private \PHPUnit\Framework\MockObject\MockObject $container; /** * @var ModelFactory */ - private $factory; + private \Mautic\CoreBundle\Factory\ModelFactory $factory; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Factory/TransifexFactoryTest.php b/app/bundles/CoreBundle/Tests/Unit/Factory/TransifexFactoryTest.php index ce1dc9d2adf..de8ba98f889 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Factory/TransifexFactoryTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Factory/TransifexFactoryTest.php @@ -18,12 +18,12 @@ class TransifexFactoryTest extends \PHPUnit\Framework\TestCase /** * @var ClientInterface&MockObject */ - private $client; + private \PHPUnit\Framework\MockObject\MockObject $client; /** * @var CoreParametersHelper&MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; private TransifexFactory $transifexFactory; diff --git a/app/bundles/CoreBundle/Tests/Unit/Form/Type/ConfigTypeTest.php b/app/bundles/CoreBundle/Tests/Unit/Form/Type/ConfigTypeTest.php index 3d85f863d6d..9706a0f2957 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Form/Type/ConfigTypeTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Form/Type/ConfigTypeTest.php @@ -20,7 +20,7 @@ class ConfigTypeTest extends TypeTestCase { - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; private $formType; protected function setUp(): void diff --git a/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicContentTraitTest.php b/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicContentTraitTest.php index 3ba4ca5c919..7073e18cd32 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicContentTraitTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicContentTraitTest.php @@ -17,27 +17,27 @@ final class DynamicContentTraitTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; /** * @var MockObject&FormEvent */ - private $formEvent; + private \PHPUnit\Framework\MockObject\MockObject $formEvent; /** * @var MockObject&FormInterface */ - private $form; + private \PHPUnit\Framework\MockObject\MockObject $form; /** * @var MockObject (use DynamicContentEntityTrait) */ - private $entity; + private \PHPUnit\Framework\MockObject\MockObject $entity; /** * @var MockObject (use DynamicContentTrait) */ - private $trait; + private \PHPUnit\Framework\MockObject\MockObject $trait; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicListTypeTest.php b/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicListTypeTest.php index 2821f649173..d719060ed1a 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicListTypeTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Form/Type/DynamicListTypeTest.php @@ -15,12 +15,9 @@ final class DynamicListTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var DynamicListType - */ - private $form; + private \Mautic\CoreBundle\Form\Type\DynamicListType $form; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Form/Validator/Constraints/CircularDependencyValidatorTest.php b/app/bundles/CoreBundle/Tests/Unit/Form/Validator/Constraints/CircularDependencyValidatorTest.php index 0c0e991e3ff..fcf92167992 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Form/Validator/Constraints/CircularDependencyValidatorTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Form/Validator/Constraints/CircularDependencyValidatorTest.php @@ -15,27 +15,24 @@ class CircularDependencyValidatorTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|ListModel */ - private $mockListModel; + private \PHPUnit\Framework\MockObject\MockObject $mockListModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|ExecutionContext */ - private $context; + private \PHPUnit\Framework\MockObject\MockObject $context; /** * @var \PHPUnit\Framework\MockObject\MockObject|RequestStack */ - private $requestStack; + private \PHPUnit\Framework\MockObject\MockObject $requestStack; /** * @var \PHPUnit\Framework\MockObject\MockObject|Request */ - private $request; + private \PHPUnit\Framework\MockObject\MockObject $request; - /** - * @var CircularDependencyValidator - */ - private $validator; + private \Mautic\CoreBundle\Form\Validator\Constraints\CircularDependencyValidator $validator; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/ChartQueryTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/ChartQueryTest.php index 129b074261b..70fc2107d1d 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/ChartQueryTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/ChartQueryTest.php @@ -15,37 +15,25 @@ class ChartQueryTest extends \PHPUnit\Framework\TestCase { - /** - * @var \DateTime - */ - private $dateFrom; + private \DateTime $dateFrom; private DateTimeHelper $dateTimeHelper; - /** - * @var \DateTime - */ - private $dateTo; + private \DateTime $dateTo; /** * @var MockObject|Connection */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; - /** - * @var string - */ - private $dateColumn; + private string $dateColumn; - /** - * @var string - */ - private $unit; + private string $unit; /** * @var ChartQuery diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/DateRangeUnitTraitTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/DateRangeUnitTraitTest.php index e230ae9dbfd..fbec1c397c8 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/DateRangeUnitTraitTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/Chart/DateRangeUnitTraitTest.php @@ -3,14 +3,15 @@ namespace Mautic\CoreBundle\Tests\Unit\Helper\Chart; use Mautic\CoreBundle\Helper\Chart\DateRangeUnitTrait; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; class DateRangeUnitTraitTest extends TestCase { /** - * @var DateRangeUnitTrait + * @var MockObject|DateRangeUnitTrait */ - private $trait; + private \PHPUnit\Framework\MockObject\MockObject $trait; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/CookieHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/CookieHelperTest.php index 0528a59ec26..fbb0dff5070 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/CookieHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/CookieHelperTest.php @@ -19,7 +19,7 @@ class CookieHelperTest extends TestCase /** * @var RequestStack|MockObject */ - private $requestStackMock; + private \PHPUnit\Framework\MockObject\MockObject $requestStackMock; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/CoreParametersHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/CoreParametersHelperTest.php index bb7e8c93d63..8dbb197df53 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/CoreParametersHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/CoreParametersHelperTest.php @@ -15,7 +15,7 @@ class CoreParametersHelperTest extends TestCase /** * @var MockObject|ContainerInterface */ - private $container; + private \PHPUnit\Framework\MockObject\MockObject $container; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/EncryptionHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/EncryptionHelperTest.php index 4d9681b4dfd..268088202d5 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/EncryptionHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/EncryptionHelperTest.php @@ -16,17 +16,17 @@ class EncryptionHelperTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; /** * @var MockObject|OpenSSLCipher */ - private $mainCipherMock; + private \PHPUnit\Framework\MockObject\MockObject $mainCipherMock; /** * @var MockObject|SymmetricCipherInterface */ - private $secondaryCipherMock; + private \PHPUnit\Framework\MockObject\MockObject $secondaryCipherMock; /** * @var string diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/ExportHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/ExportHelperTest.php index c42d32f9a5a..547d60a2786 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/ExportHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/ExportHelperTest.php @@ -20,9 +20,9 @@ class ExportHelperTest extends TestCase { /** @var MockObject|TranslatorInterface */ - private $translatorInterfaceMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorInterfaceMock; /** @var MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; private ExportHelper $exportHelper; /** @var array> */ private array $dummyData = [ @@ -42,7 +42,7 @@ class ExportHelperTest extends TestCase /** @var array */ private array $filePaths = []; /** @var FilePathResolver|MockObject */ - private $filePathResolver; + private \PHPUnit\Framework\MockObject\MockObject $filePathResolver; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/FilePathResolverTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/FilePathResolverTest.php index de5e275c9ed..f8a72c0736f 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/FilePathResolverTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/FilePathResolverTest.php @@ -17,22 +17,16 @@ class FilePathResolverTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Filesystem */ - private $filesystemMock; + private \PHPUnit\Framework\MockObject\MockObject $filesystemMock; /** * @var MockObject|UploadedFile */ - private $fileMock; + private \PHPUnit\Framework\MockObject\MockObject $fileMock; - /** - * @var InputHelper - */ - private $inputHelper; + private \Mautic\CoreBundle\Helper\InputHelper $inputHelper; - /** - * @var FilePathResolver - */ - private $filePathResolver; + private \Mautic\CoreBundle\Helper\FilePathResolver $filePathResolver; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/LanguageHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/LanguageHelperTest.php index 6856ad7a8da..3b5c11b24eb 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/LanguageHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/LanguageHelperTest.php @@ -18,27 +18,27 @@ class LanguageHelperTest extends TestCase /** * @var PathsHelper&MockObject */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** * @var Logger&MockObject */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var CoreParametersHelper&MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var Client&MockObject */ - private $client; + private \PHPUnit\Framework\MockObject\MockObject $client; /** * @var TranslatorInterface&MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; private string $translationsPath; private string $tmpPath; diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/MaxMindDoNotSellDownloadHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/MaxMindDoNotSellDownloadHelperTest.php index de9aed032a5..44951d08238 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/MaxMindDoNotSellDownloadHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/MaxMindDoNotSellDownloadHelperTest.php @@ -19,17 +19,17 @@ final class MaxMindDoNotSellDownloadHelperTest extends \PHPUnit\Framework\TestCa /** * @var \PHPUnit\Framework\MockObject\MockObject|LoggerInterface */ - private $loggerMock; + private \PHPUnit\Framework\MockObject\MockObject $loggerMock; /** * @var \PHPUnit\Framework\MockObject\MockObject|HttpClientInterface */ - private $httpClientMock; + private \PHPUnit\Framework\MockObject\MockObject $httpClientMock; /** * @var \PHPUnit\Framework\MockObject\MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/PageHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/PageHelperTest.php index 074aab57b86..d2b779cea75 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/PageHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/PageHelperTest.php @@ -10,9 +10,9 @@ class PageHelperTest extends \PHPUnit\Framework\TestCase { - private $session; - private $coreParametersHelper; - private $pageHelper; + private \PHPUnit\Framework\MockObject\MockObject $session; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; + private \Mautic\CoreBundle\Helper\PageHelper $pageHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/PathsHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/PathsHelperTest.php index f13436d4da4..b7cc16d0ef9 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/PathsHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/PathsHelperTest.php @@ -17,17 +17,14 @@ class PathsHelperTest extends TestCase /** * @var MockObject|UserHelper */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; - /** - * @var PathsHelper - */ - private $helper; + private \Mautic\CoreBundle\Helper\PathsHelper $helper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/ThemeHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/ThemeHelperTest.php index badba86336a..9bc2d3a4a81 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/ThemeHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/ThemeHelperTest.php @@ -9,7 +9,6 @@ use Mautic\CoreBundle\Helper\Filesystem; use Mautic\CoreBundle\Helper\PathsHelper; use Mautic\CoreBundle\Helper\ThemeHelper; -use Mautic\CoreBundle\Helper\ThemeHelperInterface; use Mautic\IntegrationsBundle\Exception\IntegrationNotFoundException; use Mautic\IntegrationsBundle\Helper\BuilderIntegrationsHelper; use Mautic\IntegrationsBundle\Integration\Interfaces\BuilderInterface; @@ -28,37 +27,34 @@ class ThemeHelperTest extends TestCase /** * @var PathsHelper|MockObject */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** * @var Environment|MockObject */ - private $twig; + private \PHPUnit\Framework\MockObject\MockObject $twig; /** * @var FilesystemLoader|MockObject */ - private $loader; + private \PHPUnit\Framework\MockObject\MockObject $loader; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var CoreParametersHelper|MockObject */ - private $coreParameterHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParameterHelper; /** * @var BuilderIntegrationsHelper|MockObject */ - private $builderIntegrationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $builderIntegrationsHelper; - /** - * @var ThemeHelperInterface - */ - private $themeHelper; + private \Mautic\CoreBundle\Helper\ThemeHelper $themeHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/TrailingSlashHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/TrailingSlashHelperTest.php index 05a323f4c37..c77c75b331a 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/TrailingSlashHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/TrailingSlashHelperTest.php @@ -11,7 +11,7 @@ class TrailingSlashHelperTest extends \PHPUnit\Framework\TestCase /** * @var CoreParametersHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/Update/Github/ReleaseParserTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/Update/Github/ReleaseParserTest.php index f75a68b8da3..a66e2e5f2de 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/Update/Github/ReleaseParserTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/Update/Github/ReleaseParserTest.php @@ -12,10 +12,7 @@ class ReleaseParserTest extends TestCase { - /** - * @var ReleaseParser - */ - private $releaseParser; + private \Mautic\CoreBundle\Helper\Update\Github\ReleaseParser $releaseParser; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/UpdateHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/UpdateHelperTest.php index b6291ad4ca7..789033ba18b 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Helper/UpdateHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Helper/UpdateHelperTest.php @@ -26,47 +26,44 @@ class UpdateHelperTest extends TestCase /** * @var PathsHelper|MockObject */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** * @var Logger|MockObject */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var Client|MockObject */ - private $client; + private \PHPUnit\Framework\MockObject\MockObject $client; /** * @var ResponseInterface|MockObject */ - private $response; + private \PHPUnit\Framework\MockObject\MockObject $response; /** * @var StreamInterface|MockObject */ - private $streamBody; + private \PHPUnit\Framework\MockObject\MockObject $streamBody; /** * @var ReleaseParser|MockObject */ - private $releaseParser; + private \PHPUnit\Framework\MockObject\MockObject $releaseParser; /** * @var PreUpdateCheckHelper|MockObject */ - private $preUpdateCheckHelper; + private \PHPUnit\Framework\MockObject\MockObject $preUpdateCheckHelper; - /** - * @var UpdateHelper - */ - private $helper; + private \Mautic\CoreBundle\Helper\UpdateHelper $helper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxMindDoNotSellListTest.php b/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxMindDoNotSellListTest.php index 8f7d4e4a00e..edaf73ef33d 100644 --- a/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxMindDoNotSellListTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxMindDoNotSellListTest.php @@ -12,7 +12,7 @@ class MaxMindDoNotSellListTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|CoreParametersHelper */ - private $coreParamsHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParamsHelperMock; private $badFilePath = 'bad_list.json'; private $badData = 'bad data'; diff --git a/app/bundles/CoreBundle/Tests/Unit/Model/IteratorExportDataModelTest.php b/app/bundles/CoreBundle/Tests/Unit/Model/IteratorExportDataModelTest.php index da5310cab2d..497b291aaf9 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Model/IteratorExportDataModelTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Model/IteratorExportDataModelTest.php @@ -12,17 +12,14 @@ class IteratorExportDataModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|AbstractCommonModel */ - private $commonModel; + private \PHPUnit\Framework\MockObject\MockObject $commonModel; /** * @var MockObject|CommonRepository */ - private $commonRepository; + private \PHPUnit\Framework\MockObject\MockObject $commonRepository; - /** - * @var IteratorExportDataModel - */ - private $iteratorExportDataModel; + private \Mautic\CoreBundle\Model\IteratorExportDataModel $iteratorExportDataModel; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Monolog/Handler/FileLogHandlerTest.php b/app/bundles/CoreBundle/Tests/Unit/Monolog/Handler/FileLogHandlerTest.php index cafbe641d05..cae4b60b597 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Monolog/Handler/FileLogHandlerTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Monolog/Handler/FileLogHandlerTest.php @@ -14,12 +14,12 @@ class FileLogHandlerTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var FormatterInterface|MockObject */ - private $formatter; + private \PHPUnit\Framework\MockObject\MockObject $formatter; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Security/Permissions/CorePermissionsTest.php b/app/bundles/CoreBundle/Tests/Unit/Security/Permissions/CorePermissionsTest.php index d7d6ad3e5d6..94459c493aa 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Security/Permissions/CorePermissionsTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Security/Permissions/CorePermissionsTest.php @@ -19,22 +19,19 @@ class CorePermissionsTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|UserHelper */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; - /** - * @var CorePermissions - */ - private $corePermissions; + private \Mautic\CoreBundle\Security\Permissions\CorePermissions $corePermissions; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Service/BulkNotificationTest.php b/app/bundles/CoreBundle/Tests/Unit/Service/BulkNotificationTest.php index e2ffa106055..bc44b325df7 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Service/BulkNotificationTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Service/BulkNotificationTest.php @@ -12,15 +12,9 @@ class BulkNotificationTest extends TestCase { - /** - * @var BulkNotification - */ - private $bulkNotification; + private \Mautic\CoreBundle\Service\BulkNotification $bulkNotification; - /** - * @var NotificationModel - */ - private $notificationModelFake; + private \Mautic\CoreBundle\Model\NotificationModel $notificationModelFake; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Shortener/ShortenerTest.php b/app/bundles/CoreBundle/Tests/Unit/Shortener/ShortenerTest.php index 6dfac40550c..dc90a35337e 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Shortener/ShortenerTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Shortener/ShortenerTest.php @@ -15,12 +15,9 @@ class ShortenerTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; - /** - * @var Shortener - */ - private $shortener; + private \Mautic\CoreBundle\Shortener\Shortener $shortener; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/AssetsHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/AssetsHelperTest.php index 82ecce639c6..aad69e9536f 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/AssetsHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/AssetsHelperTest.php @@ -17,12 +17,12 @@ class AssetsHelperTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var PathsHelper|MockObject */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; private AssetsHelper $assetHelper; diff --git a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/DateHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/DateHelperTest.php index cf766fe2310..41205b69323 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/DateHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/DateHelperTest.php @@ -11,12 +11,9 @@ class DateHelperTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DateHelper - */ - private $helper; + private \Mautic\CoreBundle\Twig\Helper\DateHelper $helper; /** * @var string @@ -26,7 +23,7 @@ class DateHelperTest extends \PHPUnit\Framework\TestCase /** * @var CoreParametersHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; public static function setUpBeforeClass(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/FormatterHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/FormatterHelperTest.php index 2665e2ac181..f639ec99a10 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/FormatterHelperTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Twig/Helper/FormatterHelperTest.php @@ -14,22 +14,16 @@ class FormatterHelperTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DateHelper - */ - private $dateHelper; + private \Mautic\CoreBundle\Twig\Helper\DateHelper $dateHelper; - /** - * @var FormatterHelper - */ - private $formatterHelper; + private \Mautic\CoreBundle\Twig\Helper\FormatterHelper $formatterHelper; /** * @var CoreParametersHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/DeleteCacheStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/DeleteCacheStepTest.php index 26565c4a32a..bbbebf814ab 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/DeleteCacheStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/DeleteCacheStepTest.php @@ -12,17 +12,14 @@ class DeleteCacheStepTest extends AbstractStepTest /** * @var MockObject|CacheHelper */ - private $cacheHelper; + private \PHPUnit\Framework\MockObject\MockObject $cacheHelper; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DeleteCacheStep - */ - private $step; + private \Mautic\CoreBundle\Update\Step\DeleteCacheStep $step; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/FinalizeUpdateStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/FinalizeUpdateStepTest.php index 4ced59e6c06..544ed92607e 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/FinalizeUpdateStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/FinalizeUpdateStepTest.php @@ -14,27 +14,24 @@ class FinalizeUpdateStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|PathsHelper */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** * @var MockObject|Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; /** * @var MockObject|AppVersion */ - private $appVersion; + private \PHPUnit\Framework\MockObject\MockObject $appVersion; - /** - * @var FinalizeUpdateStep - */ - private $step; + private \Mautic\CoreBundle\Update\Step\FinalizeUpdateStep $step; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/InstallNewFilesStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/InstallNewFilesStepTest.php index db2274b7b25..9c1c6fe3572 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/InstallNewFilesStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/InstallNewFilesStepTest.php @@ -15,22 +15,19 @@ class InstallNewFilesStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|UpdateHelper */ - private $updateHelper; + private \PHPUnit\Framework\MockObject\MockObject $updateHelper; /** * @var MockObject|PathsHelper */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; - /** - * @var InstallNewFilesStep - */ - private $step; + private \Mautic\CoreBundle\Update\Step\InstallNewFilesStep $step; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/PreUpdateChecksStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/PreUpdateChecksStepTest.php index acaee59fbc6..26560d4ba3f 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/PreUpdateChecksStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/PreUpdateChecksStepTest.php @@ -17,12 +17,12 @@ class PreUpdateChecksStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|UpdateHelper */ - private $updateHelper; + private \PHPUnit\Framework\MockObject\MockObject $updateHelper; private PreUpdateChecksStep $step; protected function setUp(): void diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/RemoveDeletedFilesStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/RemoveDeletedFilesStepTest.php index cf8641298bc..303ba5fcc99 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/RemoveDeletedFilesStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/RemoveDeletedFilesStepTest.php @@ -13,17 +13,17 @@ class RemoveDeletedFilesStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var MockObject|PathsHelper */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateSchemaStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateSchemaStepTest.php index c7fe2753d55..f02a1279a9c 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateSchemaStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateSchemaStepTest.php @@ -20,27 +20,24 @@ class UpdateSchemaStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|KernelInterface */ - private $kernel; + private \PHPUnit\Framework\MockObject\MockObject $kernel; /** * @var MockObject|MigrateCommand */ - private $migrateCommand; + private \PHPUnit\Framework\MockObject\MockObject $migrateCommand; /** * @var MockObject|EventDispatcherInterface */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; - /** - * @var UpdateSchemaStep - */ - private $step; + private \Mautic\CoreBundle\Update\Step\UpdateSchemaStep $step; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateTranslationsStepTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateTranslationsStepTest.php index dfba218fd03..cd5bf4eaa08 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateTranslationsStepTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/Step/UpdateTranslationsStepTest.php @@ -13,22 +13,19 @@ class UpdateTranslationsStepTest extends AbstractStepTest /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|LanguageHelper */ - private $languageHelper; + private \PHPUnit\Framework\MockObject\MockObject $languageHelper; /** * @var MockObject|LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; - /** - * @var UpdateTranslationsStep - */ - private $step; + private \Mautic\CoreBundle\Update\Step\UpdateTranslationsStep $step; protected function setUp(): void { diff --git a/app/bundles/CoreBundle/Tests/Unit/Update/StepProviderTest.php b/app/bundles/CoreBundle/Tests/Unit/Update/StepProviderTest.php index 0248e59f227..ad3bbb175b6 100644 --- a/app/bundles/CoreBundle/Tests/Unit/Update/StepProviderTest.php +++ b/app/bundles/CoreBundle/Tests/Unit/Update/StepProviderTest.php @@ -9,10 +9,7 @@ class StepProviderTest extends TestCase { - /** - * @var StepProvider - */ - private $provider; + private \Mautic\CoreBundle\Update\StepProvider $provider; protected function setUp(): void { diff --git a/app/bundles/DashboardBundle/Tests/Controller/DashboardControllerTest.php b/app/bundles/DashboardBundle/Tests/Controller/DashboardControllerTest.php index 573c01826ac..daa81d7ee84 100644 --- a/app/bundles/DashboardBundle/Tests/Controller/DashboardControllerTest.php +++ b/app/bundles/DashboardBundle/Tests/Controller/DashboardControllerTest.php @@ -32,52 +32,49 @@ class DashboardControllerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Request */ - private $requestMock; + private \PHPUnit\Framework\MockObject\MockObject $requestMock; /** * @var MockObject|CorePermissions */ - private $securityMock; + private \PHPUnit\Framework\MockObject\MockObject $securityMock; /** * @var MockObject|Translator */ - private $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; /** * @var MockObject|ModelFactory */ - private $modelFactoryMock; + private \PHPUnit\Framework\MockObject\MockObject $modelFactoryMock; /** * @var MockObject|DashboardModel */ - private $dashboardModelMock; + private \PHPUnit\Framework\MockObject\MockObject $dashboardModelMock; /** * @var MockObject|RouterInterface */ - private $routerMock; + private \PHPUnit\Framework\MockObject\MockObject $routerMock; /** * @var MockObject|Session */ - private $sessionMock; + private \PHPUnit\Framework\MockObject\MockObject $sessionMock; /** * @var MockObject|FlashBag */ - private $flashBagMock; + private \PHPUnit\Framework\MockObject\MockObject $flashBagMock; /** * @var MockObject|Container */ - private $containerMock; + private \PHPUnit\Framework\MockObject\MockObject $containerMock; - /** - * @var DashboardController - */ - private $controller; + private \Mautic\DashboardBundle\Controller\DashboardController $controller; protected function setUp(): void { diff --git a/app/bundles/DashboardBundle/Tests/Dashboard/WidgetTest.php b/app/bundles/DashboardBundle/Tests/Dashboard/WidgetTest.php index c0ec0ae593a..a142836025f 100644 --- a/app/bundles/DashboardBundle/Tests/Dashboard/WidgetTest.php +++ b/app/bundles/DashboardBundle/Tests/Dashboard/WidgetTest.php @@ -23,27 +23,24 @@ class WidgetTest extends TestCase /** * @var DashboardModel|MockObject */ - private $dashboardModel; + private \PHPUnit\Framework\MockObject\MockObject $dashboardModel; /** * @var UserHelper|MockObject */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var MockObject|Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; /** * @var User|MockObject */ - private $user; + private \PHPUnit\Framework\MockObject\MockObject $user; - /** - * @var Widget - */ - private $widget; + private \Mautic\DashboardBundle\Dashboard\Widget $widget; protected function setUp(): void { diff --git a/app/bundles/DashboardBundle/Tests/Model/DashboardModelTest.php b/app/bundles/DashboardBundle/Tests/Model/DashboardModelTest.php index 685c26761e7..d895c4c5a4a 100644 --- a/app/bundles/DashboardBundle/Tests/Model/DashboardModelTest.php +++ b/app/bundles/DashboardBundle/Tests/Model/DashboardModelTest.php @@ -26,27 +26,24 @@ class DashboardModelTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var PathsHelper|MockObject */ - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** * @var MockObject|Filesystem */ - private $filesystem; + private \PHPUnit\Framework\MockObject\MockObject $filesystem; /** * @var MockObject|Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; - /** - * @var DashboardModel - */ - private $model; + private \Mautic\DashboardBundle\Model\DashboardModel $model; protected function setUp(): void { diff --git a/app/bundles/DynamicContentBundle/Tests/EventListener/DynamicContentSubscriberTest.php b/app/bundles/DynamicContentBundle/Tests/EventListener/DynamicContentSubscriberTest.php index fd723444343..9dc7602a7c0 100644 --- a/app/bundles/DynamicContentBundle/Tests/EventListener/DynamicContentSubscriberTest.php +++ b/app/bundles/DynamicContentBundle/Tests/EventListener/DynamicContentSubscriberTest.php @@ -23,62 +23,59 @@ class DynamicContentSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|TrackableModel */ - private $trackableModel; + private \PHPUnit\Framework\MockObject\MockObject $trackableModel; /** * @var MockObject|PageTokenHelper */ - private $pageTokenHelper; + private \PHPUnit\Framework\MockObject\MockObject $pageTokenHelper; /** * @var MockObject|AssetTokenHelper */ - private $assetTokenHelper; + private \PHPUnit\Framework\MockObject\MockObject $assetTokenHelper; /** * @var MockObject|FormTokenHelper */ - private $formTokenHelper; + private \PHPUnit\Framework\MockObject\MockObject $formTokenHelper; /** * @var MockObject|FocusTokenHelper */ - private $focusTokenHelper; + private \PHPUnit\Framework\MockObject\MockObject $focusTokenHelper; /** * @var MockObject|AuditLogModel */ - private $auditLogModel; + private \PHPUnit\Framework\MockObject\MockObject $auditLogModel; /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject|DynamicContentHelper */ - private $dynamicContentHelper; + private \PHPUnit\Framework\MockObject\MockObject $dynamicContentHelper; /** * @var MockObject|DynamicContentModel */ - private $dynamicContentModel; + private \PHPUnit\Framework\MockObject\MockObject $dynamicContentModel; /** * @var MockObject|CorePermissions */ - private $security; + private \PHPUnit\Framework\MockObject\MockObject $security; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; - /** - * @var DynamicContentSubscriber - */ - private $subscriber; + private \Mautic\DynamicContentBundle\EventListener\DynamicContentSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php b/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php index 5258a7ba7f5..806b72a6504 100644 --- a/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php +++ b/app/bundles/DynamicContentBundle/Tests/Helper/DynamicContentHelperTest.php @@ -22,27 +22,24 @@ class DynamicContentHelperTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&DynamicContentModel */ - private $mockModel; + private \PHPUnit\Framework\MockObject\MockObject $mockModel; /** * @var MockObject&RealTimeExecutioner */ - private $realTimeExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $realTimeExecutioner; /** * @var MockObject&EventDispatcher */ - private $mockDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $mockDispatcher; /** * @var MockObject&LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; - /** - * @var DynamicContentHelper - */ - private $helper; + private \Mautic\DynamicContentBundle\Helper\DynamicContentHelper $helper; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/Controller/AjaxControllerTest.php b/app/bundles/EmailBundle/Tests/Controller/AjaxControllerTest.php index d454966d401..5c7e27cacb7 100644 --- a/app/bundles/EmailBundle/Tests/Controller/AjaxControllerTest.php +++ b/app/bundles/EmailBundle/Tests/Controller/AjaxControllerTest.php @@ -28,37 +28,34 @@ class AjaxControllerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Session */ - private $sessionMock; + private \PHPUnit\Framework\MockObject\MockObject $sessionMock; /** * @var MockObject|ModelFactory */ - private $modelFactoryMock; + private \PHPUnit\Framework\MockObject\MockObject $modelFactoryMock; /** * @var MockObject|Container */ - private $containerMock; + private \PHPUnit\Framework\MockObject\MockObject $containerMock; /** * @var MockObject|EmailModel */ - private $modelMock; + private \PHPUnit\Framework\MockObject\MockObject $modelMock; /** * @var MockObject|Email */ - private $emailMock; + private \PHPUnit\Framework\MockObject\MockObject $emailMock; - /** - * @var AjaxController - */ - private $controller; + private \Mautic\EmailBundle\Controller\AjaxController $controller; /** * @var MockObject&ManagerRegistry */ - private $managerRegistry; + private \PHPUnit\Framework\MockObject\MockObject $managerRegistry; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/Controller/EmailControllerTest.php b/app/bundles/EmailBundle/Tests/Controller/EmailControllerTest.php index 8b45e8481aa..6a877da39ea 100644 --- a/app/bundles/EmailBundle/Tests/Controller/EmailControllerTest.php +++ b/app/bundles/EmailBundle/Tests/Controller/EmailControllerTest.php @@ -33,67 +33,64 @@ class EmailControllerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Translator */ - private $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; /** * @var MockObject|Session */ - private $sessionMock; + private \PHPUnit\Framework\MockObject\MockObject $sessionMock; /** * @var MockObject|ModelFactory */ - private $modelFactoryMock; + private \PHPUnit\Framework\MockObject\MockObject $modelFactoryMock; /** * @var MockObject|Container */ - private $containerMock; + private \PHPUnit\Framework\MockObject\MockObject $containerMock; /** * @var MockObject|Router */ - private $routerMock; + private \PHPUnit\Framework\MockObject\MockObject $routerMock; /** * @var MockObject|EmailModel */ - private $modelMock; + private \PHPUnit\Framework\MockObject\MockObject $modelMock; /** * @var MockObject|Email */ - private $emailMock; + private \PHPUnit\Framework\MockObject\MockObject $emailMock; /** * @var MockObject|FlashBag */ - private $flashBagMock; + private \PHPUnit\Framework\MockObject\MockObject $flashBagMock; - /** - * @var EmailController - */ - private $controller; + private \Mautic\EmailBundle\Controller\EmailController $controller; /** * @var MockObject|CorePermissions */ - private $corePermissionsMock; + private \PHPUnit\Framework\MockObject\MockObject $corePermissionsMock; /** * @var MockObject|FormFactory */ - private $formFactoryMock; + private \PHPUnit\Framework\MockObject\MockObject $formFactoryMock; /** * @var MockObject|Form */ - private $formMock; + private \PHPUnit\Framework\MockObject\MockObject $formMock; /** * @var MockObject|Environment */ - private $twigMock; + private \PHPUnit\Framework\MockObject\MockObject $twigMock; private RequestStack $requestStack; diff --git a/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountSentTest.php b/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountSentTest.php index d706ec7d76a..e95967f1f64 100644 --- a/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountSentTest.php +++ b/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountSentTest.php @@ -18,7 +18,7 @@ class EmailRepositoryUpCountSentTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|QueryBuilder */ - private $queryBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilderMock; private QueryBuilder $queryBuilder; diff --git a/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountTest.php b/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountTest.php index 1d523cee010..a99e3651d4d 100644 --- a/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountTest.php +++ b/app/bundles/EmailBundle/Tests/Entity/EmailRepositoryUpCountTest.php @@ -18,7 +18,7 @@ class EmailRepositoryUpCountTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|QueryBuilder */ - private $queryBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilderMock; private EmailRepository $repo; diff --git a/app/bundles/EmailBundle/Tests/Event/EmailSendEventTest.php b/app/bundles/EmailBundle/Tests/Event/EmailSendEventTest.php index 2fc4e23cd47..5c16c772098 100644 --- a/app/bundles/EmailBundle/Tests/Event/EmailSendEventTest.php +++ b/app/bundles/EmailBundle/Tests/Event/EmailSendEventTest.php @@ -6,10 +6,7 @@ class EmailSendEventTest extends \PHPUnit\Framework\TestCase { - /** - * @var EmailSendEvent - */ - private $emailSendEvent; + private \Mautic\EmailBundle\Event\EmailSendEvent $emailSendEvent; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/CampaignSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/CampaignSubscriberTest.php index 75cb8861186..08392d9f66b 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/CampaignSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/CampaignSubscriberTest.php @@ -33,27 +33,24 @@ class CampaignSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var EmailModel|\PHPUnit\Framework\MockObject\MockObject */ - private $emailModel; + private \PHPUnit\Framework\MockObject\MockObject $emailModel; /** * @var RealTimeExecutioner|\PHPUnit_Framework_MockObject_MockObject */ - private $realTimeExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $realTimeExecutioner; /** * @var SendEmailToUser|\PHPUnit\Framework\MockObject\MockObject */ - private $sendEmailToUser; + private \PHPUnit\Framework\MockObject\MockObject $sendEmailToUser; /** * @var TranslatorInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var CampaignSubscriber - */ - private $subscriber; + private \Mautic\EmailBundle\EventListener\CampaignSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php index 8d09e214883..fcd6e0df267 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php @@ -20,17 +20,14 @@ class DetermineWinnerSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EntityManagerInterface */ - private $em; + private \PHPUnit\Framework\MockObject\MockObject $em; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DetermineWinnerSubscriber - */ - private $subscriber; + private \Mautic\EmailBundle\EventListener\DetermineWinnerSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/EmailSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/EmailSubscriberTest.php index 128c041c2e7..8398d19e412 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/EmailSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/EmailSubscriberTest.php @@ -20,37 +20,34 @@ final class EmailSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var MockObject|AuditLogModel */ - private $auditLogModel; + private \PHPUnit\Framework\MockObject\MockObject $auditLogModel; /** * @var MockObject|EmailModel */ - private $emailModel; + private \PHPUnit\Framework\MockObject\MockObject $emailModel; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|EntityManager */ - private $em; + private \PHPUnit\Framework\MockObject\MockObject $em; /** * @var MockObject|MauticMessage */ - private $mockMessage; + private \PHPUnit\Framework\MockObject\MockObject $mockMessage; - /** - * @var EmailSubscriber - */ - private $subscriber; + private \Mautic\EmailBundle\EventListener\EmailSubscriber $subscriber; protected function setup(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/MatchFilterForLeadTraitTest.php b/app/bundles/EmailBundle/Tests/EventListener/MatchFilterForLeadTraitTest.php index e64aec062d8..2d21c8d4179 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/MatchFilterForLeadTraitTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/MatchFilterForLeadTraitTest.php @@ -30,7 +30,7 @@ class MatchFilterForLeadTraitTest extends TestCase /** * @var MatchFilterForLeadTraitTestable */ - private $matchFilterForLeadTrait; + private \Mautic\EmailBundle\Tests\EventListener\MatchFilterForLeadTraitTestable $matchFilterForLeadTrait; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/ReportSubscriberTest.php index d30555d8b39..3bb3077f23c 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/ReportSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/ReportSubscriberTest.php @@ -30,44 +30,41 @@ class ReportSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Connection */ - private $connectionMock; + private \PHPUnit\Framework\MockObject\MockObject $connectionMock; /** * @var MockObject|CompanyReportData */ - private $companyReportDataMock; + private \PHPUnit\Framework\MockObject\MockObject $companyReportDataMock; /** * @var MockObject|StatRepository */ - private $statRepository; + private \PHPUnit\Framework\MockObject\MockObject $statRepository; /** * @var MockObject&GeneratedColumnsProviderInterface */ - private $generatedColumnsProvider; + private \PHPUnit\Framework\MockObject\MockObject $generatedColumnsProvider; /** * @var MockObject|Report */ - private $report; + private \PHPUnit\Framework\MockObject\MockObject $report; - /** - * @var ChannelListHelper - */ - private $channelListHelper; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \Doctrine\DBAL\Query\QueryBuilder $queryBuilder; private ReportSubscriber $subscriber; /** * @var MockObject|FieldsBuilder */ - private $fieldsBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $fieldsBuilderMock; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/TrackingSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/TrackingSubscriberTest.php index ad7f3d7d0cd..e933c18cc12 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/TrackingSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/TrackingSubscriberTest.php @@ -14,7 +14,7 @@ class TrackingSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|StatRepository */ - private $statRepository; + private \PHPUnit\Framework\MockObject\MockObject $statRepository; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/EventListener/WebhookSubscriberTest.php b/app/bundles/EmailBundle/Tests/EventListener/WebhookSubscriberTest.php index bd8798a5eb9..bd69b8e547a 100644 --- a/app/bundles/EmailBundle/Tests/EventListener/WebhookSubscriberTest.php +++ b/app/bundles/EmailBundle/Tests/EventListener/WebhookSubscriberTest.php @@ -18,12 +18,9 @@ class WebhookSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|WebhookModel */ - private $webhookModel; + private \PHPUnit\Framework\MockObject\MockObject $webhookModel; - /** - * @var WebhookSubscriber - */ - private $subscriber; + private \Mautic\EmailBundle\EventListener\WebhookSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/Form/Type/EmailTypeTest.php b/app/bundles/EmailBundle/Tests/Form/Type/EmailTypeTest.php index 9df48fd4cf2..c498384b1f0 100644 --- a/app/bundles/EmailBundle/Tests/Form/Type/EmailTypeTest.php +++ b/app/bundles/EmailBundle/Tests/Form/Type/EmailTypeTest.php @@ -20,37 +20,34 @@ class EmailTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject|StageModel */ - private $stageModel; + private \PHPUnit\Framework\MockObject\MockObject $stageModel; /** * @var MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var EmailType - */ - private $form; + private \Mautic\EmailBundle\Form\Type\EmailType $form; /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var ThemeHelperInterface|MockObject */ - private $themeHelper; + private \PHPUnit\Framework\MockObject\MockObject $themeHelper; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/Form/Type/FormSubmitActionUserEmailTypeTest.php b/app/bundles/EmailBundle/Tests/Form/Type/FormSubmitActionUserEmailTypeTest.php index d33154d4762..bcbfb402849 100644 --- a/app/bundles/EmailBundle/Tests/Form/Type/FormSubmitActionUserEmailTypeTest.php +++ b/app/bundles/EmailBundle/Tests/Form/Type/FormSubmitActionUserEmailTypeTest.php @@ -5,9 +5,7 @@ namespace Mautic\EmailBundle\Tests\Form\Type; use Doctrine\ORM\EntityManager; -use Mautic\CoreBundle\Helper\CoreParametersHelper; use Mautic\EmailBundle\Form\Type\EmailSendType; -use Mautic\EmailBundle\Form\Type\EmailType; use Mautic\EmailBundle\Form\Type\FormSubmitActionUserEmailType; use Mautic\StageBundle\Model\StageModel; use Mautic\UserBundle\Form\Type\UserListType; @@ -36,24 +34,15 @@ class FormSubmitActionUserEmailTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var EmailType - */ - private $form; - - /** - * @var CoreParametersHelper|MockObject - */ - private $coreParametersHelper; + private \Mautic\EmailBundle\Form\Type\FormSubmitActionUserEmailType $form; protected function setUp(): void { parent::setUp(); $this->formBuilder = $this->createMock(FormBuilderInterface::class); - $this->coreParametersHelper = $this->createMock(CoreParametersHelper::class); $this->form = new FormSubmitActionUserEmailType(); $this->formBuilder->method('create')->willReturnSelf(); } diff --git a/app/bundles/EmailBundle/Tests/Helper/EmailValidatorTest.php b/app/bundles/EmailBundle/Tests/Helper/EmailValidatorTest.php index 19e76412983..12dc46a1a82 100644 --- a/app/bundles/EmailBundle/Tests/Helper/EmailValidatorTest.php +++ b/app/bundles/EmailBundle/Tests/Helper/EmailValidatorTest.php @@ -17,17 +17,17 @@ class EmailValidatorTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject&EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject&EmailValidationEvent */ - private $event; + private \PHPUnit\Framework\MockObject\MockObject $event; private EmailValidator $emailValidator; diff --git a/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php b/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php index 9f4827d3000..19040394897 100644 --- a/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php +++ b/app/bundles/EmailBundle/Tests/Model/EmailModelTest.php @@ -65,147 +65,138 @@ class EmailModelTest extends \PHPUnit\Framework\TestCase /** * @var Connection|MockObject */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var MockObject|ThemeHelperInterface */ - private $themeHelper; + private \PHPUnit\Framework\MockObject\MockObject $themeHelper; /** * @var MockObject|Mailbox */ - private $mailboxHelper; + private \PHPUnit\Framework\MockObject\MockObject $mailboxHelper; /** * @var MockObject|MailHelper */ - private $mailHelper; + private \PHPUnit\Framework\MockObject\MockObject $mailHelper; /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject|TrackableModel */ - private $trackableModel; + private \PHPUnit\Framework\MockObject\MockObject $trackableModel; /** * @var MockObject|UserModel */ - private $userModel; + private \PHPUnit\Framework\MockObject\MockObject $userModel; /** * @var MockObject|UserHelper */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject|Email */ - private $emailEntity; + private \PHPUnit\Framework\MockObject\MockObject $emailEntity; /** * @var MockObject|EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject|StatRepository */ - private $statRepository; + private \PHPUnit\Framework\MockObject\MockObject $statRepository; /** * @var MockObject|EmailRepository */ - private $emailRepository; + private \PHPUnit\Framework\MockObject\MockObject $emailRepository; /** * @var MockObject|FrequencyRuleRepository */ - private $frequencyRepository; + private \PHPUnit\Framework\MockObject\MockObject $frequencyRepository; /** * @var MockObject|MessageQueueModel */ - private $messageModel; + private \PHPUnit\Framework\MockObject\MockObject $messageModel; /** * @var MockObject|CompanyModel */ - private $companyModel; + private \PHPUnit\Framework\MockObject\MockObject $companyModel; /** * @var MockObject|CompanyRepository */ - private $companyRepository; + private \PHPUnit\Framework\MockObject\MockObject $companyRepository; /** * @var MockObject|DoNotContact */ - private $dncModel; + private \PHPUnit\Framework\MockObject\MockObject $dncModel; - /** - * @var StatHelper - */ - private $statHelper; + private \Mautic\EmailBundle\Stat\StatHelper $statHelper; - /** - * @var SendEmailToContact - */ - private $sendToContactModel; + private \Mautic\EmailBundle\Model\SendEmailToContact $sendToContactModel; /** * @var MockObject|DeviceTracker */ - private $deviceTrackerMock; + private \PHPUnit\Framework\MockObject\MockObject $deviceTrackerMock; /** * @var MockObject|RedirectRepository */ - private $redirectRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $redirectRepositoryMock; /** * @var MockObject|CacheStorageHelper */ - private $cacheStorageHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $cacheStorageHelperMock; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; - /** - * @var EmailModel - */ - private $emailModel; + private \Mautic\EmailBundle\Model\EmailModel $emailModel; /** * @var MockObject|DoNotContact */ - private $doNotContact; + private \PHPUnit\Framework\MockObject\MockObject $doNotContact; /** * @var MockObject|CorePermissions */ - private $corePermissions; + private \PHPUnit\Framework\MockObject\MockObject $corePermissions; /** * @var StatsCollectionHelper|MockObject */ - private $statsCollectionHelper; + private \PHPUnit\Framework\MockObject\MockObject $statsCollectionHelper; /** * @var MockObject&EventDispatcherInterface diff --git a/app/bundles/EmailBundle/Tests/Model/SendEmailToUserTest.php b/app/bundles/EmailBundle/Tests/Model/SendEmailToUserTest.php index 8d224d2cc20..8b6ff78d734 100644 --- a/app/bundles/EmailBundle/Tests/Model/SendEmailToUserTest.php +++ b/app/bundles/EmailBundle/Tests/Model/SendEmailToUserTest.php @@ -24,27 +24,24 @@ class SendEmailToUserTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EmailModel */ - private $emailModel; + private \PHPUnit\Framework\MockObject\MockObject $emailModel; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|CustomFieldValidator */ - private $customFieldValidator; + private \PHPUnit\Framework\MockObject\MockObject $customFieldValidator; /** * @var MockObject|EmailValidator */ - private $emailValidator; + private \PHPUnit\Framework\MockObject\MockObject $emailValidator; - /** - * @var SendEmailToUser - */ - private $sendEmailToUser; + private \Mautic\EmailBundle\Model\SendEmailToUser $sendEmailToUser; protected function setUp(): void { diff --git a/app/bundles/EmailBundle/Tests/MonitoredEmail/Processor/ReplyTest.php b/app/bundles/EmailBundle/Tests/MonitoredEmail/Processor/ReplyTest.php index bc794c7e7e2..a14473b3d84 100644 --- a/app/bundles/EmailBundle/Tests/MonitoredEmail/Processor/ReplyTest.php +++ b/app/bundles/EmailBundle/Tests/MonitoredEmail/Processor/ReplyTest.php @@ -27,17 +27,14 @@ class ReplyTest extends \PHPUnit\Framework\TestCase { private EmailAddressHelper $emailAddressHelper; - private $statRepo; - private $contactFinder; - private $leadModel; - private $dispatcher; - private $logger; - private $contactTracker; - - /** - * @var Reply - */ - private $processor; + private \PHPUnit\Framework\MockObject\MockObject $statRepo; + private \PHPUnit\Framework\MockObject\MockObject $contactFinder; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $logger; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; + + private \Mautic\EmailBundle\MonitoredEmail\Processor\Reply $processor; /** * @var MockObject&LeadRepository diff --git a/app/bundles/EmailBundle/Tests/Stats/SentHelperTest.php b/app/bundles/EmailBundle/Tests/Stats/SentHelperTest.php index 13a270e6538..d37dcfc67c6 100644 --- a/app/bundles/EmailBundle/Tests/Stats/SentHelperTest.php +++ b/app/bundles/EmailBundle/Tests/Stats/SentHelperTest.php @@ -31,27 +31,27 @@ class SentHelperTest extends TestCase /** * @var MockObject|Connection */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var MockObject|GeneratedColumnsProviderInterface */ - private $generatedColumnsProvider; + private \PHPUnit\Framework\MockObject\MockObject $generatedColumnsProvider; /** * @var MockObject|UserHelper */ - private $userHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $userHelperMock; /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; /** * @var MockObject|Result */ - private $result; + private \PHPUnit\Framework\MockObject\MockObject $result; private GeneratedColumns $generatedColumns; diff --git a/app/bundles/FormBundle/Tests/Collector/AlreadyMappedFieldCollectorTest.php b/app/bundles/FormBundle/Tests/Collector/AlreadyMappedFieldCollectorTest.php index 11183b7455a..2d6eb53823a 100644 --- a/app/bundles/FormBundle/Tests/Collector/AlreadyMappedFieldCollectorTest.php +++ b/app/bundles/FormBundle/Tests/Collector/AlreadyMappedFieldCollectorTest.php @@ -14,12 +14,9 @@ final class AlreadyMappedFieldCollectorTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&CacheProviderInterface */ - private $cacheProvider; + private \PHPUnit\Framework\MockObject\MockObject $cacheProvider; - /** - * @var AlreadyMappedFieldCollector - */ - private $collector; + private \Mautic\FormBundle\Collector\AlreadyMappedFieldCollector $collector; protected function setup(): void { diff --git a/app/bundles/FormBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php b/app/bundles/FormBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php index 4ff815aea9c..8c2c019e899 100644 --- a/app/bundles/FormBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php +++ b/app/bundles/FormBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php @@ -16,17 +16,14 @@ class DetermineWinnerSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|SubmissionRepository */ - private $submissionRepository; + private \PHPUnit\Framework\MockObject\MockObject $submissionRepository; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DetermineWinnerSubscriber - */ - private $subscriber; + private \Mautic\FormBundle\EventListener\DetermineWinnerSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/EventListener/FormConditionalSubscriberTest.php b/app/bundles/FormBundle/Tests/EventListener/FormConditionalSubscriberTest.php index 83da8b49460..242bcf7720e 100644 --- a/app/bundles/FormBundle/Tests/EventListener/FormConditionalSubscriberTest.php +++ b/app/bundles/FormBundle/Tests/EventListener/FormConditionalSubscriberTest.php @@ -17,17 +17,14 @@ final class FormConditionalSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FormModel */ - private $formModel; + private \PHPUnit\Framework\MockObject\MockObject $formModel; /** * @var MockObject|FieldModel */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; - /** - * @var FormConditionalSubscriber - */ - private $subscriber; + private \Mautic\FormBundle\EventListener\FormConditionalSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php index 7507d125ce6..1d6ec96b354 100644 --- a/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php +++ b/app/bundles/FormBundle/Tests/EventListener/ReportSubscriberTest.php @@ -29,42 +29,36 @@ class ReportSubscriberTest extends AbstractMauticTestCase /** * @var CompanyReportData|MockObject */ - private $companyReportData; + private \PHPUnit\Framework\MockObject\MockObject $companyReportData; /** * @var SubmissionRepository|MockObject */ - private $submissionRepository; + private \PHPUnit\Framework\MockObject\MockObject $submissionRepository; /** * @var FormModel|MockObject */ - private $formModel; + private \PHPUnit\Framework\MockObject\MockObject $formModel; /** * @var FormRepository|MockObject */ - private $formRepository; + private \PHPUnit\Framework\MockObject\MockObject $formRepository; - /** - * @var ReportHelper|MockObject - */ - private $reportHelper; + private \Mautic\ReportBundle\Helper\ReportHelper $reportHelper; /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var ReportSubscriber - */ - private $subscriber; + private \Mautic\FormBundle\EventListener\ReportSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/Form/Type/FormFieldConditionTypeTest.php b/app/bundles/FormBundle/Tests/Form/Type/FormFieldConditionTypeTest.php index ee2e4910d19..11b615f28e4 100644 --- a/app/bundles/FormBundle/Tests/Form/Type/FormFieldConditionTypeTest.php +++ b/app/bundles/FormBundle/Tests/Form/Type/FormFieldConditionTypeTest.php @@ -17,22 +17,19 @@ final class FormFieldConditionTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FieldModel */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var MockObject|PropertiesAccessor */ - private $propertiesAccessor; + private \PHPUnit\Framework\MockObject\MockObject $propertiesAccessor; /** * @var MockObject&FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var FormFieldConditionType - */ - private $form; + private \Mautic\FormBundle\Form\Type\FormFieldConditionType $form; protected function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/Helper/PropertiesAccessorTest.php b/app/bundles/FormBundle/Tests/Helper/PropertiesAccessorTest.php index 3665a72ff87..18224c1eb60 100644 --- a/app/bundles/FormBundle/Tests/Helper/PropertiesAccessorTest.php +++ b/app/bundles/FormBundle/Tests/Helper/PropertiesAccessorTest.php @@ -13,12 +13,9 @@ final class PropertiesAccessorTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FormModel */ - private $formModel; + private \PHPUnit\Framework\MockObject\MockObject $formModel; - /** - * @var PropertiesAccessor - */ - private $propertiesAccessor; + private \Mautic\FormBundle\Helper\PropertiesAccessor $propertiesAccessor; protected function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/Model/FormModelTest.php b/app/bundles/FormBundle/Tests/Model/FormModelTest.php index 66232fdc0fb..c6d12446c80 100644 --- a/app/bundles/FormBundle/Tests/Model/FormModelTest.php +++ b/app/bundles/FormBundle/Tests/Model/FormModelTest.php @@ -39,92 +39,89 @@ class FormModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&RequestStack */ - private $requestStack; + private \PHPUnit\Framework\MockObject\MockObject $requestStack; /** * @var MockObject&Environment */ - private $twigMock; + private \PHPUnit\Framework\MockObject\MockObject $twigMock; /** * @var MockObject&ThemeHelper */ - private $themeHelper; + private \PHPUnit\Framework\MockObject\MockObject $themeHelper; /** * @var MockObject&ActionModel */ - private $formActionModel; + private \PHPUnit\Framework\MockObject\MockObject $formActionModel; /** * @var MockObject&FieldModel */ - private $formFieldModel; + private \PHPUnit\Framework\MockObject\MockObject $formFieldModel; /** * @var MockObject&EventDispatcher */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject&Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject&EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject&FormUploader */ - private $formUploaderMock; + private \PHPUnit\Framework\MockObject\MockObject $formUploaderMock; /** * @var MockObject&ColumnSchemaHelper */ - private $columnSchemaHelper; + private \PHPUnit\Framework\MockObject\MockObject $columnSchemaHelper; /** * @var MockObject&TableSchemaHelper */ - private $tableSchemaHelper; + private \PHPUnit\Framework\MockObject\MockObject $tableSchemaHelper; /** * @var MockObject&FormRepository */ - private $formRepository; + private \PHPUnit\Framework\MockObject\MockObject $formRepository; /** * @var MockObject&LeadFieldModel */ - private $leadFieldModel; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModel; /** * @var MockObject&ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject&FormFieldHelper */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; /** * @var MockObject&PrimaryCompanyHelper */ - private $primaryCompanyHelper; + private \PHPUnit\Framework\MockObject\MockObject $primaryCompanyHelper; /** * @var MockObject&MappedObjectCollectorInterface */ - private $mappedObjectCollector; + private \PHPUnit\Framework\MockObject\MockObject $mappedObjectCollector; - /** - * @var FormModel - */ - private $formModel; + private \Mautic\FormBundle\Model\FormModel $formModel; protected function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/Model/SubmissionModelTest.php b/app/bundles/FormBundle/Tests/Model/SubmissionModelTest.php index 49019ff10b1..5df032f1fcb 100644 --- a/app/bundles/FormBundle/Tests/Model/SubmissionModelTest.php +++ b/app/bundles/FormBundle/Tests/Model/SubmissionModelTest.php @@ -47,137 +47,131 @@ class SubmissionModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var MockObject|Environment */ - private $twigMock; + private \PHPUnit\Framework\MockObject\MockObject $twigMock; /** * @var MockObject|FormModel */ - private $formModel; + private \PHPUnit\Framework\MockObject\MockObject $formModel; /** * @var MockObject|PageModel */ - private $pageModel; + private \PHPUnit\Framework\MockObject\MockObject $pageModel; /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject|CampaignModel */ - private $campaignModel; + private \PHPUnit\Framework\MockObject\MockObject $campaignModel; /** * @var MockObject|MembershipManager */ - private $membershipManager; + private \PHPUnit\Framework\MockObject\MockObject $membershipManager; /** * @var MockObject|LeadFieldModel */ - private $leadFieldModel; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModel; /** * @var MockObject|CompanyModel */ - private $companyModel; + private \PHPUnit\Framework\MockObject\MockObject $companyModel; /** * @var MockObject|FormFieldHelper */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|Translator */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var MockObject|DateHelper - */ - private $dateHelper; + private \Mautic\CoreBundle\Twig\Helper\DateHelper $dateHelper; /** * @var MockObject|UserHelper */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var MockObject|EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject|SubmissionRepository */ - private $submissioRepository; + private \PHPUnit\Framework\MockObject\MockObject $submissioRepository; /** * @var MockObject|LeadRepository */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; /** * @var MockObject|Logger */ - private $mockLogger; + private \PHPUnit\Framework\MockObject\MockObject $mockLogger; /** * @var MockObject|UploadFieldValidator */ - private $uploadFieldValidatorMock; + private \PHPUnit\Framework\MockObject\MockObject $uploadFieldValidatorMock; /** * @var MockObject|FormUploader */ - private $formUploaderMock; + private \PHPUnit\Framework\MockObject\MockObject $formUploaderMock; /** * @var MockObject|DeviceTrackingServiceInterface */ - private $deviceTrackingService; + private \PHPUnit\Framework\MockObject\MockObject $deviceTrackingService; /** * @var MockObject|UploadedFile */ - private $file1Mock; + private \PHPUnit\Framework\MockObject\MockObject $file1Mock; /** * @var MockObject|RouterInterface */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject|ContactMerger */ - private $contactMerger; + private \PHPUnit\Framework\MockObject\MockObject $contactMerger; - /** - * @var SubmissionModel - */ - private $submissionModel; + private \Mautic\FormBundle\Model\SubmissionModel $submissionModel; /** * @var \ReflectionClass */ - private $submissionModelReflection; + private \ReflectionClass $submissionModelReflection; protected function setUp(): void { diff --git a/app/bundles/FormBundle/Tests/ProgressiveProfiling/DisplayManagerTest.php b/app/bundles/FormBundle/Tests/ProgressiveProfiling/DisplayManagerTest.php index 232ca394a04..9f4e6a350a1 100644 --- a/app/bundles/FormBundle/Tests/ProgressiveProfiling/DisplayManagerTest.php +++ b/app/bundles/FormBundle/Tests/ProgressiveProfiling/DisplayManagerTest.php @@ -9,20 +9,11 @@ class DisplayManagerTest extends \PHPUnit\Framework\TestCase { - /** - * @var Form - */ - private $form; - - /** - * @var array - */ - private $viewOnlyFields; - - /** - * @var DisplayCounter - */ - private $displayCounter; + private \Mautic\FormBundle\Entity\Form $form; + + private array $viewOnlyFields; + + private \Mautic\FormBundle\ProgressiveProfiling\DisplayCounter $displayCounter; public function setUp(): void { diff --git a/app/bundles/InstallBundle/Tests/Command/InstallCommandTest.php b/app/bundles/InstallBundle/Tests/Command/InstallCommandTest.php index b1221ca6dae..80deaf6574d 100644 --- a/app/bundles/InstallBundle/Tests/Command/InstallCommandTest.php +++ b/app/bundles/InstallBundle/Tests/Command/InstallCommandTest.php @@ -22,12 +22,12 @@ class InstallCommandTest extends TestCase /** * @var MockObject&InstallService */ - private $installer; + private \PHPUnit\Framework\MockObject\MockObject $installer; /** * @var MockObject&Registry */ - private $doctrineRegistry; + private \PHPUnit\Framework\MockObject\MockObject $doctrineRegistry; private InstallCommand $command; diff --git a/app/bundles/InstallBundle/Tests/Controller/InstallControllerTest.php b/app/bundles/InstallBundle/Tests/Controller/InstallControllerTest.php index 7db8d3e2ba9..545524da218 100644 --- a/app/bundles/InstallBundle/Tests/Controller/InstallControllerTest.php +++ b/app/bundles/InstallBundle/Tests/Controller/InstallControllerTest.php @@ -26,16 +26,16 @@ class InstallControllerTest extends \PHPUnit\Framework\TestCase { - private $translatorMock; - private $sessionMock; - private $containerMock; - private $routerMock; - private $flashBagMock; - private $controller; - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $sessionMock; + private \PHPUnit\Framework\MockObject\MockObject $containerMock; + private \PHPUnit\Framework\MockObject\MockObject $routerMock; + private \PHPUnit\Framework\MockObject\MockObject $flashBagMock; + private \Mautic\InstallBundle\Controller\InstallController $controller; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; - private $configurator; - private $installer; + private \PHPUnit\Framework\MockObject\MockObject $configurator; + private \PHPUnit\Framework\MockObject\MockObject $installer; protected function setUp(): void { diff --git a/app/bundles/InstallBundle/Tests/EventListener/DoctrineEventSubscriberTest.php b/app/bundles/InstallBundle/Tests/EventListener/DoctrineEventSubscriberTest.php index afcd5439628..c9d8c16260f 100644 --- a/app/bundles/InstallBundle/Tests/EventListener/DoctrineEventSubscriberTest.php +++ b/app/bundles/InstallBundle/Tests/EventListener/DoctrineEventSubscriberTest.php @@ -22,7 +22,7 @@ class DoctrineEventSubscriberTest extends TestCase /** * @var MockObject&EntityManagerInterface */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; protected function setUp(): void { diff --git a/app/bundles/InstallBundle/Tests/Install/InstallServiceTest.php b/app/bundles/InstallBundle/Tests/Install/InstallServiceTest.php index ac279f5f77e..5b005a532f1 100644 --- a/app/bundles/InstallBundle/Tests/Install/InstallServiceTest.php +++ b/app/bundles/InstallBundle/Tests/Install/InstallServiceTest.php @@ -21,23 +21,23 @@ class InstallServiceTest extends \PHPUnit\Framework\TestCase { - private $configurator; + private \PHPUnit\Framework\MockObject\MockObject $configurator; - private $cacheHelper; - private $pathsHelper; + private \PHPUnit\Framework\MockObject\MockObject $cacheHelper; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelper; /** @var EntityManager&MockObject */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; - private $translator; - private $kernel; - private $validator; + private \PHPUnit\Framework\MockObject\MockObject $translator; + private \PHPUnit\Framework\MockObject\MockObject $kernel; + private \PHPUnit\Framework\MockObject\MockObject $validator; private UserPasswordHasher $hasher; /** * @var MockObject&FixturesLoaderInterface */ - private $fixtureLoader; + private \PHPUnit\Framework\MockObject\MockObject $fixtureLoader; private InstallService $installer; diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceFactoryTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceFactoryTest.php index f332f8245f6..18d68a6bd3b 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceFactoryTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceFactoryTest.php @@ -11,8 +11,8 @@ class TokenPersistenceFactoryTest extends TestCase { - private $integrationsHelper; - private $integration; + private \PHPUnit\Framework\MockObject\MockObject $integrationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $integration; public function setup(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceTest.php index 378e18ee811..b930f1e59bc 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Auth/Support/Oauth2/Token/TokenPersistenceTest.php @@ -20,12 +20,9 @@ class TokenPersistenceTest extends TestCase /** * @var MockObject|IntegrationsHelper */ - private $integrationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $integrationsHelper; - /** - * @var TokenPersistence - */ - private $tokenPersistence; + private \Mautic\IntegrationsBundle\Auth\Support\Oauth2\Token\TokenPersistence $tokenPersistence; public function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Command/SyncCommandTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Command/SyncCommandTest.php index a478a66a685..589fdaa698d 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Command/SyncCommandTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Command/SyncCommandTest.php @@ -23,12 +23,9 @@ class SyncCommandTest extends TestCase /** * @var SyncServiceInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $syncService; + private \PHPUnit\Framework\MockObject\MockObject $syncService; - /** - * @var CommandTester - */ - private $commandTester; + private \Symfony\Component\Console\Tester\CommandTester $commandTester; public function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php index c7a5953f963..429a486c5e9 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingRepositoryTest.php @@ -20,7 +20,7 @@ final class ObjectMappingRepositoryTest extends TestCase /** * @var MockObject&AbstractQuery */ - private $query; + private \PHPUnit\Framework\MockObject\MockObject $query; private ObjectMappingRepository $repository; diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingTest.php index 707e47d0ae3..4b2860b404e 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Entity/ObjectMappingTest.php @@ -9,10 +9,7 @@ class ObjectMappingTest extends TestCase { - /** - * @var \DateTime - */ - private $dateCreated; + private \DateTime $dateCreated; public function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/ContactObjectSubscriberTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/ContactObjectSubscriberTest.php index 5da79c1b4b2..c22c85f107e 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/ContactObjectSubscriberTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/ContactObjectSubscriberTest.php @@ -28,17 +28,14 @@ class ContactObjectSubscriberTest extends TestCase /** * @var ContactObjectHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $contactObjectHelper; + private \PHPUnit\Framework\MockObject\MockObject $contactObjectHelper; /** * @var Router|\PHPUnit\Framework\MockObject\MockObject */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; - /** - * @var ContactObjectSubscriber - */ - private $subscriber; + private \Mautic\IntegrationsBundle\EventListener\ContactObjectSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/LeadSubscriberTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/LeadSubscriberTest.php index b3e1e17a6de..b53410792e1 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/LeadSubscriberTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/EventListener/LeadSubscriberTest.php @@ -29,42 +29,39 @@ class LeadSubscriberTest extends TestCase /** * @var MockObject|FieldChangeRepository */ - private $fieldChangeRepository; + private \PHPUnit\Framework\MockObject\MockObject $fieldChangeRepository; /** * @var MockObject|ObjectMappingRepository */ - private $objectMappingRepository; + private \PHPUnit\Framework\MockObject\MockObject $objectMappingRepository; /** * @var MockObject|VariableExpresserHelperInterface */ - private $variableExpresserHelper; + private \PHPUnit\Framework\MockObject\MockObject $variableExpresserHelper; /** * @var MockObject|SyncIntegrationsHelper */ - private $syncIntegrationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $syncIntegrationsHelper; /** * @var MockObject|LeadEvent */ - private $leadEvent; + private \PHPUnit\Framework\MockObject\MockObject $leadEvent; /** * @var MockObject|CompanyEvent */ - private $companyEvent; + private \PHPUnit\Framework\MockObject\MockObject $companyEvent; - /** - * @var LeadSubscriber - */ - private $subscriber; + private \Mautic\IntegrationsBundle\EventListener\LeadSubscriber $subscriber; /** * @var MockObject|EventDispatcherInterface */ - private $eventDispatcherInterfaceMock; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcherInterfaceMock; public function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Form/Type/IntegrationSyncSettingsObjectFieldTypeTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Form/Type/IntegrationSyncSettingsObjectFieldTypeTest.php index 3bb1368d897..acd7a351140 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Form/Type/IntegrationSyncSettingsObjectFieldTypeTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Form/Type/IntegrationSyncSettingsObjectFieldTypeTest.php @@ -17,12 +17,9 @@ final class IntegrationSyncSettingsObjectFieldTypeTest extends \PHPUnit\Framewor /** * @var MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var IntegrationSyncSettingsObjectFieldType - */ - private $form; + private \Mautic\IntegrationsBundle\Form\Type\IntegrationSyncSettingsObjectFieldType $form; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Helper/BuilderIntegrationsHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Helper/BuilderIntegrationsHelperTest.php index 25dbb91547d..90996bdad26 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Helper/BuilderIntegrationsHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Helper/BuilderIntegrationsHelperTest.php @@ -18,12 +18,9 @@ class BuilderIntegrationsHelperTest extends TestCase /** * @var IntegrationsHelper|MockObject */ - private $integrationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $integrationsHelper; - /** - * @var BuilderIntegrationsHelper - */ - private $builderIntegrationsHelper; + private \Mautic\IntegrationsBundle\Helper\BuilderIntegrationsHelper $builderIntegrationsHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/MappingHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/MappingHelperTest.php index b40c53a2c75..49a3aff067c 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/MappingHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/MappingHelperTest.php @@ -28,27 +28,24 @@ class MappingHelperTest extends TestCase /** * @var FieldModel|\PHPUnit\Framework\MockObject\MockObject */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var ObjectProvider|\PHPUnit\Framework\MockObject\MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var ObjectMappingRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $objectMappingRepository; + private \PHPUnit\Framework\MockObject\MockObject $objectMappingRepository; - /** - * @var MappingHelper - */ - private $mappingHelper; + private \Mautic\IntegrationsBundle\Sync\Helper\MappingHelper $mappingHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/RelationsHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/RelationsHelperTest.php index f4648a802b9..1db03eb240a 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/RelationsHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/RelationsHelperTest.php @@ -22,22 +22,19 @@ class RelationsHelperTest extends TestCase /** * @var MappingHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $mappingHelper; + private \PHPUnit\Framework\MockObject\MockObject $mappingHelper; - /** - * @var RelationsHelper - */ - private $relationsHelper; + private \Mautic\IntegrationsBundle\Sync\Helper\RelationsHelper $relationsHelper; /** * @var ReportDAO|\PHPUnit\Framework\MockObject\MockObject */ - private $syncReport; + private \PHPUnit\Framework\MockObject\MockObject $syncReport; /** * @var MappingManualDAO|\PHPUnit\Framework\MockObject\MockObject */ - private $mappingManual; + private \PHPUnit\Framework\MockObject\MockObject $mappingManual; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php index fb078223c9e..802da596185 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Helper/SyncDateHelperTest.php @@ -12,7 +12,7 @@ class SyncDateHelperTest extends TestCase /** * @var SyncDateHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $syncDateHelper; + private \PHPUnit\Framework\MockObject\MockObject $syncDateHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/OwnerProviderTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/OwnerProviderTest.php index ce7557c000d..2522a27e27f 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/OwnerProviderTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/OwnerProviderTest.php @@ -19,17 +19,14 @@ class OwnerProviderTest extends TestCase /** * @var ObjectProvider|\PHPUnit\Framework\MockObject\MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; - /** - * @var OwnerProvider - */ - private $ownerProvider; + private \Mautic\IntegrationsBundle\Sync\Notification\Helper\OwnerProvider $ownerProvider; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/RouteHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/RouteHelperTest.php index 104dba4dd05..8c37100c682 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/RouteHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/RouteHelperTest.php @@ -20,17 +20,14 @@ class RouteHelperTest extends TestCase /** * @var ObjectProvider|\PHPUnit\Framework\MockObject\MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; - /** - * @var RouteHelper - */ - private $routeHelper; + private \Mautic\IntegrationsBundle\Sync\Notification\Helper\RouteHelper $routeHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserNotificationHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserNotificationHelperTest.php index 7e75ca88e18..b6a1d05ca86 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserNotificationHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserNotificationHelperTest.php @@ -20,32 +20,29 @@ class UserNotificationHelperTest extends TestCase /** * @var Writer|MockObject */ - private $writer; + private \PHPUnit\Framework\MockObject\MockObject $writer; /** * @var UserHelper|MockObject */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var OwnerProvider|MockObject */ - private $ownerProvider; + private \PHPUnit\Framework\MockObject\MockObject $ownerProvider; /** * @var RouteHelper|MockObject */ - private $routeHelper; + private \PHPUnit\Framework\MockObject\MockObject $routeHelper; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var UserNotificationHelper - */ - private $helper; + private \Mautic\IntegrationsBundle\Sync\Notification\Helper\UserNotificationHelper $helper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserSummaryNotificationHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserSummaryNotificationHelperTest.php index df04c5721ca..4b19167428d 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserSummaryNotificationHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/Notification/Helper/UserSummaryNotificationHelperTest.php @@ -19,32 +19,29 @@ class UserSummaryNotificationHelperTest extends TestCase /** * @var Writer|MockObject */ - private $writer; + private \PHPUnit\Framework\MockObject\MockObject $writer; /** * @var UserHelper|MockObject */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var OwnerProvider|MockObject */ - private $ownerProvider; + private \PHPUnit\Framework\MockObject\MockObject $ownerProvider; /** * @var RouteHelper|MockObject */ - private $routeHelper; + private \PHPUnit\Framework\MockObject\MockObject $routeHelper; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var UserSummaryNotificationHelper - */ - private $helper; + private \Mautic\IntegrationsBundle\Sync\Notification\Helper\UserSummaryNotificationHelper $helper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Helper/FieldHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Helper/FieldHelperTest.php index 53c673ad2a3..42669ca5ba3 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Helper/FieldHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Helper/FieldHelperTest.php @@ -21,37 +21,31 @@ class FieldHelperTest extends TestCase /** * @var FieldModel|\PHPUnit\Framework\MockObject\MockObject */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var VariableExpresserHelperInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $variableExpresserHelper; + private \PHPUnit\Framework\MockObject\MockObject $variableExpresserHelper; /** * @var ChannelListHelper */ - private $channelListHelper; + private \PHPUnit\Framework\MockObject\MockObject $channelListHelper; - /** - * @var \PHPUnit\Framework\MockObject\MockObject - */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; /** * @var MauticSyncFieldsLoadEvent|\PHPUnit\Framework\MockObject\MockObject */ - private $mauticSyncFieldsLoadEvent; + private \PHPUnit\Framework\MockObject\MockObject $mauticSyncFieldsLoadEvent; /** * @var ObjectProvider|\PHPUnit\Framework\MockObject\MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; - /** - * @var FieldHelper - */ - private $fieldHelper; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Helper\FieldHelper $fieldHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/FieldValidatorTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/FieldValidatorTest.php index ffb4ec6845d..42b627552b7 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/FieldValidatorTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/FieldValidatorTest.php @@ -19,17 +19,14 @@ class FieldValidatorTest extends TestCase /** * @var LeadFieldRepository|MockObject */ - private $leadFieldRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldRepository; /** * @var BulkNotification|MockObject */ - private $bulkNotification; + private \PHPUnit\Framework\MockObject\MockObject $bulkNotification; - /** - * @var FieldValidator - */ - private $fieldValidator; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\Executioner\FieldValidator $fieldValidator; protected function setup(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/OrderExecutionerTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/OrderExecutionerTest.php index a7ddf5d108d..8abd58f30c7 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/OrderExecutionerTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/OrderExecutionerTest.php @@ -32,32 +32,29 @@ class OrderExecutionerTest extends TestCase /** * @var MappingHelper|MockObject */ - private $mappingHelper; + private \PHPUnit\Framework\MockObject\MockObject $mappingHelper; /** * @var EventDispatcherInterface|MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var ObjectProvider|MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; - /** - * @var OrderExecutioner - */ - private $orderExecutioner; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\Executioner\OrderExecutioner $orderExecutioner; /** * @var ReferenceResolverInterface|MockObject */ - private $referenceResolver; + private \PHPUnit\Framework\MockObject\MockObject $referenceResolver; /** * @var FieldValidatorInterface|MockObject */ - private $fieldValidator; + private \PHPUnit\Framework\MockObject\MockObject $fieldValidator; protected function setup(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/ReferenceResolverTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/ReferenceResolverTest.php index 4917a3e819a..be449ea9051 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/ReferenceResolverTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/Executioner/ReferenceResolverTest.php @@ -21,12 +21,9 @@ class ReferenceResolverTest extends TestCase /** * @var Connection|MockObject */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; - /** - * @var ReferenceResolver - */ - private $referenceResolver; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\Executioner\ReferenceResolver $referenceResolver; protected function setup(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/CompanyObjectHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/CompanyObjectHelperTest.php index c7c9692b01b..db0f7355e21 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/CompanyObjectHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/CompanyObjectHelperTest.php @@ -19,17 +19,17 @@ class CompanyObjectHelperTest extends TestCase /** * @var CompanyModel|\PHPUnit\Framework\MockObject\MockObject */ - private $model; + private \PHPUnit\Framework\MockObject\MockObject $model; /** * @var CompanyRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $repository; + private \PHPUnit\Framework\MockObject\MockObject $repository; /** * @var Connection|\PHPUnit\Framework\MockObject\MockObject */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/ContactObjectHelperTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/ContactObjectHelperTest.php index b3b572c4c70..af345cb24f5 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/ContactObjectHelperTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectHelper/ContactObjectHelperTest.php @@ -27,27 +27,27 @@ class ContactObjectHelperTest extends TestCase /** * @var LeadModel|MockObject */ - private $model; + private \PHPUnit\Framework\MockObject\MockObject $model; /** * @var LeadRepository|MockObject */ - private $repository; + private \PHPUnit\Framework\MockObject\MockObject $repository; /** * @var Connection|MockObject */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var FieldModel|MockObject */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var DoNotContact|MockObject */ - private $doNotContactModel; + private \PHPUnit\Framework\MockObject\MockObject $doNotContactModel; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectProviderTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectProviderTest.php index 2ea7c1a5c9a..47e685b77b0 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectProviderTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ObjectProviderTest.php @@ -18,12 +18,9 @@ class ObjectProviderTest extends TestCase /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; - /** - * @var ObjectProvider - */ - private $objectProvider; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\ObjectProvider $objectProvider; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FieldBuilderTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FieldBuilderTest.php index 01d1aae7987..03b33589092 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FieldBuilderTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FieldBuilderTest.php @@ -19,17 +19,17 @@ class FieldBuilderTest extends TestCase /** * @var Router|\PHPUnit\Framework\MockObject\MockObject */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var FieldHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; /** * @var ContactObjectHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $contactObjectHelper; + private \PHPUnit\Framework\MockObject\MockObject $contactObjectHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FullObjectReportBuilderTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FullObjectReportBuilderTest.php index 40ff57b9f7b..2a24eed468e 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FullObjectReportBuilderTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/FullObjectReportBuilderTest.php @@ -34,22 +34,19 @@ class FullObjectReportBuilderTest extends TestCase /** * @var ObjectProvider|\PHPUnit\Framework\MockObject\MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var FieldBuilder|\PHPUnit\Framework\MockObject\MockObject */ - private $fieldBuilder; + private \PHPUnit\Framework\MockObject\MockObject $fieldBuilder; - /** - * @var FullObjectReportBuilder - */ - private $reportBuilder; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\ReportBuilder\FullObjectReportBuilder $reportBuilder; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/PartialObjectReportBuilderTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/PartialObjectReportBuilderTest.php index 81f03fd6b40..1d0c19ca043 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/PartialObjectReportBuilderTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/Internal/ReportBuilder/PartialObjectReportBuilderTest.php @@ -33,32 +33,29 @@ class PartialObjectReportBuilderTest extends TestCase /** * @var FieldChangeRepository|MockObject */ - private $fieldChangeRepository; + private \PHPUnit\Framework\MockObject\MockObject $fieldChangeRepository; /** * @var FieldHelper|MockObject */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; /** * @var EventDispatcherInterface|MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var FieldBuilder|MockObject */ - private $fieldBuilder; + private \PHPUnit\Framework\MockObject\MockObject $fieldBuilder; /** * @var ObjectProvider|MockObject */ - private $objectProvider; + private \PHPUnit\Framework\MockObject\MockObject $objectProvider; - /** - * @var PartialObjectReportBuilder - */ - private $reportBuilder; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\Internal\ReportBuilder\PartialObjectReportBuilder $reportBuilder; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/MauticSyncDataExchangeTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/MauticSyncDataExchangeTest.php index 8d5d0f60c93..d6f79f1dea7 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/MauticSyncDataExchangeTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncDataExchange/MauticSyncDataExchangeTest.php @@ -27,37 +27,34 @@ class MauticSyncDataExchangeTest extends TestCase /** * @var MockObject|FieldChangeRepository */ - private $fieldChangeRepository; + private \PHPUnit\Framework\MockObject\MockObject $fieldChangeRepository; /** * @var MockObject|FieldHelper */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; /** * @var MockObject|MappingHelper */ - private $mappingHelper; + private \PHPUnit\Framework\MockObject\MockObject $mappingHelper; /** * @var MockObject|FullObjectReportBuilder */ - private $fullObjectReportBuilder; + private \PHPUnit\Framework\MockObject\MockObject $fullObjectReportBuilder; /** * @var MockObject|PartialObjectReportBuilder */ - private $partialObjectReportBuilder; + private \PHPUnit\Framework\MockObject\MockObject $partialObjectReportBuilder; /** * @var MockObject|OrderExecutioner */ - private $orderExecutioner; + private \PHPUnit\Framework\MockObject\MockObject $orderExecutioner; - /** - * @var MauticSyncDataExchange - */ - private $mauticSyncDataExchange; + private \Mautic\IntegrationsBundle\Sync\SyncDataExchange\MauticSyncDataExchange $mauticSyncDataExchange; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/IntegrationSyncProcessTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/IntegrationSyncProcessTest.php index 35ab47bd2c3..f3986dea750 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/IntegrationSyncProcessTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/IntegrationSyncProcessTest.php @@ -31,22 +31,22 @@ class IntegrationSyncProcessTest extends TestCase /** * @var SyncDateHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $syncDateHelper; + private \PHPUnit\Framework\MockObject\MockObject $syncDateHelper; /** * @var MappingHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $mappingHelper; + private \PHPUnit\Framework\MockObject\MockObject $mappingHelper; /** * @var ObjectChangeGenerator|\PHPUnit\Framework\MockObject\MockObject */ - private $objectChangeGenerator; + private \PHPUnit\Framework\MockObject\MockObject $objectChangeGenerator; /** * @var SyncDataExchangeInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $syncDataExchange; + private \PHPUnit\Framework\MockObject\MockObject $syncDataExchange; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/ObjectChangeGeneratorTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/ObjectChangeGeneratorTest.php index d50769ff125..fd111b40261 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/ObjectChangeGeneratorTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Integration/ObjectChangeGeneratorTest.php @@ -21,7 +21,7 @@ class ObjectChangeGeneratorTest extends TestCase /** * @var ValueHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $valueHelper; + private \PHPUnit\Framework\MockObject\MockObject $valueHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/MauticSyncProcessTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/MauticSyncProcessTest.php index bed2e1b9cd5..99b4d9a6cfc 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/MauticSyncProcessTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/MauticSyncProcessTest.php @@ -29,17 +29,17 @@ class MauticSyncProcessTest extends TestCase /** * @var SyncDateHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $syncDateHelper; + private \PHPUnit\Framework\MockObject\MockObject $syncDateHelper; /** * @var ObjectChangeGenerator|\PHPUnit\Framework\MockObject\MockObject */ - private $objectChangeGenerator; + private \PHPUnit\Framework\MockObject\MockObject $objectChangeGenerator; /** * @var MauticSyncDataExchange|\PHPUnit\Framework\MockObject\MockObject */ - private $syncDataExchange; + private \PHPUnit\Framework\MockObject\MockObject $syncDataExchange; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/ObjectChangeGeneratorTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/ObjectChangeGeneratorTest.php index e0e8a56b430..f67f793d416 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/ObjectChangeGeneratorTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/Direction/Internal/ObjectChangeGeneratorTest.php @@ -23,17 +23,17 @@ class ObjectChangeGeneratorTest extends TestCase /** * @var SyncJudgeInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $syncJudge; + private \PHPUnit\Framework\MockObject\MockObject $syncJudge; /** * @var ValueHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $valueHelper; + private \PHPUnit\Framework\MockObject\MockObject $valueHelper; /** * @var FieldHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $fieldHelper; + private \PHPUnit\Framework\MockObject\MockObject $fieldHelper; protected function setUp(): void { diff --git a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/SyncProcessTest.php b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/SyncProcessTest.php index 77970f054d8..bdb721a8ca6 100644 --- a/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/SyncProcessTest.php +++ b/app/bundles/IntegrationsBundle/Tests/Unit/Sync/SyncProcess/SyncProcessTest.php @@ -35,67 +35,64 @@ class SyncProcessTest extends TestCase /** * @var MockObject|MappingManualDAO */ - private $mappingManualDAO; + private \PHPUnit\Framework\MockObject\MockObject $mappingManualDAO; /** * @var MockObject|MauticSyncDataExchange */ - private $internalSyncDataExchange; + private \PHPUnit\Framework\MockObject\MockObject $internalSyncDataExchange; /** * @var MockObject|SyncDataExchangeInterface */ - private $integrationSyncDataExchange; + private \PHPUnit\Framework\MockObject\MockObject $integrationSyncDataExchange; /** * @var MockObject|SyncDateHelper */ - private $syncDateHelper; + private \PHPUnit\Framework\MockObject\MockObject $syncDateHelper; /** * @var MockObject|MappingHelper */ - private $mappingHelper; + private \PHPUnit\Framework\MockObject\MockObject $mappingHelper; /** * @var MockObject|RelationsHelper */ - private $relationsHelper; + private \PHPUnit\Framework\MockObject\MockObject $relationsHelper; /** * @var MockObject|IntegrationSyncProcess */ - private $integrationSyncProcess; + private \PHPUnit\Framework\MockObject\MockObject $integrationSyncProcess; /** * @var MockObject|MauticSyncProcess */ - private $mauticSyncProcess; + private \PHPUnit\Framework\MockObject\MockObject $mauticSyncProcess; /** * @var MockObject|EventDispatcherInterface */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; /** * @var MockObject|Notifier */ - private $notifier; + private \PHPUnit\Framework\MockObject\MockObject $notifier; /** * @var MockObject|InputOptionsDAO */ - private $inputOptionsDAO; + private \PHPUnit\Framework\MockObject\MockObject $inputOptionsDAO; /** * @var MockObject|SyncServiceInterface */ - private $syncService; + private \PHPUnit\Framework\MockObject\MockObject $syncService; - /** - * @var SyncProcess - */ - private $syncProcess; + private \Mautic\IntegrationsBundle\Sync\SyncProcess\SyncProcess $syncProcess; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Deduplicate/CompanyDeduperTest.php b/app/bundles/LeadBundle/Tests/Deduplicate/CompanyDeduperTest.php index 9572bb67877..3cd567f3273 100644 --- a/app/bundles/LeadBundle/Tests/Deduplicate/CompanyDeduperTest.php +++ b/app/bundles/LeadBundle/Tests/Deduplicate/CompanyDeduperTest.php @@ -12,12 +12,12 @@ class CompanyDeduperTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|FieldModel */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|CompanyRepository */ - private $companyRepository; + private \PHPUnit\Framework\MockObject\MockObject $companyRepository; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Deduplicate/ContactMergerTest.php b/app/bundles/LeadBundle/Tests/Deduplicate/ContactMergerTest.php index 485c6da5bbc..a60f262c7fb 100644 --- a/app/bundles/LeadBundle/Tests/Deduplicate/ContactMergerTest.php +++ b/app/bundles/LeadBundle/Tests/Deduplicate/ContactMergerTest.php @@ -20,27 +20,27 @@ class ContactMergerTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|MergeRecordRepository */ - private $leadRepo; + private \PHPUnit\Framework\MockObject\MockObject $leadRepo; /** * @var \PHPUnit\Framework\MockObject\MockObject|MergeRecordRepository */ - private $mergeRecordRepo; + private \PHPUnit\Framework\MockObject\MockObject $mergeRecordRepo; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventDispatcher */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var \PHPUnit\Framework\MockObject\MockObject|Logger */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Entity/LeadListRepositoryTest.php b/app/bundles/LeadBundle/Tests/Entity/LeadListRepositoryTest.php index 7f079c76ad7..a3b2c18bb16 100644 --- a/app/bundles/LeadBundle/Tests/Entity/LeadListRepositoryTest.php +++ b/app/bundles/LeadBundle/Tests/Entity/LeadListRepositoryTest.php @@ -21,12 +21,12 @@ class LeadListRepositoryTest extends TestCase /** * @var QueryBuilder&MockObject */ - private $queryBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilderMock; /** * @var Expr&MockObject */ - private $expressionMock; + private \PHPUnit\Framework\MockObject\MockObject $expressionMock; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryFunctionalTest.php b/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryFunctionalTest.php index b22da49b630..14b001dd087 100644 --- a/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryFunctionalTest.php +++ b/app/bundles/LeadBundle/Tests/Entity/LeadRepositoryFunctionalTest.php @@ -7,10 +7,7 @@ class LeadRepositoryFunctionalTest extends MauticMysqlTestCase { - /** - * @var Lead - */ - private $lead; + private \Mautic\LeadBundle\Entity\Lead $lead; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Event/FormAdjustmentEventTest.php b/app/bundles/LeadBundle/Tests/Event/FormAdjustmentEventTest.php index 098fe5e0816..c28a3fedf65 100644 --- a/app/bundles/LeadBundle/Tests/Event/FormAdjustmentEventTest.php +++ b/app/bundles/LeadBundle/Tests/Event/FormAdjustmentEventTest.php @@ -14,7 +14,7 @@ final class FormAdjustmentEventTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&FormInterface */ - private $form; + private \PHPUnit\Framework\MockObject\MockObject $form; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Event/SegmentOperatorQueryBuilderEventTest.php b/app/bundles/LeadBundle/Tests/Event/SegmentOperatorQueryBuilderEventTest.php index aafbc2ca2cd..36ff7cb2127 100644 --- a/app/bundles/LeadBundle/Tests/Event/SegmentOperatorQueryBuilderEventTest.php +++ b/app/bundles/LeadBundle/Tests/Event/SegmentOperatorQueryBuilderEventTest.php @@ -14,12 +14,12 @@ final class SegmentOperatorQueryBuilderEventTest extends \PHPUnit\Framework\Test /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; /** * @var MockObject|ContactSegmentFilter */ - private $filter; + private \PHPUnit\Framework\MockObject\MockObject $filter; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/ConfigSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/ConfigSubscriberTest.php index 4390e94fe16..474769dff12 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/ConfigSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/ConfigSubscriberTest.php @@ -17,7 +17,7 @@ class ConfigSubscriberTest extends TestCase /** * @var ConfigBuilderEvent&MockObject */ - private $configBuilderEvent; + private \PHPUnit\Framework\MockObject\MockObject $configBuilderEvent; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/DoNotContactSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/DoNotContactSubscriberTest.php index c527bec1fa4..a2a3b1ef928 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/DoNotContactSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/DoNotContactSubscriberTest.php @@ -10,9 +10,9 @@ class DoNotContactSubscriberTest extends \PHPUnit\Framework\TestCase { - private $doNotContactSubscriber; + private \Mautic\LeadBundle\EventListener\DoNotContactSubscriber $doNotContactSubscriber; - private $doNotContact; + private \PHPUnit\Framework\MockObject\MockObject $doNotContact; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/FilterOperatorSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/FilterOperatorSubscriberTest.php index 8a777426e99..c653312e8a3 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/FilterOperatorSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/FilterOperatorSubscriberTest.php @@ -22,35 +22,29 @@ final class FilterOperatorSubscriberTest extends TestCase { - /** - * @var OperatorOptions - */ - private $operatorOptions; + private \Mautic\LeadBundle\Segment\OperatorOptions $operatorOptions; /** * @var MockObject|LeadFieldRepository */ - private $leadFieldRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldRepository; /** * @var MockObject|TypeOperatorProviderInterface */ - private $typeOperatorProvider; + private \PHPUnit\Framework\MockObject\MockObject $typeOperatorProvider; /** * @var MockObject|FieldChoicesProviderInterface */ - private $fieldChoicesProvider; + private \PHPUnit\Framework\MockObject\MockObject $fieldChoicesProvider; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var FilterOperatorSubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\FilterOperatorSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/FormSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/FormSubscriberTest.php index f412484fbe7..e76f0f3e588 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/FormSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/FormSubscriberTest.php @@ -30,32 +30,29 @@ class FormSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var LeadModel|\PHPUnit\Framework\MockObject\MockObject */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var PointGroupModel|(PointGroupModel&object&MockObject)|(PointGroupModel&MockObject)|(object&MockObject)|MockObject */ private MockObject|PointGroupModel $pointGroupModel; - /** - * @var FormSubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\FormSubscriber $subscriber; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject|LeadFieldRepository */ - private $leadFieldRepostory; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldRepostory; /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/LeadSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/LeadSubscriberTest.php index 4d74c7b1aa0..00adf653733 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/LeadSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/LeadSubscriberTest.php @@ -28,42 +28,39 @@ class LeadSubscriberTest extends CommonMocks /** * @var IpLookupHelper|MockObject */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var AuditLogModel|MockObject */ - private $auditLogModel; + private \PHPUnit\Framework\MockObject\MockObject $auditLogModel; /** * @var LeadChangeEventDispatcher|MockObject */ - private $leadEventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $leadEventDispatcher; - /** - * @var DncReasonHelper - */ - private $dncReasonHelper; + private \Mautic\LeadBundle\Twig\Helper\DncReasonHelper $dncReasonHelper; /** * @var EntityManager|MockObject */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var RouterInterface|MockObject */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var ModelFactory&MockObject */ - private $modelFacotry; + private \PHPUnit\Framework\MockObject\MockObject $modelFacotry; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/PointSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/PointSubscriberTest.php index acffbb01fda..0f4f57d7617 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/PointSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/PointSubscriberTest.php @@ -14,12 +14,9 @@ class PointSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var LeadModel|MockObject */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; - /** - * @var PointSubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\PointSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php index 357efa6477e..ae3eef120b3 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/ReportSubscriberTest.php @@ -38,112 +38,106 @@ class ReportSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|LeadModel */ - private $leadModelMock; + private \PHPUnit\Framework\MockObject\MockObject $leadModelMock; /** * @var MockObject|FieldModel */ - private $leadFieldModelMock; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModelMock; /** * @var MockObject|StageModel */ - private $stageModelMock; + private \PHPUnit\Framework\MockObject\MockObject $stageModelMock; /** * @var MockObject|CampaignModel */ - private $campaignModelMock; + private \PHPUnit\Framework\MockObject\MockObject $campaignModelMock; /** * @var MockObject|EventCollector */ - private $eventCollectorMock; + private \PHPUnit\Framework\MockObject\MockObject $eventCollectorMock; /** * @var MockObject|CompanyModel */ - private $companyModelMock; + private \PHPUnit\Framework\MockObject\MockObject $companyModelMock; /** * @var MockObject|CompanyReportData */ - private $companyReportDataMock; + private \PHPUnit\Framework\MockObject\MockObject $companyReportDataMock; /** * @var MockObject|FieldsBuilder */ - private $fieldsBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $fieldsBuilderMock; /** * @var MockObject|Translator */ - private $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; /** * @var MockObject|ReportGeneratorEvent */ - private $reportGeneratorEventMock; + private \PHPUnit\Framework\MockObject\MockObject $reportGeneratorEventMock; /** * @var MockObject|ChannelListHelper */ - private $channelListHelperMock; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelperMock; - /** - * @var MockObject|ReportHelper - */ - private $reportHelperMock; + private \Mautic\ReportBundle\Helper\ReportHelper $reportHelperMock; /** * @var MockObject|CampaignRepository */ - private $campaignRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $campaignRepositoryMock; /** * @var MockObject|ReportBuilderEvent */ - private $reportBuilderEventMock; + private \PHPUnit\Framework\MockObject\MockObject $reportBuilderEventMock; /** * @var MockObject|QueryBuilder */ - private $queryBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilderMock; /** * @var MockObject|ExpressionBuilder */ - private $expressionBuilderMock; + private \PHPUnit\Framework\MockObject\MockObject $expressionBuilderMock; /** * @var MockObject|ReportGraphEvent */ - private $reportGraphEventMock; + private \PHPUnit\Framework\MockObject\MockObject $reportGraphEventMock; /** * @var MockObject|CompanyRepository */ - private $companyRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $companyRepositoryMock; /** * @var MockObject|PointsChangeLogRepository */ - private $pointsChangeLogRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $pointsChangeLogRepositoryMock; /** * @var MockObject|ReportMock */ - private $reportMock; + private \PHPUnit\Framework\MockObject\MockObject $reportMock; /** * @var MockObject|ReportDataEventMock */ - private $reportDataEventMock; + private \PHPUnit\Framework\MockObject\MockObject $reportDataEventMock; - /** - * @var ReportSubscriber - */ - private $reportSubscriber; + private \Mautic\LeadBundle\EventListener\ReportSubscriber $reportSubscriber; /** * @var array diff --git a/app/bundles/LeadBundle/Tests/EventListener/SegmentLogReportSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/SegmentLogReportSubscriberTest.php index 472e1637c40..db42625be7a 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/SegmentLogReportSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/SegmentLogReportSubscriberTest.php @@ -14,12 +14,9 @@ class SegmentLogReportSubscriberTest extends TestCase /** * @var FieldsBuilder */ - private $fieldsBuilder; + private \PHPUnit\Framework\MockObject\MockObject $fieldsBuilder; - /** - * @var SegmentLogReportSubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\SegmentLogReportSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/SegmentOperatorQuerySubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/SegmentOperatorQuerySubscriberTest.php index fedbe2244cb..8a70d989590 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/SegmentOperatorQuerySubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/SegmentOperatorQuerySubscriberTest.php @@ -18,22 +18,19 @@ final class SegmentOperatorQuerySubscriberTest extends TestCase /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; /** * @var MockObject|ExpressionBuilder */ - private $expressionBuilder; + private \PHPUnit\Framework\MockObject\MockObject $expressionBuilder; /** * @var MockObject|ContactSegmentFilter */ - private $contactSegmentFilter; + private \PHPUnit\Framework\MockObject\MockObject $contactSegmentFilter; - /** - * @var SegmentOperatorQuerySubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\SegmentOperatorQuerySubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/TypeOperatorSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/TypeOperatorSubscriberTest.php index cc783265dcb..1e76bb9773b 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/TypeOperatorSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/TypeOperatorSubscriberTest.php @@ -30,57 +30,54 @@ final class TypeOperatorSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject&ListModel */ - private $listModel; + private \PHPUnit\Framework\MockObject\MockObject $listModel; /** * @var MockObject&campaignModel */ - private $campaignModel; + private \PHPUnit\Framework\MockObject\MockObject $campaignModel; /** * @var MockObject&emailModel */ - private $emailModel; + private \PHPUnit\Framework\MockObject\MockObject $emailModel; /** * @var MockObject&StageModel */ - private $stageModel; + private \PHPUnit\Framework\MockObject\MockObject $stageModel; /** * @var MockObject&StageRepository */ - private $stageRepository; + private \PHPUnit\Framework\MockObject\MockObject $stageRepository; /** * @var MockObject&CategoryModel */ - private $categoryModel; + private \PHPUnit\Framework\MockObject\MockObject $categoryModel; /** * @var MockObject&AssetModel */ - private $assetModel; + private \PHPUnit\Framework\MockObject\MockObject $assetModel; /** * @var MockObject&TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject&FormInterface */ - private $form; + private \PHPUnit\Framework\MockObject\MockObject $form; - /** - * @var TypeOperatorSubscriber - */ - private $subscriber; + private \Mautic\LeadBundle\EventListener\TypeOperatorSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/EventListener/WebhookSubscriberTest.php b/app/bundles/LeadBundle/Tests/EventListener/WebhookSubscriberTest.php index dbe01546434..d1ff1398e76 100644 --- a/app/bundles/LeadBundle/Tests/EventListener/WebhookSubscriberTest.php +++ b/app/bundles/LeadBundle/Tests/EventListener/WebhookSubscriberTest.php @@ -15,14 +15,10 @@ use Mautic\LeadBundle\Model\LeadModel; use Mautic\WebhookBundle\Model\WebhookModel; use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; class WebhookSubscriberTest extends \PHPUnit\Framework\TestCase { - /** - * @var EventDispatcherInterface - */ - private $dispatcher; + private \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher; private LeadModel|\PHPUnit\Framework\MockObject\MockObject $leadModel; diff --git a/app/bundles/LeadBundle/Tests/Field/BackgroundServiceTest.php b/app/bundles/LeadBundle/Tests/Field/BackgroundServiceTest.php index 0c424f7bf3e..4d99ac1b057 100644 --- a/app/bundles/LeadBundle/Tests/Field/BackgroundServiceTest.php +++ b/app/bundles/LeadBundle/Tests/Field/BackgroundServiceTest.php @@ -22,32 +22,32 @@ class BackgroundServiceTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|BackgroundService */ - private $backgroundService; + private \Mautic\LeadBundle\Field\BackgroundService $backgroundService; /** * @var MockObject|FieldModel */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; /** * @var MockObject|CustomFieldColumn */ - private $customFieldColumn; + private \PHPUnit\Framework\MockObject\MockObject $customFieldColumn; /** * @var MockObject|LeadFieldSaver */ - private $leadFieldSaver; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldSaver; /** * @var MockObject|FieldColumnBackgroundJobDispatcher */ - private $fieldColumnBackgroundJobDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $fieldColumnBackgroundJobDispatcher; /** * @var MockObject|CustomFieldNotification */ - private $customFieldNotification; + private \PHPUnit\Framework\MockObject\MockObject $customFieldNotification; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Field/CustomFieldColumnTest.php b/app/bundles/LeadBundle/Tests/Field/CustomFieldColumnTest.php index bcfe5e08cf2..c986f98f9a4 100644 --- a/app/bundles/LeadBundle/Tests/Field/CustomFieldColumnTest.php +++ b/app/bundles/LeadBundle/Tests/Field/CustomFieldColumnTest.php @@ -22,42 +22,39 @@ class CustomFieldColumnTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|ColumnSchemaHelper */ - private $columnSchemaHelper; + private \PHPUnit\Framework\MockObject\MockObject $columnSchemaHelper; /** * @var MockObject|SchemaDefinition */ - private $schemaDefinition; + private \PHPUnit\Framework\MockObject\MockObject $schemaDefinition; /** * @var MockObject|Logger */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var MockObject|LeadFieldSaver */ - private $leadFieldSaver; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldSaver; /** * @var MockObject|CustomFieldIndex */ - private $customFieldIndex; + private \PHPUnit\Framework\MockObject\MockObject $customFieldIndex; /** * @var MockObject|FieldColumnDispatcher */ - private $fieldColumnDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $fieldColumnDispatcher; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var CustomFieldColumn - */ - private $customFieldColumn; + private \Mautic\LeadBundle\Field\CustomFieldColumn $customFieldColumn; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Field/IdentifierFieldsTest.php b/app/bundles/LeadBundle/Tests/Field/IdentifierFieldsTest.php index 2357d61f9fe..af64b1089a3 100644 --- a/app/bundles/LeadBundle/Tests/Field/IdentifierFieldsTest.php +++ b/app/bundles/LeadBundle/Tests/Field/IdentifierFieldsTest.php @@ -15,17 +15,14 @@ class IdentifierFieldsTest extends TestCase /** * @var FieldsWithUniqueIdentifier&MockObject */ - private $fieldsWithUniqueIdentifiers; + private \PHPUnit\Framework\MockObject\MockObject $fieldsWithUniqueIdentifiers; /** * @var FieldList&MockObject */ - private $fieldList; + private \PHPUnit\Framework\MockObject\MockObject $fieldList; - /** - * @var IdentifierFields - */ - private $identifierFields; + private \Mautic\LeadBundle\Field\IdentifierFields $identifierFields; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Form/DataTransformer/FieldFilterTransformerTest.php b/app/bundles/LeadBundle/Tests/Form/DataTransformer/FieldFilterTransformerTest.php index c1c25cf4fd7..20b8bf611dd 100644 --- a/app/bundles/LeadBundle/Tests/Form/DataTransformer/FieldFilterTransformerTest.php +++ b/app/bundles/LeadBundle/Tests/Form/DataTransformer/FieldFilterTransformerTest.php @@ -13,12 +13,9 @@ final class FieldFilterTransformerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var FieldFilterTransformer - */ - private $transformer; + private \Mautic\LeadBundle\Form\DataTransformer\FieldFilterTransformer $transformer; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Form/Type/FilterTypeTest.php b/app/bundles/LeadBundle/Tests/Form/Type/FilterTypeTest.php index 8cb02238ce0..8c5f5bba6df 100644 --- a/app/bundles/LeadBundle/Tests/Form/Type/FilterTypeTest.php +++ b/app/bundles/LeadBundle/Tests/Form/Type/FilterTypeTest.php @@ -20,17 +20,14 @@ final class FilterTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FormAdjustmentsProviderInterface */ - private $formAdjustmentsProvider; + private \PHPUnit\Framework\MockObject\MockObject $formAdjustmentsProvider; /** * @var MockObject|ListModel */ - private $listModel; + private \PHPUnit\Framework\MockObject\MockObject $listModel; - /** - * @var FilterType - */ - private $form; + private \Mautic\LeadBundle\Form\Type\FilterType $form; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Form/Type/LeadFieldsTypeTest.php b/app/bundles/LeadBundle/Tests/Form/Type/LeadFieldsTypeTest.php index 344b123b8f6..eacfb12a302 100644 --- a/app/bundles/LeadBundle/Tests/Form/Type/LeadFieldsTypeTest.php +++ b/app/bundles/LeadBundle/Tests/Form/Type/LeadFieldsTypeTest.php @@ -14,12 +14,9 @@ final class LeadFieldsTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FieldModel */ - private $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; - /** - * @var LeadFieldsType - */ - private $form; + private \Mautic\LeadBundle\Form\Type\LeadFieldsType $form; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Form/Type/SegmentConfigTypeTest.php b/app/bundles/LeadBundle/Tests/Form/Type/SegmentConfigTypeTest.php index 56e0c16c159..81ca3058ac7 100644 --- a/app/bundles/LeadBundle/Tests/Form/Type/SegmentConfigTypeTest.php +++ b/app/bundles/LeadBundle/Tests/Form/Type/SegmentConfigTypeTest.php @@ -17,7 +17,7 @@ final class SegmentConfigTypeTest extends TestCase /** * @var FormBuilderInterface&MockObject */ - private $formBuilderInterface; + private \PHPUnit\Framework\MockObject\MockObject $formBuilderInterface; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Form/Validator/Constraints/FieldAliasKeywordValidatorTest.php b/app/bundles/LeadBundle/Tests/Form/Validator/Constraints/FieldAliasKeywordValidatorTest.php index b6d93031c5c..e544268f418 100644 --- a/app/bundles/LeadBundle/Tests/Form/Validator/Constraints/FieldAliasKeywordValidatorTest.php +++ b/app/bundles/LeadBundle/Tests/Form/Validator/Constraints/FieldAliasKeywordValidatorTest.php @@ -18,20 +18,20 @@ class FieldAliasKeywordValidatorTest extends \PHPUnit\Framework\TestCase /** * @var ContactSegmentFilterDictionary|\PHPUnit\Framework\MockObject\MockObject */ - private $contactSegmentFilterDictionary; + private \PHPUnit\Framework\MockObject\MockObject $contactSegmentFilterDictionary; - private $listModelMock; - private $fieldAliasHelperlMock; - private $executionContextMock; - private $entityManagerMock; + private \PHPUnit\Framework\MockObject\MockObject $listModelMock; + private \PHPUnit\Framework\MockObject\MockObject $fieldAliasHelperlMock; + private \PHPUnit\Framework\MockObject\MockObject $executionContextMock; + private \PHPUnit\Framework\MockObject\MockObject $entityManagerMock; /** * @var \PHPUnit\Framework\MockObject\MockObject|TranslatorInterface */ - private $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; - private $unitOfWorkMock; - private $validator; + private \PHPUnit\Framework\MockObject\MockObject $unitOfWorkMock; + private \Mautic\LeadBundle\Form\Validator\Constraints\FieldAliasKeywordValidator $validator; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Helper/AvatarHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/AvatarHelperTest.php index 512d9cf46b6..0df6c166f51 100644 --- a/app/bundles/LeadBundle/Tests/Helper/AvatarHelperTest.php +++ b/app/bundles/LeadBundle/Tests/Helper/AvatarHelperTest.php @@ -22,7 +22,7 @@ class AvatarHelperTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&PathsHelper */ - private $pathsHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelperMock; private GravatarHelper $gravatarHelperMock; @@ -31,7 +31,7 @@ class AvatarHelperTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&Lead */ - private $leadMock; + private \PHPUnit\Framework\MockObject\MockObject $leadMock; private AvatarHelper $avatarHelper; diff --git a/app/bundles/LeadBundle/Tests/Helper/ContactRequestHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/ContactRequestHelperTest.php index 95ce19a6795..5487e0c7660 100644 --- a/app/bundles/LeadBundle/Tests/Helper/ContactRequestHelperTest.php +++ b/app/bundles/LeadBundle/Tests/Helper/ContactRequestHelperTest.php @@ -26,47 +26,47 @@ class ContactRequestHelperTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject|ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var MockObject|EventDispatcher */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|RequestStack */ - private $requestStack; + private \PHPUnit\Framework\MockObject\MockObject $requestStack; /** * @var MockObject|Logger */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var MockObject|Lead */ - private $trackedContact; + private \PHPUnit\Framework\MockObject\MockObject $trackedContact; /** * @var MockObject|ContactMerger */ - private $contactMerger; + private \PHPUnit\Framework\MockObject\MockObject $contactMerger; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php index 26440379482..b964090df91 100644 --- a/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php +++ b/app/bundles/LeadBundle/Tests/Helper/FieldAliasHelperTest.php @@ -9,9 +9,9 @@ class FieldAliasHelperTest extends \PHPUnit\Framework\TestCase { - private $fieldModel; - private $fieldRepository; - private $helper; + private \PHPUnit\Framework\MockObject\MockObject $fieldModel; + private \PHPUnit\Framework\MockObject\MockObject $fieldRepository; + private \Mautic\LeadBundle\Helper\FieldAliasHelper $helper; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Helper/PrimaryCompanyHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/PrimaryCompanyHelperTest.php index fb1c3a0f740..e4f9c802b6c 100644 --- a/app/bundles/LeadBundle/Tests/Helper/PrimaryCompanyHelperTest.php +++ b/app/bundles/LeadBundle/Tests/Helper/PrimaryCompanyHelperTest.php @@ -12,7 +12,7 @@ class PrimaryCompanyHelperTest extends \PHPUnit\Framework\TestCase /** * @var CompanyLeadRepository|Exception */ - private $leadRepository; + private \PHPUnit\Framework\MockObject\MockObject $leadRepository; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Helper/SegmentCountCacheHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/SegmentCountCacheHelperTest.php index 03ff7ae3978..61c4712e180 100644 --- a/app/bundles/LeadBundle/Tests/Helper/SegmentCountCacheHelperTest.php +++ b/app/bundles/LeadBundle/Tests/Helper/SegmentCountCacheHelperTest.php @@ -15,12 +15,9 @@ class SegmentCountCacheHelperTest extends TestCase /** * @var CacheStorageHelper|MockObject */ - private $cacheStorageHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $cacheStorageHelperMock; - /** - * @var SegmentCountCacheHelper - */ - private $segmentCountCacheHelper; + private \Mautic\LeadBundle\Helper\SegmentCountCacheHelper $segmentCountCacheHelper; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php b/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php index 04704a23263..e4eb5b442af 100644 --- a/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php +++ b/app/bundles/LeadBundle/Tests/Model/CompanyModelTest.php @@ -14,22 +14,22 @@ class CompanyModelTest extends \PHPUnit\Framework\TestCase /** * @var FieldModel|\PHPUnit\Framework\MockObject\MockObject */ - private $leadFieldModel; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModel; /** * @var \PHPUnit\Framework\MockObject\MockObject|Session */ - private $session; + private \PHPUnit\Framework\MockObject\MockObject $session; /** * @var EmailValidator|\PHPUnit\Framework\MockObject\MockObject */ - private $emailValidator; + private \PHPUnit\Framework\MockObject\MockObject $emailValidator; /** * @var CompanyDeduper|\PHPUnit\Framework\MockObject\MockObject */ - private $companyDeduper; + private \PHPUnit\Framework\MockObject\MockObject $companyDeduper; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php b/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php index faa94b57bd5..436af762c69 100644 --- a/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php +++ b/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php @@ -14,7 +14,7 @@ class CompanyReportDataTest extends \PHPUnit\Framework\TestCase /** * @var TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Model/IpAddressModelTest.php b/app/bundles/LeadBundle/Tests/Model/IpAddressModelTest.php index 05219e2c160..e4d95c91de6 100644 --- a/app/bundles/LeadBundle/Tests/Model/IpAddressModelTest.php +++ b/app/bundles/LeadBundle/Tests/Model/IpAddressModelTest.php @@ -20,17 +20,14 @@ class IpAddressModelTest extends TestCase /** * @var EntityManager|MockObject */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject|LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; - /** - * @var IpAddressModel - */ - private $ipAddressModel; + private \Mautic\LeadBundle\Model\IpAddressModel $ipAddressModel; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php b/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php index 2f9c4580beb..ef71bac239d 100644 --- a/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php +++ b/app/bundles/LeadBundle/Tests/Model/LeadModelTest.php @@ -48,112 +48,109 @@ class LeadModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|RequestStack */ - private $requestStackMock; + private \PHPUnit\Framework\MockObject\MockObject $requestStackMock; /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelperMock; /** * @var MockObject|PathsHelper */ - private $pathsHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $pathsHelperMock; /** * @var MockObject|IntegrationHelper */ - private $integrationHelperkMock; + private \PHPUnit\Framework\MockObject\MockObject $integrationHelperkMock; /** * @var MockObject|FieldModel */ - private $fieldModelMock; + private \PHPUnit\Framework\MockObject\MockObject $fieldModelMock; /** * @var MockObject|ListModel */ - private $listModelMock; + private \PHPUnit\Framework\MockObject\MockObject $listModelMock; /** * @var MockObject|FormFactory */ - private $formFactoryMock; + private \PHPUnit\Framework\MockObject\MockObject $formFactoryMock; /** * @var MockObject|CompanyModel */ - private $companyModelMock; + private \PHPUnit\Framework\MockObject\MockObject $companyModelMock; /** * @var MockObject|CategoryModel */ - private $categoryModelMock; + private \PHPUnit\Framework\MockObject\MockObject $categoryModelMock; /** * @var MockObject|ChannelListHelper */ - private $channelListHelperMock; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelperMock; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; /** * @var MockObject|EmailValidator */ - private $emailValidatorMock; + private \PHPUnit\Framework\MockObject\MockObject $emailValidatorMock; /** * @var MockObject|UserProvider */ - private $userProviderMock; + private \PHPUnit\Framework\MockObject\MockObject $userProviderMock; /** * @var MockObject|ContactTracker */ - private $contactTrackerMock; + private \PHPUnit\Framework\MockObject\MockObject $contactTrackerMock; /** * @var MockObject|DeviceTracker */ - private $deviceTrackerMock; + private \PHPUnit\Framework\MockObject\MockObject $deviceTrackerMock; /** * @var MockObject|IpAddressModel */ - private $ipAddressModelMock; + private \PHPUnit\Framework\MockObject\MockObject $ipAddressModelMock; /** * @var MockObject|LeadRepository */ - private $leadRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadRepositoryMock; /** * @var MockObject|CompanyLeadRepository */ - private $companyLeadRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $companyLeadRepositoryMock; /** * @var MockObject|UserHelper */ - private $userHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $userHelperMock; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $dispatcherMock; /** * @var MockObject|EntityManager */ - private $entityManagerMock; + private \PHPUnit\Framework\MockObject\MockObject $entityManagerMock; - /** - * @var LeadModel - */ - private $leadModel; + private \Mautic\LeadBundle\Model\LeadModel $leadModel; /** * @var MockObject&Translator diff --git a/app/bundles/LeadBundle/Tests/Model/ListModelTest.php b/app/bundles/LeadBundle/Tests/Model/ListModelTest.php index 01143f74484..53e87f9ac19 100644 --- a/app/bundles/LeadBundle/Tests/Model/ListModelTest.php +++ b/app/bundles/LeadBundle/Tests/Model/ListModelTest.php @@ -32,25 +32,22 @@ class ListModelTest extends TestCase */ protected $fixture; - /** - * @var ListModel - */ - private $model; + private \Mautic\LeadBundle\Model\ListModel $model; /** * @var LeadListRepository|MockObject */ - private $leadListRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadListRepositoryMock; /** * @var SegmentCountCacheHelper|MockObject */ - private $segmentCountCacheHelper; + private \PHPUnit\Framework\MockObject\MockObject $segmentCountCacheHelper; /** * @var ContactSegmentService|MockObject */ - private $contactSegmentServiceMock; + private \PHPUnit\Framework\MockObject\MockObject $contactSegmentServiceMock; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Model/SegmentActionModelTest.php b/app/bundles/LeadBundle/Tests/Model/SegmentActionModelTest.php index 2143a54e2e9..0c4d4751dd5 100644 --- a/app/bundles/LeadBundle/Tests/Model/SegmentActionModelTest.php +++ b/app/bundles/LeadBundle/Tests/Model/SegmentActionModelTest.php @@ -7,29 +7,16 @@ use Mautic\LeadBundle\Entity\Lead; use Mautic\LeadBundle\Model\LeadModel; use Mautic\LeadBundle\Model\SegmentActionModel; -use PHPUnit\Framework\MockObject\MockObject; class SegmentActionModelTest extends \PHPUnit\Framework\TestCase { - /** - * @var MockObject - */ - private $contactMock5; - - /** - * @var MockObject - */ - private $contactMock6; - - /** - * @var MockObject - */ - private $contactModelMock; - - /** - * @var SegmentActionModel - */ - private $actionModel; + private \PHPUnit\Framework\MockObject\MockObject $contactMock5; + + private \PHPUnit\Framework\MockObject\MockObject $contactMock6; + + private \PHPUnit\Framework\MockObject\MockObject $contactModelMock; + + private \Mautic\LeadBundle\Model\SegmentActionModel $actionModel; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Provider/FieldChoicesProviderTest.php b/app/bundles/LeadBundle/Tests/Provider/FieldChoicesProviderTest.php index d56c8d28b17..1a28525c28f 100644 --- a/app/bundles/LeadBundle/Tests/Provider/FieldChoicesProviderTest.php +++ b/app/bundles/LeadBundle/Tests/Provider/FieldChoicesProviderTest.php @@ -16,12 +16,9 @@ final class FieldChoicesProviderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; - /** - * @var FieldChoicesProvider - */ - private $provider; + private \Mautic\LeadBundle\Provider\FieldChoicesProvider $provider; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Provider/FilterOperatorProviderTest.php b/app/bundles/LeadBundle/Tests/Provider/FilterOperatorProviderTest.php index bf3df1de675..82502e74518 100644 --- a/app/bundles/LeadBundle/Tests/Provider/FilterOperatorProviderTest.php +++ b/app/bundles/LeadBundle/Tests/Provider/FilterOperatorProviderTest.php @@ -17,17 +17,14 @@ final class FilterOperatorProviderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var FilterOperatorProvider - */ - private $provider; + private \Mautic\LeadBundle\Provider\FilterOperatorProvider $provider; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Provider/FormAdjustmentsProviderTest.php b/app/bundles/LeadBundle/Tests/Provider/FormAdjustmentsProviderTest.php index 3862d9f180c..86b84d56ad2 100644 --- a/app/bundles/LeadBundle/Tests/Provider/FormAdjustmentsProviderTest.php +++ b/app/bundles/LeadBundle/Tests/Provider/FormAdjustmentsProviderTest.php @@ -17,17 +17,14 @@ final class FormAdjustmentsProviderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject&EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject&FormInterface */ - private $form; + private \PHPUnit\Framework\MockObject\MockObject $form; - /** - * @var FormAdjustmentsProvider - */ - private $provider; + private \Mautic\LeadBundle\Provider\FormAdjustmentsProvider $provider; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Provider/TypeOperatorProviderTest.php b/app/bundles/LeadBundle/Tests/Provider/TypeOperatorProviderTest.php index ff47651bbea..ca3079faa75 100644 --- a/app/bundles/LeadBundle/Tests/Provider/TypeOperatorProviderTest.php +++ b/app/bundles/LeadBundle/Tests/Provider/TypeOperatorProviderTest.php @@ -18,17 +18,14 @@ final class TypeOperatorProviderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|FilterOperatorProviderInterface */ - private $filterOperatorPovider; + private \PHPUnit\Framework\MockObject\MockObject $filterOperatorPovider; - /** - * @var TypeOperatorProvider - */ - private $provider; + private \Mautic\LeadBundle\Provider\TypeOperatorProvider $provider; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Segment/ContactSegmentFilterTest.php b/app/bundles/LeadBundle/Tests/Segment/ContactSegmentFilterTest.php index 3e563256d09..e1a16a93c25 100644 --- a/app/bundles/LeadBundle/Tests/Segment/ContactSegmentFilterTest.php +++ b/app/bundles/LeadBundle/Tests/Segment/ContactSegmentFilterTest.php @@ -18,25 +18,22 @@ class ContactSegmentFilterTest extends TestCase { - /** - * @var ContactSegmentFilterCrate - */ - private $contactSegmentFilterCrate; + private \Mautic\LeadBundle\Segment\ContactSegmentFilterCrate $contactSegmentFilterCrate; /** * @var BaseDecorator|MockObject */ - private $filterDecorator; + private \PHPUnit\Framework\MockObject\MockObject $filterDecorator; /** * @var TableSchemaColumnsCache|MockObject */ - private $tableSchemaColumnCache; + private \PHPUnit\Framework\MockObject\MockObject $tableSchemaColumnCache; /** * @var FilterQueryBuilderInterface&MockObject */ - private $filterQueryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $filterQueryBuilder; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php b/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php index c9ff506a03c..b3ab6e415d8 100644 --- a/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php +++ b/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php @@ -20,37 +20,31 @@ class DecoratorFactoryTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|EventDispatcherInterface */ - private $eventDispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcherMock; - /** - * @var ContactSegmentFilterDictionary - */ - private $contactSegmentFilterDictionary; + private \Mautic\LeadBundle\Services\ContactSegmentFilterDictionary $contactSegmentFilterDictionary; /** * @var MockObject|BaseDecorator */ - private $baseDecorator; + private \PHPUnit\Framework\MockObject\MockObject $baseDecorator; /** * @var MockObject|CustomMappedDecorator */ - private $customMappedDecorator; + private \PHPUnit\Framework\MockObject\MockObject $customMappedDecorator; /** * @var MockObject|CompanyDecorator */ - private $companyDecorator; + private \PHPUnit\Framework\MockObject\MockObject $companyDecorator; /** * @var MockObject|DateOptionFactory */ - private $dateOptionFactory; + private \PHPUnit\Framework\MockObject\MockObject $dateOptionFactory; - /** - * @var DecoratorFactory - */ - private $decoratorFactory; + private \Mautic\LeadBundle\Segment\Decorator\DecoratorFactory $decoratorFactory; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ChannelClickQueryBuilderTest.php b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ChannelClickQueryBuilderTest.php index 332436e98a3..6432ee8343f 100644 --- a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ChannelClickQueryBuilderTest.php +++ b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ChannelClickQueryBuilderTest.php @@ -26,22 +26,19 @@ class ChannelClickQueryBuilderTest extends TestCase /** * @var MockObject|RandomParameterName */ - private $randomParameterMock; + private \PHPUnit\Framework\MockObject\MockObject $randomParameterMock; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $dispatcherMock; /** * @var Connection|MockObject */ - private $connectionMock; + private \PHPUnit\Framework\MockObject\MockObject $connectionMock; - /** - * @var ChannelClickQueryBuilder - */ - private $queryBuilder; + private \Mautic\LeadBundle\Segment\Query\Filter\ChannelClickQueryBuilder $queryBuilder; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ForeignValueFilterQueryBuilderTest.php b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ForeignValueFilterQueryBuilderTest.php index 20e42690d80..5514bd02e77 100644 --- a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ForeignValueFilterQueryBuilderTest.php +++ b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/ForeignValueFilterQueryBuilderTest.php @@ -29,14 +29,14 @@ class ForeignValueFilterQueryBuilderTest extends TestCase /** * @var EventDispatcherInterface&MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; private ForeignValueFilterQueryBuilder $queryBuilder; /** * @var Connection&MockObject */ - private $connectionMock; + private \PHPUnit\Framework\MockObject\MockObject $connectionMock; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/SegmentReferenceFilterQueryBuilderTest.php b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/SegmentReferenceFilterQueryBuilderTest.php index 4ba39ee5941..6b36c68963f 100644 --- a/app/bundles/LeadBundle/Tests/Segment/Query/Filter/SegmentReferenceFilterQueryBuilderTest.php +++ b/app/bundles/LeadBundle/Tests/Segment/Query/Filter/SegmentReferenceFilterQueryBuilderTest.php @@ -30,27 +30,21 @@ class SegmentReferenceFilterQueryBuilderTest extends MauticMysqlTestCase /** * @var MockObject|RandomParameterName */ - private $randomParameterMock; + private \PHPUnit\Framework\MockObject\MockObject $randomParameterMock; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $dispatcherMock; /** * @var Connection|MockObject */ - private $connectionMock; + private \PHPUnit\Framework\MockObject\MockObject $connectionMock; - /** - * @var SegmentReferenceFilterQueryBuilder - */ - private $queryBuilder; + private \Mautic\LeadBundle\Segment\Query\Filter\SegmentReferenceFilterQueryBuilder $queryBuilder; - /** - * @var LeadList - */ - private $segment; + private \Mautic\LeadBundle\Entity\LeadList $segment; public function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php b/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php index cf26f75e33b..3f0168186c9 100644 --- a/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php +++ b/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php @@ -28,52 +28,49 @@ class ContactTrackerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|LeadRepository */ - private $leadRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadRepositoryMock; /** * @var MockObject|ContactTrackingServiceInterface */ - private $contactTrackingServiceMock; + private \PHPUnit\Framework\MockObject\MockObject $contactTrackingServiceMock; /** * @var MockObject|DeviceTracker */ - private $deviceTrackerMock; + private \PHPUnit\Framework\MockObject\MockObject $deviceTrackerMock; /** * @var MockObject|CorePermissions */ - private $securityMock; + private \PHPUnit\Framework\MockObject\MockObject $securityMock; /** * @var MockObject|Logger */ - private $loggerMock; + private \PHPUnit\Framework\MockObject\MockObject $loggerMock; /** * @var MockObject|IpLookupHelper */ - private $ipLookupHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelperMock; - /** - * @var RequestStack - */ - private $requestStack; + private \Symfony\Component\HttpFoundation\RequestStack $requestStack; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelperMock; /** * @var MockObject|EventDispatcher */ - private $dispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $dispatcherMock; /** * @var MockObject|FieldModel */ - private $leadFieldModelMock; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModelMock; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php b/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php index e8b35127ad2..bef58bf05ae 100644 --- a/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php +++ b/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php @@ -17,25 +17,19 @@ class DeviceTrackerTest extends \PHPUnit\Framework\TestCase { - /** - * @var DeviceCreatorService - */ - private $deviceCreatorService; + private \Mautic\LeadBundle\Tracker\Service\DeviceCreatorService\DeviceCreatorService $deviceCreatorService; - /** - * @var DeviceDetectorFactory - */ - private $deviceDetectorFactory; + private \Mautic\LeadBundle\Tracker\Factory\DeviceDetectorFactory\DeviceDetectorFactory $deviceDetectorFactory; /** * @var DeviceTrackingServiceInterface */ - private $deviceTrackingService; + private \PHPUnit\Framework\MockObject\MockObject $deviceTrackingService; /** * @var Logger */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** * @var string diff --git a/app/bundles/LeadBundle/Tests/Tracker/Service/ContactTrackingService/ContactTrackingServiceTest.php b/app/bundles/LeadBundle/Tests/Tracker/Service/ContactTrackingService/ContactTrackingServiceTest.php index 7a15f281b94..ee82497861a 100644 --- a/app/bundles/LeadBundle/Tests/Tracker/Service/ContactTrackingService/ContactTrackingServiceTest.php +++ b/app/bundles/LeadBundle/Tests/Tracker/Service/ContactTrackingService/ContactTrackingServiceTest.php @@ -19,27 +19,27 @@ final class ContactTrackingServiceTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|CookieHelper */ - private $cookieHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $cookieHelperMock; /** * @var MockObject|LeadDeviceRepository */ - private $leadDeviceRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadDeviceRepositoryMock; /** * @var MockObject|LeadRepository */ - private $leadRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadRepositoryMock; /** * @var MockObject|RequestStack */ - private $requestStackMock; + private \PHPUnit\Framework\MockObject\MockObject $requestStackMock; /** * @var MockObject|MergeRecordRepository */ - private $mergeRecordRepository; + private \PHPUnit\Framework\MockObject\MockObject $mergeRecordRepository; protected function setUp(): void { diff --git a/app/bundles/LeadBundle/Tests/Tracker/Service/DeviceTrackingService/DeviceTrackingServiceTest.php b/app/bundles/LeadBundle/Tests/Tracker/Service/DeviceTrackingService/DeviceTrackingServiceTest.php index ff2888d6b63..e689fa079f2 100644 --- a/app/bundles/LeadBundle/Tests/Tracker/Service/DeviceTrackingService/DeviceTrackingServiceTest.php +++ b/app/bundles/LeadBundle/Tests/Tracker/Service/DeviceTrackingService/DeviceTrackingServiceTest.php @@ -12,41 +12,22 @@ use Mautic\LeadBundle\Entity\LeadDevice; use Mautic\LeadBundle\Entity\LeadDeviceRepository; use Mautic\LeadBundle\Tracker\Service\DeviceTrackingService\DeviceTrackingService; -use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; final class DeviceTrackingServiceTest extends \PHPUnit\Framework\TestCase { - /** - * @var MockObject - */ - private $cookieHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $cookieHelperMock; - /** - * @var MockObject - */ - private $entityManagerMock; + private \PHPUnit\Framework\MockObject\MockObject $entityManagerMock; - /** - * @var MockObject - */ - private $randomHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $randomHelperMock; - /** - * @var MockObject - */ - private $leadDeviceRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $leadDeviceRepositoryMock; - /** - * @var MockObject - */ - private $requestStackMock; + private \PHPUnit\Framework\MockObject\MockObject $requestStackMock; - /** - * @var MockObject - */ - private $security; + private \PHPUnit\Framework\MockObject\MockObject $security; protected function setUp(): void { diff --git a/app/bundles/MarketplaceBundle/Tests/Functional/Command/InstallCommandTest.php b/app/bundles/MarketplaceBundle/Tests/Functional/Command/InstallCommandTest.php index 4ad3b7766f3..c1d41d3babb 100644 --- a/app/bundles/MarketplaceBundle/Tests/Functional/Command/InstallCommandTest.php +++ b/app/bundles/MarketplaceBundle/Tests/Functional/Command/InstallCommandTest.php @@ -19,12 +19,12 @@ final class InstallCommandTest extends AbstractMauticTestCase /** * @var MockObject&ComposerHelper */ - private $composerHelper; + private \PHPUnit\Framework\MockObject\MockObject $composerHelper; /** * @var MockObject&PackageModel */ - private $packageModel; + private \PHPUnit\Framework\MockObject\MockObject $packageModel; private string $packageName; diff --git a/app/bundles/MarketplaceBundle/Tests/Functional/Command/RemoveCommandTest.php b/app/bundles/MarketplaceBundle/Tests/Functional/Command/RemoveCommandTest.php index 491adcbc4d8..be062a2d72e 100644 --- a/app/bundles/MarketplaceBundle/Tests/Functional/Command/RemoveCommandTest.php +++ b/app/bundles/MarketplaceBundle/Tests/Functional/Command/RemoveCommandTest.php @@ -17,7 +17,7 @@ final class RemoveCommandTest extends AbstractMauticTestCase /** * @var MockObject&LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; private string $packageName; public function setUp(): void diff --git a/app/bundles/PageBundle/Tests/Controller/PublicControllerTest.php b/app/bundles/PageBundle/Tests/Controller/PublicControllerTest.php index f0fb152a303..347823d3b83 100644 --- a/app/bundles/PageBundle/Tests/Controller/PublicControllerTest.php +++ b/app/bundles/PageBundle/Tests/Controller/PublicControllerTest.php @@ -50,40 +50,39 @@ class PublicControllerTest extends MauticMysqlTestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|Container */ - private $internalContainer; + private \PHPUnit\Framework\MockObject\MockObject $internalContainer; /** @var \Psr\Log\LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; /** @var ModelFactory&MockObject */ - private $modelFactory; + private \PHPUnit\Framework\MockObject\MockObject $modelFactory; /** @var RedirectModel */ - private $redirectModel; + private \PHPUnit\Framework\MockObject\MockObject $redirectModel; /** @var Redirect */ - private $redirect; + private \PHPUnit\Framework\MockObject\MockObject $redirect; - /** @var Request */ - private $request; + private \Symfony\Component\HttpFoundation\Request $request; /** @var IpLookupHelper */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** @var IpAddress */ - private $ipAddress; + private \PHPUnit\Framework\MockObject\MockObject $ipAddress; /** @var LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** @var PageModel */ - private $pageModel; + private \PHPUnit\Framework\MockObject\MockObject $pageModel; /** @var PrimaryCompanyHelper */ - private $primaryCompanyHelper; + private \PHPUnit\Framework\MockObject\MockObject $primaryCompanyHelper; /** @var ContactRequestHelper&MockObject */ - private $contactRequestHelper; + private \PHPUnit\Framework\MockObject\MockObject $contactRequestHelper; protected function setUp(): void { diff --git a/app/bundles/PageBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php b/app/bundles/PageBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php index 6b7861d81e1..a085b0edbd9 100644 --- a/app/bundles/PageBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php +++ b/app/bundles/PageBundle/Tests/EventListener/DetermineWinnerSubscriberTest.php @@ -18,17 +18,14 @@ class DetermineWinnerSubscriberTest extends TestCase /** * @var MockObject|HitRepository */ - private $hitRepository; + private \PHPUnit\Framework\MockObject\MockObject $hitRepository; /** * @var MockObject|TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var DetermineWinnerSubscriber - */ - private $subscriber; + private \Mautic\PageBundle\EventListener\DetermineWinnerSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php b/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php index 507ab3a8dfc..45ba3157e41 100644 --- a/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php +++ b/app/bundles/PageBundle/Tests/EventListener/ReportSubscriberTest.php @@ -21,22 +21,19 @@ class ReportSubscriberTest extends TestCase /** * @var CompanyReportData|\PHPUnit\Framework\MockObject\MockObject */ - private $companyReportData; + private \PHPUnit\Framework\MockObject\MockObject $companyReportData; /** * @var HitRepository|\PHPUnit\Framework\MockObject\MockObject */ - private $hitRepository; + private \PHPUnit\Framework\MockObject\MockObject $hitRepository; /** * @var TranslatorInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; - /** - * @var ReportSubscriber - */ - private $subscriber; + private \Mautic\PageBundle\EventListener\ReportSubscriber $subscriber; public function setUp(): void { diff --git a/app/bundles/PageBundle/Tests/Form/Type/PageListTypeTest.php b/app/bundles/PageBundle/Tests/Form/Type/PageListTypeTest.php index 08ad397e40a..581289058b2 100644 --- a/app/bundles/PageBundle/Tests/Form/Type/PageListTypeTest.php +++ b/app/bundles/PageBundle/Tests/Form/Type/PageListTypeTest.php @@ -12,8 +12,8 @@ class PageListTypeTest extends TestCase { - private $page; - private $pageModelMock; + private \Mautic\PageBundle\Form\Type\PageListType $page; + private \PHPUnit\Framework\MockObject\MockObject $pageModelMock; public function setUp(): void { diff --git a/app/bundles/PageBundle/Tests/Form/Type/RedirectListTypeTest.php b/app/bundles/PageBundle/Tests/Form/Type/RedirectListTypeTest.php index c8ca76f90d4..42f12d2bb7f 100644 --- a/app/bundles/PageBundle/Tests/Form/Type/RedirectListTypeTest.php +++ b/app/bundles/PageBundle/Tests/Form/Type/RedirectListTypeTest.php @@ -14,12 +14,9 @@ class RedirectListTypeTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; - /** - * @var RedirectListType - */ - private $form; + private \Mautic\PageBundle\Form\Type\RedirectListType $form; public function setUp(): void { diff --git a/app/bundles/PageBundle/Tests/Model/Tracking404ModelTest.php b/app/bundles/PageBundle/Tests/Model/Tracking404ModelTest.php index 63ac736bf04..732b5534963 100644 --- a/app/bundles/PageBundle/Tests/Model/Tracking404ModelTest.php +++ b/app/bundles/PageBundle/Tests/Model/Tracking404ModelTest.php @@ -13,22 +13,22 @@ class Tracking404ModelTest extends \PHPUnit\Framework\TestCase /** * @var ContactTracker|\PHPUnit\Framework\MockObject\MockObject */ - private $mockContactTracker; + private \PHPUnit\Framework\MockObject\MockObject $mockContactTracker; /** * @var CoreParametersHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $mockCoreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $mockCoreParametersHelper; /** * @var PageModel|\PHPUnit\Framework\MockObject\MockObject */ - private $mockPageModel; + private \PHPUnit\Framework\MockObject\MockObject $mockPageModel; /** * @var Lead|\PHPUnit\Framework\MockObject\MockObject */ - private $lead; + private \Mautic\LeadBundle\Entity\Lead $lead; public function setUp(): void { diff --git a/app/bundles/PluginBundle/Tests/Helper/ReloadHelperTest.php b/app/bundles/PluginBundle/Tests/Helper/ReloadHelperTest.php index 3135af6f8f0..354bf85e3d0 100644 --- a/app/bundles/PluginBundle/Tests/Helper/ReloadHelperTest.php +++ b/app/bundles/PluginBundle/Tests/Helper/ReloadHelperTest.php @@ -15,32 +15,20 @@ class ReloadHelperTest extends \PHPUnit\Framework\TestCase { - private $factoryMock; + private \PHPUnit\Framework\MockObject\MockObject $factoryMock; - /** - * @var ReloadHelper - */ - private $helper; + private \Mautic\PluginBundle\Helper\ReloadHelper $helper; - /** - * @var array - */ - private $sampleAllPlugins = []; + private array $sampleAllPlugins = []; - /** - * @var array - */ - private $sampleMetaData = []; + private array $sampleMetaData = []; - /** - * @var array - */ - private $sampleSchemas = []; + private array $sampleSchemas = []; /** * @var MockObject&EventDispatcherInterface */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; protected function setUp(): void { diff --git a/app/bundles/PointBundle/Tests/Unit/Model/TriggerModelTest.php b/app/bundles/PointBundle/Tests/Unit/Model/TriggerModelTest.php index dccc1900109..0a5a16d3e8f 100644 --- a/app/bundles/PointBundle/Tests/Unit/Model/TriggerModelTest.php +++ b/app/bundles/PointBundle/Tests/Unit/Model/TriggerModelTest.php @@ -33,52 +33,49 @@ class TriggerModelTest extends \PHPUnit\Framework\TestCase /** * @var IpLookupHelper|MockObject */ - private $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; /** * @var LeadModel|MockObject */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var TriggerEventModel|MockObject */ - private $triggerEventModel; + private \PHPUnit\Framework\MockObject\MockObject $triggerEventModel; /** * @var MauticFactory|MockObject */ - private $mauticFactory; + private \PHPUnit\Framework\MockObject\MockObject $mauticFactory; /** * @var EventDispatcherInterface|MockObject */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var TranslatorInterface|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var EntityManager|MockObject */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var TriggerEventRepository|MockObject */ - private $triggerEventRepository; + private \PHPUnit\Framework\MockObject\MockObject $triggerEventRepository; - /** - * @var TriggerModel - */ - private $triggerModel; + private \Mautic\PointBundle\Model\TriggerModel $triggerModel; /** * @var ContactTracker */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; public function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Builder/MauticReportBuilderTest.php b/app/bundles/ReportBundle/Tests/Builder/MauticReportBuilderTest.php index 3309fd613f2..995dc33784b 100644 --- a/app/bundles/ReportBundle/Tests/Builder/MauticReportBuilderTest.php +++ b/app/bundles/ReportBundle/Tests/Builder/MauticReportBuilderTest.php @@ -23,17 +23,17 @@ final class MauticReportBuilderTest extends TestCase /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var MockObject|Connection */ - private $connection; + private \PHPUnit\Framework\MockObject\MockObject $connection; /** * @var MockObject|ChannelListHelper */ - private $channelListHelper; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Event/ReportGeneratorEventTest.php b/app/bundles/ReportBundle/Tests/Event/ReportGeneratorEventTest.php index 28c636cdbb8..eaee801f2ed 100644 --- a/app/bundles/ReportBundle/Tests/Event/ReportGeneratorEventTest.php +++ b/app/bundles/ReportBundle/Tests/Event/ReportGeneratorEventTest.php @@ -17,22 +17,19 @@ class ReportGeneratorEventTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Report */ - private $report; + private \PHPUnit\Framework\MockObject\MockObject $report; /** * @var MockObject|QueryBuilder */ - private $queryBuilder; + private \PHPUnit\Framework\MockObject\MockObject $queryBuilder; /** * @var MockObject|ChannelListHelper */ - private $channelListHelper; + private \Mautic\ChannelBundle\Helper\ChannelListHelper $channelListHelper; - /** - * @var ReportGeneratorEvent - */ - private $reportGeneratorEvent; + private \Mautic\ReportBundle\Event\ReportGeneratorEvent $reportGeneratorEvent; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Form/Type/FilterSelectorTypeTest.php b/app/bundles/ReportBundle/Tests/Form/Type/FilterSelectorTypeTest.php index c640ea145eb..09850803b5c 100644 --- a/app/bundles/ReportBundle/Tests/Form/Type/FilterSelectorTypeTest.php +++ b/app/bundles/ReportBundle/Tests/Form/Type/FilterSelectorTypeTest.php @@ -19,7 +19,7 @@ final class FilterSelectorTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; private FilterSelectorType $FilterSelectorType; protected function setUp(): void diff --git a/app/bundles/ReportBundle/Tests/Form/Type/ReportTypeTest.php b/app/bundles/ReportBundle/Tests/Form/Type/ReportTypeTest.php index d843be548e0..f108028e120 100644 --- a/app/bundles/ReportBundle/Tests/Form/Type/ReportTypeTest.php +++ b/app/bundles/ReportBundle/Tests/Form/Type/ReportTypeTest.php @@ -18,17 +18,14 @@ final class ReportTypeTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|ReportModel */ - private $reportModel; + private \PHPUnit\Framework\MockObject\MockObject $reportModel; /** * @var MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; - /** - * @var ReportType - */ - private $reportType; + private \Mautic\ReportBundle\Form\Type\ReportType $reportType; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Helper/ReportHelperTest.php b/app/bundles/ReportBundle/Tests/Helper/ReportHelperTest.php index 424c6e1cd66..4201fee90f1 100644 --- a/app/bundles/ReportBundle/Tests/Helper/ReportHelperTest.php +++ b/app/bundles/ReportBundle/Tests/Helper/ReportHelperTest.php @@ -10,10 +10,7 @@ final class ReportHelperTest extends TestCase { - /** - * @var ReportHelper - */ - private $reportHelper; + private \Mautic\ReportBundle\Helper\ReportHelper $reportHelper; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Model/ReportModelTest.php b/app/bundles/ReportBundle/Tests/Model/ReportModelTest.php index 036670feb26..31813c7c52d 100644 --- a/app/bundles/ReportBundle/Tests/Model/ReportModelTest.php +++ b/app/bundles/ReportBundle/Tests/Model/ReportModelTest.php @@ -24,10 +24,7 @@ class ReportModelTest extends \PHPUnit\Framework\TestCase { - /** - * @var ReportModel - */ - private $reportModel; + private \Mautic\ReportBundle\Model\ReportModel $reportModel; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Model/ScheduleModelTest.php b/app/bundles/ReportBundle/Tests/Model/ScheduleModelTest.php index 79402de5273..442ba18b99b 100644 --- a/app/bundles/ReportBundle/Tests/Model/ScheduleModelTest.php +++ b/app/bundles/ReportBundle/Tests/Model/ScheduleModelTest.php @@ -16,27 +16,24 @@ class ScheduleModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|SchedulerRepository */ - private $schedulerRepository; + private \PHPUnit\Framework\MockObject\MockObject $schedulerRepository; /** * @var MockObject|EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject|SchedulerPlanner */ - private $schedulerPlanner; + private \PHPUnit\Framework\MockObject\MockObject $schedulerPlanner; /** * @var MockObject|ExportOption */ - private $exportOption; + private \PHPUnit\Framework\MockObject\MockObject $exportOption; - /** - * @var ScheduleModel - */ - private $scheduleModel; + private \Mautic\ReportBundle\Model\ScheduleModel $scheduleModel; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Scheduler/Date/DateBuilderTest.php b/app/bundles/ReportBundle/Tests/Scheduler/Date/DateBuilderTest.php index 7ca7f78ae57..25ce51f93fe 100644 --- a/app/bundles/ReportBundle/Tests/Scheduler/Date/DateBuilderTest.php +++ b/app/bundles/ReportBundle/Tests/Scheduler/Date/DateBuilderTest.php @@ -17,12 +17,9 @@ class DateBuilderTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|SchedulerBuilder */ - private $schedulerBuilder; + private \PHPUnit\Framework\MockObject\MockObject $schedulerBuilder; - /** - * @var DateBuilder - */ - private $dateBuilder; + private \Mautic\ReportBundle\Scheduler\Date\DateBuilder $dateBuilder; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Scheduler/Model/FileHandlerTest.php b/app/bundles/ReportBundle/Tests/Scheduler/Model/FileHandlerTest.php index 57c5ec8b5ff..07fe8dc80f6 100644 --- a/app/bundles/ReportBundle/Tests/Scheduler/Model/FileHandlerTest.php +++ b/app/bundles/ReportBundle/Tests/Scheduler/Model/FileHandlerTest.php @@ -17,22 +17,19 @@ class FileHandlerTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|FilePathResolver */ - private $filePathResolver; + private \PHPUnit\Framework\MockObject\MockObject $filePathResolver; /** * @var MockObject|FileProperties */ - private $fileProperties; + private \PHPUnit\Framework\MockObject\MockObject $fileProperties; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; - /** - * @var FileHandler - */ - private $fileHandler; + private \Mautic\ReportBundle\Scheduler\Model\FileHandler $fileHandler; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Scheduler/Model/MessageScheduleTest.php b/app/bundles/ReportBundle/Tests/Scheduler/Model/MessageScheduleTest.php index d6b2246fddd..e38dba86151 100644 --- a/app/bundles/ReportBundle/Tests/Scheduler/Model/MessageScheduleTest.php +++ b/app/bundles/ReportBundle/Tests/Scheduler/Model/MessageScheduleTest.php @@ -16,32 +16,26 @@ class MessageScheduleTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|Router */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var MockObject|FileProperties */ - private $fileProperties; + private \PHPUnit\Framework\MockObject\MockObject $fileProperties; /** * @var MockObject|CoreParametersHelper */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var MockObject|TranslatorInterface */ - private $translatorMock; + private \PHPUnit\Framework\MockObject\MockObject $translatorMock; - /** - * @var Report - */ - private $report; + private \Mautic\ReportBundle\Entity\Report $report; - /** - * @var MessageSchedule - */ - private $messageSchedule; + private \Mautic\ReportBundle\Scheduler\Model\MessageSchedule $messageSchedule; protected function setUp(): void { diff --git a/app/bundles/ReportBundle/Tests/Scheduler/Model/SendScheduleTest.php b/app/bundles/ReportBundle/Tests/Scheduler/Model/SendScheduleTest.php index f88c36bd51c..a97db68a5c9 100644 --- a/app/bundles/ReportBundle/Tests/Scheduler/Model/SendScheduleTest.php +++ b/app/bundles/ReportBundle/Tests/Scheduler/Model/SendScheduleTest.php @@ -13,35 +13,26 @@ class SendScheduleTest extends \PHPUnit\Framework\TestCase { - /** - * @var Report - */ - private $report; + private \Mautic\ReportBundle\Entity\Report $report; - /** - * @var Scheduler - */ - private $scheduler; + private \Mautic\ReportBundle\Entity\Scheduler $scheduler; - /** - * @var SendSchedule - */ - private $sendSchedule; + private \Mautic\ReportBundle\Scheduler\Model\SendSchedule $sendSchedule; /** * @var MockObject|MailHelper */ - private $mailHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $mailHelperMock; /** * @var MockObject|MessageSchedule */ - private $messageSchedule; + private \PHPUnit\Framework\MockObject\MockObject $messageSchedule; /** * @var MockObject|FileHandler */ - private $fileHandler; + private \PHPUnit\Framework\MockObject\MockObject $fileHandler; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/EventListener/CampaignSendSubscriberTest.php b/app/bundles/SmsBundle/Tests/EventListener/CampaignSendSubscriberTest.php index 15267f8cdb6..4cb51462062 100644 --- a/app/bundles/SmsBundle/Tests/EventListener/CampaignSendSubscriberTest.php +++ b/app/bundles/SmsBundle/Tests/EventListener/CampaignSendSubscriberTest.php @@ -20,12 +20,12 @@ class CampaignSendSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|SmsModel */ - private $smsModel; + private \PHPUnit\Framework\MockObject\MockObject $smsModel; /** * @var MockObject|TransportChain */ - private $transportChain; + private \PHPUnit\Framework\MockObject\MockObject $transportChain; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/EventListener/StopSubscriberTest.php b/app/bundles/SmsBundle/Tests/EventListener/StopSubscriberTest.php index 06fc18a4e09..756df9d728b 100644 --- a/app/bundles/SmsBundle/Tests/EventListener/StopSubscriberTest.php +++ b/app/bundles/SmsBundle/Tests/EventListener/StopSubscriberTest.php @@ -13,7 +13,7 @@ class StopSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|DoNotContact */ - private $doNotContactModel; + private \PHPUnit\Framework\MockObject\MockObject $doNotContactModel; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/EventListener/TrackingSubscriberTest.php b/app/bundles/SmsBundle/Tests/EventListener/TrackingSubscriberTest.php index c918ecb2e91..aae6d5c4d18 100644 --- a/app/bundles/SmsBundle/Tests/EventListener/TrackingSubscriberTest.php +++ b/app/bundles/SmsBundle/Tests/EventListener/TrackingSubscriberTest.php @@ -14,7 +14,7 @@ class TrackingSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var \PHPUnit\Framework\MockObject\MockObject|StatRepository */ - private $statRepository; + private \PHPUnit\Framework\MockObject\MockObject $statRepository; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/EventListener/WebhookSubscriberTest.php b/app/bundles/SmsBundle/Tests/EventListener/WebhookSubscriberTest.php index cbbff426619..6c1510286a0 100644 --- a/app/bundles/SmsBundle/Tests/EventListener/WebhookSubscriberTest.php +++ b/app/bundles/SmsBundle/Tests/EventListener/WebhookSubscriberTest.php @@ -17,12 +17,9 @@ final class WebhookSubscriberTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|WebhookModel */ - private $webhookModel; + private \PHPUnit\Framework\MockObject\MockObject $webhookModel; - /** - * @var WebhookSubscriber - */ - private $subscriber; + private \Mautic\SmsBundle\EventListener\WebhookSubscriber $subscriber; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/Helper/ReplyHelperTest.php b/app/bundles/SmsBundle/Tests/Helper/ReplyHelperTest.php index 4cd1602a755..44c9ba2f484 100644 --- a/app/bundles/SmsBundle/Tests/Helper/ReplyHelperTest.php +++ b/app/bundles/SmsBundle/Tests/Helper/ReplyHelperTest.php @@ -17,17 +17,14 @@ class ReplyHelperTest extends \PHPUnit\Framework\TestCase /** * @var EventDispatcherInterface|\PHPUnit\Framework\MockObject\MockObject */ - private $eventDispatcher; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcher; - /** - * @var NullLogger - */ - private $logger; + private \Psr\Log\NullLogger $logger; /** * @var ContactTracker|\PHPUnit\Framework\MockObject\MockObject */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/Integration/Twilio/ConfigurationTest.php b/app/bundles/SmsBundle/Tests/Integration/Twilio/ConfigurationTest.php index dca911cd983..e1f19595d71 100644 --- a/app/bundles/SmsBundle/Tests/Integration/Twilio/ConfigurationTest.php +++ b/app/bundles/SmsBundle/Tests/Integration/Twilio/ConfigurationTest.php @@ -13,12 +13,12 @@ class ConfigurationTest extends \PHPUnit\Framework\TestCase /** * @var IntegrationHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $integrationHelper; + private \PHPUnit\Framework\MockObject\MockObject $integrationHelper; /** * @var AbstractIntegration|\PHPUnit\Framework\MockObject\MockObject */ - private $integrationObject; + private \PHPUnit\Framework\MockObject\MockObject $integrationObject; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioCallbackTest.php b/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioCallbackTest.php index 2a3f9d64eae..1a7b2de03a4 100644 --- a/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioCallbackTest.php +++ b/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioCallbackTest.php @@ -14,12 +14,12 @@ class TwilioCallbackTest extends \PHPUnit\Framework\TestCase /** * @var ContactHelper|\PHPUnit\Framework\MockObject\MockObject */ - private $contactHelper; + private \PHPUnit\Framework\MockObject\MockObject $contactHelper; /** * @var Configuration|\PHPUnit\Framework\MockObject\MockObject */ - private $configuration; + private \PHPUnit\Framework\MockObject\MockObject $configuration; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioTransportTest.php b/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioTransportTest.php index 9cb4110b4ec..b4a6c1f180a 100644 --- a/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioTransportTest.php +++ b/app/bundles/SmsBundle/Tests/Integration/Twilio/TwilioTransportTest.php @@ -19,7 +19,7 @@ class TwilioTransportTest extends TestCase /** * @var MockObject&\Monolog\Logger */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; protected function setUp(): void { diff --git a/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php b/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php index fb5df151c7a..75bca08a3ac 100644 --- a/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php +++ b/app/bundles/SmsBundle/Tests/Model/SmsModelTest.php @@ -29,32 +29,32 @@ class SmsModelTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|CacheStorageHelper */ - private $cacheStorageHelper; + private \PHPUnit\Framework\MockObject\MockObject $cacheStorageHelper; /** * @var MockObject|EntityManager */ - private $entityManger; + private \PHPUnit\Framework\MockObject\MockObject $entityManger; /** * @var MockObject|LeadModel */ - private $leadModel; + private \PHPUnit\Framework\MockObject\MockObject $leadModel; /** * @var MockObject|MessageQueueModel */ - private $messageQueueModel; + private \PHPUnit\Framework\MockObject\MockObject $messageQueueModel; /** * @var MockObject|TrackableModel */ - private $pageTrackableModel; + private \PHPUnit\Framework\MockObject\MockObject $pageTrackableModel; /** * @var MockObject|TransportChain */ - private $transport; + private \PHPUnit\Framework\MockObject\MockObject $transport; /** * @var MockObject&CorePermissions diff --git a/app/bundles/SmsBundle/Tests/Sms/TransportChainTest.php b/app/bundles/SmsBundle/Tests/Sms/TransportChainTest.php index ec311fc1e57..d1e657395f4 100644 --- a/app/bundles/SmsBundle/Tests/Sms/TransportChainTest.php +++ b/app/bundles/SmsBundle/Tests/Sms/TransportChainTest.php @@ -14,12 +14,12 @@ class TransportChainTest extends MauticMysqlTestCase /** * @var TransportChain|MockObject */ - private $transportChain; + private \Mautic\SmsBundle\Sms\TransportChain $transportChain; /** * @var TransportInterface|MockObject */ - private $twilioTransport; + private \PHPUnit\Framework\MockObject\MockObject $twilioTransport; /** * Call protected/private method of a class. diff --git a/app/bundles/StatsBundle/Tests/Aggregate/Collection/CollectorTest.php b/app/bundles/StatsBundle/Tests/Aggregate/Collection/CollectorTest.php index 40cfe1ee6c2..6982f7fe602 100644 --- a/app/bundles/StatsBundle/Tests/Aggregate/Collection/CollectorTest.php +++ b/app/bundles/StatsBundle/Tests/Aggregate/Collection/CollectorTest.php @@ -7,14 +7,10 @@ use Mautic\StatsBundle\StatEvents; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; class CollectorTest extends TestCase { - /** - * @var EventDispatcherInterface|\PHPUnit_Framework_MockObject_MockObject - */ - private $eventDispatcher; + private \Symfony\Component\EventDispatcher\EventDispatcher $eventDispatcher; protected function setUp(): void { diff --git a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/DayStatTest.php b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/DayStatTest.php index 8740da1f0cd..5d4f4263bfd 100644 --- a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/DayStatTest.php +++ b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/DayStatTest.php @@ -10,7 +10,7 @@ class DayStatTest extends TestCase { private $day = '2019-11-07'; private $hour = 11; - private $dayStat; + private \Mautic\StatsBundle\Aggregate\Collection\Stats\DayStat $dayStat; private $hourStat; protected function setUp(): void diff --git a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/MonthStatTest.php b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/MonthStatTest.php index efa86015e12..c80f7d72f92 100644 --- a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/MonthStatTest.php +++ b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/MonthStatTest.php @@ -10,7 +10,7 @@ class MonthStatTest extends TestCase { private $month = '2019-12'; private $day = 11; - private $monthStat; + private \Mautic\StatsBundle\Aggregate\Collection\Stats\MonthStat $monthStat; private $dayStat; protected function setUp(): void diff --git a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/YearStatTest.php b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/YearStatTest.php index ff8da7179fb..68bdc194c68 100644 --- a/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/YearStatTest.php +++ b/app/bundles/StatsBundle/Tests/Aggregate/Collection/Stats/YearStatTest.php @@ -10,7 +10,7 @@ class YearStatTest extends TestCase { private $year = '2019'; private $month = 11; - private $yearStat; + private \Mautic\StatsBundle\Aggregate\Collection\Stats\YearStat $yearStat; private $monthStat; protected function setUp(): void diff --git a/app/bundles/UserBundle/Tests/EventListener/ConfigSubscriberTest.php b/app/bundles/UserBundle/Tests/EventListener/ConfigSubscriberTest.php index 66023b7f039..8ecfe274b41 100644 --- a/app/bundles/UserBundle/Tests/EventListener/ConfigSubscriberTest.php +++ b/app/bundles/UserBundle/Tests/EventListener/ConfigSubscriberTest.php @@ -13,7 +13,7 @@ class ConfigSubscriberTest extends TestCase /** * @var ConfigEvent|MockObject */ - private $configEvent; + private \PHPUnit\Framework\MockObject\MockObject $configEvent; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/EventListener/SAMLSubscriberTest.php b/app/bundles/UserBundle/Tests/EventListener/SAMLSubscriberTest.php index cdd66d6b504..3cea1b10c7c 100644 --- a/app/bundles/UserBundle/Tests/EventListener/SAMLSubscriberTest.php +++ b/app/bundles/UserBundle/Tests/EventListener/SAMLSubscriberTest.php @@ -17,17 +17,17 @@ class SAMLSubscriberTest extends TestCase /** * @var RequestEvent|MockObject */ - private $event; + private \PHPUnit\Framework\MockObject\MockObject $event; /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; /** * @var Router|MockObject */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Model/UserModelTest.php b/app/bundles/UserBundle/Tests/Model/UserModelTest.php index 34eb353ad5e..7a33d197450 100644 --- a/app/bundles/UserBundle/Tests/Model/UserModelTest.php +++ b/app/bundles/UserBundle/Tests/Model/UserModelTest.php @@ -27,42 +27,42 @@ class UserModelTest extends TestCase /** * @var MockObject&MailHelper */ - private $mailHelper; + private \PHPUnit\Framework\MockObject\MockObject $mailHelper; /** * @var MockObject&EntityManager */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** * @var MockObject&Router */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var MockObject&TranslatorInterface */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var MockObject&User */ - private $user; + private \PHPUnit\Framework\MockObject\MockObject $user; /** * @var MockObject&UserToken */ - private $userToken; + private \PHPUnit\Framework\MockObject\MockObject $userToken; /** * @var MockObject&UserTokenServiceInterface */ - private $userTokenService; + private \PHPUnit\Framework\MockObject\MockObject $userTokenService; /** * @var MockObject&LoggerInterface */ - private $logger; + private \PHPUnit\Framework\MockObject\MockObject $logger; public function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Model/UserToken/UserTokenServiceTest.php b/app/bundles/UserBundle/Tests/Model/UserToken/UserTokenServiceTest.php index 8f23d6b1b0f..895c504ba30 100644 --- a/app/bundles/UserBundle/Tests/Model/UserToken/UserTokenServiceTest.php +++ b/app/bundles/UserBundle/Tests/Model/UserToken/UserTokenServiceTest.php @@ -16,12 +16,12 @@ class UserTokenServiceTest extends \PHPUnit\Framework\TestCase /** * @var MockObject|RandomHelperInterface */ - private $randomHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $randomHelperMock; /** * @var MockObject|UserTokenRepositoryInterface */ - private $userTokenRepositoryMock; + private \PHPUnit\Framework\MockObject\MockObject $userTokenRepositoryMock; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Security/Firewall/AuthenticationListenerTest.php b/app/bundles/UserBundle/Tests/Security/Firewall/AuthenticationListenerTest.php index 893839d134f..d0932338e32 100644 --- a/app/bundles/UserBundle/Tests/Security/Firewall/AuthenticationListenerTest.php +++ b/app/bundles/UserBundle/Tests/Security/Firewall/AuthenticationListenerTest.php @@ -22,20 +22,19 @@ class AuthenticationListenerTest extends TestCase { - /** @var AuthenticationListener */ - private $authenticationListener; + private \Mautic\UserBundle\Security\Firewall\AuthenticationListener $authenticationListener; /** @var TokenStorageInterface */ - private $tokenStorage; + private \PHPUnit\Framework\MockObject\MockObject $tokenStorage; /** @var EntityManagerInterface */ - private $entityManager; + private \PHPUnit\Framework\MockObject\MockObject $entityManager; /** @var ObjectRepository&MockObject */ - private $objectRepository; + private \PHPUnit\Framework\MockObject\MockObject $objectRepository; /** @var OAuthToken */ - private $token; + private \PHPUnit\Framework\MockObject\MockObject $token; /** @var AccessToken */ private $accessToken; diff --git a/app/bundles/UserBundle/Tests/Security/SAML/Store/CredentialsStoreTest.php b/app/bundles/UserBundle/Tests/Security/SAML/Store/CredentialsStoreTest.php index 9e199f15b3f..412fef25fb5 100644 --- a/app/bundles/UserBundle/Tests/Security/SAML/Store/CredentialsStoreTest.php +++ b/app/bundles/UserBundle/Tests/Security/SAML/Store/CredentialsStoreTest.php @@ -15,7 +15,7 @@ class CredentialsStoreTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Security/SAML/Store/EntityDescriptorStoreTest.php b/app/bundles/UserBundle/Tests/Security/SAML/Store/EntityDescriptorStoreTest.php index 72f1b951f6b..ceea171576c 100644 --- a/app/bundles/UserBundle/Tests/Security/SAML/Store/EntityDescriptorStoreTest.php +++ b/app/bundles/UserBundle/Tests/Security/SAML/Store/EntityDescriptorStoreTest.php @@ -12,7 +12,7 @@ class EntityDescriptorStoreTest extends TestCase /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Security/SAML/Store/IdStoreTest.php b/app/bundles/UserBundle/Tests/Security/SAML/Store/IdStoreTest.php index 711568cce07..4fb41304f73 100644 --- a/app/bundles/UserBundle/Tests/Security/SAML/Store/IdStoreTest.php +++ b/app/bundles/UserBundle/Tests/Security/SAML/Store/IdStoreTest.php @@ -14,17 +14,14 @@ class IdStoreTest extends TestCase /** * @var ObjectManager|MockObject */ - private $manager; + private \PHPUnit\Framework\MockObject\MockObject $manager; /** * @var TimeProviderInterface|MockObject */ - private $timeProvider; + private \PHPUnit\Framework\MockObject\MockObject $timeProvider; - /** - * @var IdStore - */ - private $store; + private \Mautic\UserBundle\Security\SAML\Store\IdStore $store; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Security/SAML/Store/TrustOptionsStoreTest.php b/app/bundles/UserBundle/Tests/Security/SAML/Store/TrustOptionsStoreTest.php index 46c10df80ad..5d8c778511f 100644 --- a/app/bundles/UserBundle/Tests/Security/SAML/Store/TrustOptionsStoreTest.php +++ b/app/bundles/UserBundle/Tests/Security/SAML/Store/TrustOptionsStoreTest.php @@ -12,12 +12,9 @@ class TrustOptionsStoreTest extends TestCase { /** * @var CoreParametersHelper|MockObject */ - private $coreParametersHelper; + private \PHPUnit\Framework\MockObject\MockObject $coreParametersHelper; - /** - * @var TrustOptionsStore - */ - private $store; + private \Mautic\UserBundle\Security\SAML\Store\TrustOptionsStore $store; protected function setUp(): void { diff --git a/app/bundles/UserBundle/Tests/Security/SAML/User/UserMapperTest.php b/app/bundles/UserBundle/Tests/Security/SAML/User/UserMapperTest.php index 509553f0592..982051fc7fa 100644 --- a/app/bundles/UserBundle/Tests/Security/SAML/User/UserMapperTest.php +++ b/app/bundles/UserBundle/Tests/Security/SAML/User/UserMapperTest.php @@ -12,15 +12,12 @@ class UserMapperTest extends TestCase { - /** - * @var UserMapper - */ - private $mapper; + private \Mautic\UserBundle\Security\SAML\User\UserMapper $mapper; /** * @var Response|MockObject */ - private $response; + private \PHPUnit\Framework\MockObject\MockObject $response; protected function setUp(): void { diff --git a/app/bundles/WebhookBundle/Tests/EventListener/WebhookSubscriberTest.php b/app/bundles/WebhookBundle/Tests/EventListener/WebhookSubscriberTest.php index 3ef3e14c8f6..144577b73e9 100644 --- a/app/bundles/WebhookBundle/Tests/EventListener/WebhookSubscriberTest.php +++ b/app/bundles/WebhookBundle/Tests/EventListener/WebhookSubscriberTest.php @@ -12,9 +12,9 @@ class WebhookSubscriberTest extends \PHPUnit\Framework\TestCase { - private $ipLookupHelper; - private $auditLogModel; - private $webhookKillNotificator; + private \PHPUnit\Framework\MockObject\MockObject $ipLookupHelper; + private \PHPUnit\Framework\MockObject\MockObject $auditLogModel; + private \PHPUnit\Framework\MockObject\MockObject $webhookKillNotificator; protected function setUp(): void { diff --git a/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php b/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php index d5a4784aece..905314562da 100644 --- a/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php +++ b/app/bundles/WebhookBundle/Tests/Helper/CampaignHelperTest.php @@ -15,30 +15,24 @@ class CampaignHelperTest extends \PHPUnit\Framework\TestCase { - private $contact; + private \PHPUnit\Framework\MockObject\MockObject $contact; /** * @var \PHPUnit\Framework\MockObject\MockObject|Client */ - private $client; + private \PHPUnit\Framework\MockObject\MockObject $client; - private $companyModel; - private $companyRepository; + private \PHPUnit\Framework\MockObject\MockObject $companyModel; + private \PHPUnit\Framework\MockObject\MockObject $companyRepository; - /** - * @var ArrayCollection - */ - private $ipCollection; + private \Doctrine\Common\Collections\ArrayCollection $ipCollection; - /** - * @var CampaignHelper - */ - private $campaignHelper; + private \Mautic\WebhookBundle\Helper\CampaignHelper $campaignHelper; /** * @var \PHPUnit\Framework\MockObject\MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; protected function setUp(): void { diff --git a/app/bundles/WebhookBundle/Tests/Model/WebhookModelTest.php b/app/bundles/WebhookBundle/Tests/Model/WebhookModelTest.php index 07cbe283e93..c30e3597b58 100644 --- a/app/bundles/WebhookBundle/Tests/Model/WebhookModelTest.php +++ b/app/bundles/WebhookBundle/Tests/Model/WebhookModelTest.php @@ -28,42 +28,39 @@ class WebhookModelTest extends TestCase /** * @var MockObject|CoreParametersHelper */ - private $parametersHelperMock; + private \PHPUnit\Framework\MockObject\MockObject $parametersHelperMock; /** * @var MockObject|SerializerInterface */ - private $serializerMock; + private \PHPUnit\Framework\MockObject\MockObject $serializerMock; /** * @var MockObject|EntityManager */ - private $entityManagerMock; + private \PHPUnit\Framework\MockObject\MockObject $entityManagerMock; /** * @var MockObject|WebhookRepository */ - private $webhookRepository; + private \PHPUnit\Framework\MockObject\MockObject $webhookRepository; /** * @var MockObject|UserHelper */ - private $userHelper; + private \PHPUnit\Framework\MockObject\MockObject $userHelper; /** * @var MockObject|EventDispatcherInterface */ - private $eventDispatcherMock; + private \PHPUnit\Framework\MockObject\MockObject $eventDispatcherMock; - /** - * @var WebhookModel - */ - private $model; + private \Mautic\WebhookBundle\Model\WebhookModel $model; /** * @var MockObject|Client */ - private $httpClientMock; + private \PHPUnit\Framework\MockObject\MockObject $httpClientMock; protected function setUp(): void { diff --git a/phpstan.neon b/phpstan.neon index ed4a8285fde..704c73fe719 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -47,6 +47,12 @@ parameters: - message: '#PHPDoc tag @return with type array|Doctrine\Common\Collections\ArrayCollection is not subtype of native type array#' path: app/bundles/CoreBundle/Entity/TranslationEntityTrait.php + # mocks + - '#is not subtype of native type PHPUnit\\Framework\\MockObject\\MockObject#' + - '#Call to an undefined method PHPUnit\\Framework\\MockObject\\MockObject#' + - '#expects (.*?) PHPUnit\\Framework\\MockObject\\MockObject given#' + # on purpose + - '#Call to method PHPUnit\\Framework\\Assert::assertInstanceOf\(\) with (.*?) and (.*?) will always evaluate to#' scanFiles: # This is here because a few functions in the global namespace are defined in this file - vendor/twig/twig/src/Extension/EscaperExtension.php diff --git a/plugins/MauticCrmBundle/Tests/DynamicsApiTest.php b/plugins/MauticCrmBundle/Tests/DynamicsApiTest.php index e39a1b4f330..9c562953839 100644 --- a/plugins/MauticCrmBundle/Tests/DynamicsApiTest.php +++ b/plugins/MauticCrmBundle/Tests/DynamicsApiTest.php @@ -8,11 +8,9 @@ class DynamicsApiTest extends AbstractIntegrationTestCase { - /** @var DynamicsApi */ - private $api; + private \MauticPlugin\MauticCrmBundle\Api\DynamicsApi $api; - /** @var DynamicsIntegration */ - private $integration; + private \MauticPlugin\MauticCrmBundle\Integration\DynamicsIntegration $integration; protected function setUp(): void { diff --git a/plugins/MauticCrmBundle/Tests/DynamicsIntegrationTest.php b/plugins/MauticCrmBundle/Tests/DynamicsIntegrationTest.php index e2ad270b523..409ac62bc5a 100644 --- a/plugins/MauticCrmBundle/Tests/DynamicsIntegrationTest.php +++ b/plugins/MauticCrmBundle/Tests/DynamicsIntegrationTest.php @@ -7,8 +7,7 @@ class DynamicsIntegrationTest extends AbstractIntegrationTestCase { - /** @var DynamicsIntegration */ - private $integration; + private \MauticPlugin\MauticCrmBundle\Integration\DynamicsIntegration $integration; protected function setUp(): void { diff --git a/plugins/MauticFocusBundle/Tests/EventListener/LeadSubscriberTest.php b/plugins/MauticFocusBundle/Tests/EventListener/LeadSubscriberTest.php index e896813c839..d97ee426808 100644 --- a/plugins/MauticFocusBundle/Tests/EventListener/LeadSubscriberTest.php +++ b/plugins/MauticFocusBundle/Tests/EventListener/LeadSubscriberTest.php @@ -23,22 +23,22 @@ class LeadSubscriberTest extends CommonMocks /** * @var Translator|MockObject */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var RouterInterface|MockObject */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var FocusModel|(FocusModel&MockObject)|MockObject */ - private $focusModel; + private \PHPUnit\Framework\MockObject\MockObject $focusModel; /** * @var StatRepository|(StatRepository&MockObject)|MockObject */ - private $statRepository; + private \PHPUnit\Framework\MockObject\MockObject $statRepository; /** * @var string diff --git a/plugins/MauticFocusBundle/Tests/Form/Type/ContentTypeTest.php b/plugins/MauticFocusBundle/Tests/Form/Type/ContentTypeTest.php index fa231d806a1..3ea4df7b4b7 100644 --- a/plugins/MauticFocusBundle/Tests/Form/Type/ContentTypeTest.php +++ b/plugins/MauticFocusBundle/Tests/Form/Type/ContentTypeTest.php @@ -13,7 +13,7 @@ class ContentTypeTest extends TestCase /** * @var mixed|\PHPUnit\Framework\MockObject\MockObject|FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; protected function setUp(): void { diff --git a/plugins/MauticFocusBundle/Tests/Helper/IframeAvailabilityCheckerTest.php b/plugins/MauticFocusBundle/Tests/Helper/IframeAvailabilityCheckerTest.php index 61fd2de4526..221353c90bf 100644 --- a/plugins/MauticFocusBundle/Tests/Helper/IframeAvailabilityCheckerTest.php +++ b/plugins/MauticFocusBundle/Tests/Helper/IframeAvailabilityCheckerTest.php @@ -9,15 +9,12 @@ class IframeAvailabilityCheckerTest extends \PHPUnit\Framework\TestCase { - /** - * @var MockObject - */ - private $translator; + private \PHPUnit\Framework\MockObject\MockObject $translator; /** * @var IframeAvailabilityChecker|MockObject */ - private $helper; + private \MauticPlugin\MauticFocusBundle\Helper\IframeAvailabilityChecker $helper; public function setUp(): void { diff --git a/plugins/MauticFocusBundle/Tests/Helper/TokenHelperTest.php b/plugins/MauticFocusBundle/Tests/Helper/TokenHelperTest.php index fe0f1490b7a..aec7f109874 100644 --- a/plugins/MauticFocusBundle/Tests/Helper/TokenHelperTest.php +++ b/plugins/MauticFocusBundle/Tests/Helper/TokenHelperTest.php @@ -17,22 +17,19 @@ class TokenHelperTest extends TestCase /** * @var FocusModel|MockObject */ - private $model; + private \PHPUnit\Framework\MockObject\MockObject $model; /** * @var MockObject|RouterInterface */ - private $router; + private \PHPUnit\Framework\MockObject\MockObject $router; /** * @var CorePermissions|MockObject */ - private $security; + private \PHPUnit\Framework\MockObject\MockObject $security; - /** - * @var TokenHelper - */ - private $helper; + private \MauticPlugin\MauticFocusBundle\Helper\TokenHelper $helper; protected function setUp(): void { diff --git a/plugins/MauticFocusBundle/Tests/Model/FocusModelTest.php b/plugins/MauticFocusBundle/Tests/Model/FocusModelTest.php index 27b111ca64d..8236f84e241 100644 --- a/plugins/MauticFocusBundle/Tests/Model/FocusModelTest.php +++ b/plugins/MauticFocusBundle/Tests/Model/FocusModelTest.php @@ -27,32 +27,32 @@ class FocusModelTest extends TestCase /** * @var ContactTracker|MockObject */ - private $contactTracker; + private \PHPUnit\Framework\MockObject\MockObject $contactTracker; /** * @var MockObject|EventDispatcherInterface */ - private $dispatcher; + private \PHPUnit\Framework\MockObject\MockObject $dispatcher; /** * @var FormModel|MockObject */ - private $formModel; + private \PHPUnit\Framework\MockObject\MockObject $formModel; /** * @var FieldModel|MockObject */ - private $leadFieldModel; + private \PHPUnit\Framework\MockObject\MockObject $leadFieldModel; /** * @var Environment|mixed|MockObject */ - private $twig; + private \PHPUnit\Framework\MockObject\MockObject $twig; /** * @var TrackableModel|mixed|MockObject */ - private $trackableModel; + private \PHPUnit\Framework\MockObject\MockObject $trackableModel; protected function setUp(): void { diff --git a/plugins/MauticTagManagerBundle/Tests/Unit/Integration/TagManagerIntegrationTest.php b/plugins/MauticTagManagerBundle/Tests/Unit/Integration/TagManagerIntegrationTest.php index 0cc663008f3..e50a76aae7e 100644 --- a/plugins/MauticTagManagerBundle/Tests/Unit/Integration/TagManagerIntegrationTest.php +++ b/plugins/MauticTagManagerBundle/Tests/Unit/Integration/TagManagerIntegrationTest.php @@ -8,10 +8,7 @@ class TagManagerIntegrationTest extends TestCase { - /** - * @var TagManagerIntegration - */ - private $tagManagerIntegration; + private \MauticPlugin\MauticTagManagerBundle\Integration\TagManagerIntegration $tagManagerIntegration; protected function setUp(): void { diff --git a/plugins/MauticTagManagerBundle/Tests/Unit/Security/Permissions/TagManagerPermissionsTest.php b/plugins/MauticTagManagerBundle/Tests/Unit/Security/Permissions/TagManagerPermissionsTest.php index f8ce371fbf2..bfe39cfa2f4 100644 --- a/plugins/MauticTagManagerBundle/Tests/Unit/Security/Permissions/TagManagerPermissionsTest.php +++ b/plugins/MauticTagManagerBundle/Tests/Unit/Security/Permissions/TagManagerPermissionsTest.php @@ -11,12 +11,12 @@ class TagManagerPermissionsTest extends TestCase /** * @var TagManagerPermissions */ - private $tagManagerPermissions; + private \PHPUnit\Framework\MockObject\MockObject $tagManagerPermissions; /** * @var FormBuilderInterface */ - private $formBuilder; + private \PHPUnit\Framework\MockObject\MockObject $formBuilder; protected function setUp(): void {