mautic / mautic

app/bundles/LeadBundle/Tests/Tracker/Service/ContactTrackingService/ContactTrackingServiceTest.php

Switch Indentation +282 added lines, -282 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2017 Mautic Contributors. All rights reserved
@@ -9,316 +9,316 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Tracker\Service\ContactTrackingService;
+    namespace Mautic\LeadBundle\Tests\Tracker\Service\ContactTrackingService;
 
-use Mautic\CoreBundle\Helper\CookieHelper;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadDeviceRepository;
-use Mautic\LeadBundle\Entity\LeadRepository;
-use Mautic\LeadBundle\Entity\MergeRecordRepository;
-use Mautic\LeadBundle\Tracker\Service\ContactTrackingService\ContactTrackingService;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
+    use Mautic\CoreBundle\Helper\CookieHelper;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadDeviceRepository;
+    use Mautic\LeadBundle\Entity\LeadRepository;
+    use Mautic\LeadBundle\Entity\MergeRecordRepository;
+    use Mautic\LeadBundle\Tracker\Service\ContactTrackingService\ContactTrackingService;
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Class ContactTrackingServiceTest.
  */
-final class ContactTrackingServiceTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    final class ContactTrackingServiceTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $cookieHelperMock;
+        private $cookieHelperMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $leadDeviceRepositoryMock;
+        private $leadDeviceRepositoryMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $leadRepositoryMock;
+        private $leadRepositoryMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $requestStackMock;
+        private $requestStackMock;
 
-    /**
+        /**
      * @var MergeRecordRepository
      */
-    private $mergeRecordRepository;
-
-    protected function setUp(): void
-    {
-        $this->cookieHelperMock         = $this->createMock(CookieHelper::class);
-        $this->leadDeviceRepositoryMock = $this->createMock(LeadDeviceRepository::class);
-        $this->leadRepositoryMock       = $this->createMock(LeadRepository::class);
-        $this->requestStackMock         = $this->createMock(RequestStack::class);
-        $this->mergeRecordRepository    = $this->createMock(MergeRecordRepository::class);
-    }
-
-    public function testGetTrackedIdentifier()
-    {
-        // Parameters
-        $trackingId = 'randomTrackingId';
-
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertSame($trackingId, $contactTrackingService->getTrackedIdentifier());
-    }
-
-    public function testGetTrackedLeadNoRequest()
-    {
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn(null);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertNull($contactTrackingService->getTrackedLead());
-    }
-
-    public function testGetTrackedLeadNoTrackedIdentifier()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn(null);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertNull($contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        private $mergeRecordRepository;
+
+        protected function setUp(): void
+        {
+            $this->cookieHelperMock         = $this->createMock(CookieHelper::class);
+            $this->leadDeviceRepositoryMock = $this->createMock(LeadDeviceRepository::class);
+            $this->leadRepositoryMock       = $this->createMock(LeadRepository::class);
+            $this->requestStackMock         = $this->createMock(RequestStack::class);
+            $this->mergeRecordRepository    = $this->createMock(MergeRecordRepository::class);
+        }
+
+        public function testGetTrackedIdentifier()
+        {
+            // Parameters
+            $trackingId = 'randomTrackingId';
+
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertSame($trackingId, $contactTrackingService->getTrackedIdentifier());
+        }
+
+        public function testGetTrackedLeadNoRequest()
+        {
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn(null);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertNull($contactTrackingService->getTrackedLead());
+        }
+
+        public function testGetTrackedLeadNoTrackedIdentifier()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn(null);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertNull($contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * Test no lead id found.
      */
-    public function testGetTrackedLeadNoLeadId()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-        $trackingId  = 'randomTrackingId';
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('getCookie')
-            ->with($trackingId, null)
-            ->willReturn(null);
-
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mtc_id', null)
-            ->willReturn(null);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertNull($contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        public function testGetTrackedLeadNoLeadId()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+            $trackingId  = 'randomTrackingId';
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('getCookie')
+                ->with($trackingId, null)
+                ->willReturn(null);
+
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mtc_id', null)
+                ->willReturn(null);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertNull($contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * Test lead id found in request but no lead entity found.
      */
-    public function testGetTrackedLeadRequestLeadIdAndNoLeadFound()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-        $trackingId  = 'randomTrackingId';
-        $leadId      = 1;
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('getCookie')
-            ->with($trackingId, null)
-            ->willReturn(null);
-
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mtc_id', null)
-            ->willReturn($leadId);
-
-        $this->leadRepositoryMock->expects($this->at(0))
-            ->method('getEntity')
-            ->with($leadId)
-            ->willReturn(null);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertNull($contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        public function testGetTrackedLeadRequestLeadIdAndNoLeadFound()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+            $trackingId  = 'randomTrackingId';
+            $leadId      = 1;
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('getCookie')
+                ->with($trackingId, null)
+                ->willReturn(null);
+
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mtc_id', null)
+                ->willReturn($leadId);
+
+            $this->leadRepositoryMock->expects($this->at(0))
+                ->method('getEntity')
+                ->with($leadId)
+                ->willReturn(null);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertNull($contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * Test lead id found in request and another device is already tracked and associated with lead.
      */
-    public function testGetTrackedLeadRequestLeadIdAndAnotherDeviceAlreadyTracked()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-        $trackingId  = 'randomTrackingId';
-        $leadId      = 1;
-        $leadMock    = $this->createMock(Lead::class);
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('getCookie')
-            ->with($trackingId, null)
-            ->willReturn(null);
-
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mtc_id', null)
-            ->willReturn($leadId);
-
-        $this->leadRepositoryMock->expects($this->at(0))
-            ->method('getEntity')
-            ->with($leadId)
-            ->willReturn($leadMock);
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('isAnyLeadDeviceTracked')
-            ->with($leadMock)
-            ->willReturn(true);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertNull($contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        public function testGetTrackedLeadRequestLeadIdAndAnotherDeviceAlreadyTracked()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+            $trackingId  = 'randomTrackingId';
+            $leadId      = 1;
+            $leadMock    = $this->createMock(Lead::class);
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('getCookie')
+                ->with($trackingId, null)
+                ->willReturn(null);
+
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mtc_id', null)
+                ->willReturn($leadId);
+
+            $this->leadRepositoryMock->expects($this->at(0))
+                ->method('getEntity')
+                ->with($leadId)
+                ->willReturn($leadMock);
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('isAnyLeadDeviceTracked')
+                ->with($leadMock)
+                ->willReturn(true);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertNull($contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * Test lead id found in request and another device is not tracked and associated with lead.
      */
-    public function testGetTrackedLeadRequestLeadIdAndAnotherDeviceNotTracked()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-        $trackingId  = 'randomTrackingId';
-        $leadId      = 1;
-        $leadMock    = $this->createMock(Lead::class);
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('getCookie')
-            ->with($trackingId, null)
-            ->willReturn(null);
-
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mtc_id', null)
-            ->willReturn($leadId);
-
-        $this->leadRepositoryMock->expects($this->at(0))
-            ->method('getEntity')
-            ->with($leadId)
-            ->willReturn($leadMock);
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('isAnyLeadDeviceTracked')
-            ->with($leadMock)
-            ->willReturn(false);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertSame($leadMock, $contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        public function testGetTrackedLeadRequestLeadIdAndAnotherDeviceNotTracked()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+            $trackingId  = 'randomTrackingId';
+            $leadId      = 1;
+            $leadMock    = $this->createMock(Lead::class);
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('getCookie')
+                ->with($trackingId, null)
+                ->willReturn(null);
+
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mtc_id', null)
+                ->willReturn($leadId);
+
+            $this->leadRepositoryMock->expects($this->at(0))
+                ->method('getEntity')
+                ->with($leadId)
+                ->willReturn($leadMock);
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('isAnyLeadDeviceTracked')
+                ->with($leadMock)
+                ->willReturn(false);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertSame($leadMock, $contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * Test lead id found in request and another device is not tracked and associated with lead.
      */
-    public function testGetTrackedLeadCookieLeadIdAndAnotherDeviceNotTracked()
-    {
-        // Parameters
-        $requestMock = $this->createMock(Request::class);
-        $trackingId  = 'randomTrackingId';
-        $leadId      = 1;
-        $leadMock    = $this->createMock(Lead::class);
-
-        // __construct
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_session_id', null)
-            ->willReturn($trackingId);
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('getCookie')
-            ->with($trackingId, null)
-            ->willReturn($leadId);
-
-        $this->leadRepositoryMock->expects($this->at(0))
-            ->method('getEntity')
-            ->with($leadId)
-            ->willReturn($leadMock);
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('isAnyLeadDeviceTracked')
-            ->with($leadMock)
-            ->willReturn(false);
-
-        $contactTrackingService = $this->getContactTrackingService();
-        $this->assertSame($leadMock, $contactTrackingService->getTrackedLead());
-    }
-
-    /**
+        public function testGetTrackedLeadCookieLeadIdAndAnotherDeviceNotTracked()
+        {
+            // Parameters
+            $requestMock = $this->createMock(Request::class);
+            $trackingId  = 'randomTrackingId';
+            $leadId      = 1;
+            $leadMock    = $this->createMock(Lead::class);
+
+            // __construct
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_session_id', null)
+                ->willReturn($trackingId);
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('getCookie')
+                ->with($trackingId, null)
+                ->willReturn($leadId);
+
+            $this->leadRepositoryMock->expects($this->at(0))
+                ->method('getEntity')
+                ->with($leadId)
+                ->willReturn($leadMock);
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('isAnyLeadDeviceTracked')
+                ->with($leadMock)
+                ->willReturn(false);
+
+            $contactTrackingService = $this->getContactTrackingService();
+            $this->assertSame($leadMock, $contactTrackingService->getTrackedLead());
+        }
+
+        /**
      * @return ContactTrackingService
      */
-    private function getContactTrackingService()
-    {
-        return new ContactTrackingService(
-            $this->cookieHelperMock,
-            $this->leadDeviceRepositoryMock,
-            $this->leadRepositoryMock,
-            $this->mergeRecordRepository,
-            $this->requestStackMock
-        );
-    }
+        private function getContactTrackingService()
+        {
+            return new ContactTrackingService(
+                $this->cookieHelperMock,
+                $this->leadDeviceRepositoryMock,
+                $this->leadRepositoryMock,
+                $this->mergeRecordRepository,
+                $this->requestStackMock
+            );
+        }
 }

app/bundles/LeadBundle/Tests/Tracker/Service/DeviceTrackingService/DeviceTrackingServiceTest.php

Switch Indentation +391 added lines, -391 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2017 Mautic Contributors. All rights reserved
@@ -9,430 +9,430 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Tracker\Service\DeviceTrackingService;
+    namespace Mautic\LeadBundle\Tests\Tracker\Service\DeviceTrackingService;
 
-use Doctrine\ORM\EntityManagerInterface;
-use Mautic\CoreBundle\Helper\CookieHelper;
-use Mautic\CoreBundle\Helper\RandomHelper\RandomHelperInterface;
-use Mautic\CoreBundle\Security\Permissions\CorePermissions;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadDevice;
-use Mautic\LeadBundle\Entity\LeadDeviceRepository;
-use Mautic\LeadBundle\Tracker\Service\DeviceTrackingService\DeviceTrackingService;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
+    use Doctrine\ORM\EntityManagerInterface;
+    use Mautic\CoreBundle\Helper\CookieHelper;
+    use Mautic\CoreBundle\Helper\RandomHelper\RandomHelperInterface;
+    use Mautic\CoreBundle\Security\Permissions\CorePermissions;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadDevice;
+    use Mautic\LeadBundle\Entity\LeadDeviceRepository;
+    use Mautic\LeadBundle\Tracker\Service\DeviceTrackingService\DeviceTrackingService;
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Class CompanyModelTest.
  */
-final class DeviceTrackingServiceTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    final class DeviceTrackingServiceTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $cookieHelperMock;
+        private $cookieHelperMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $entityManagerMock;
+        private $entityManagerMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $randomHelperMock;
+        private $randomHelperMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $leadDeviceRepositoryMock;
+        private $leadDeviceRepositoryMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $requestStackMock;
+        private $requestStackMock;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject
      */
-    private $security;
-
-    protected function setUp(): void
-    {
-        $this->cookieHelperMock            = $this->createMock(CookieHelper::class);
-        $this->entityManagerMock           = $this->createMock(EntityManagerInterface::class);
-        $this->randomHelperMock            = $this->createMock(RandomHelperInterface::class);
-        $this->leadDeviceRepositoryMock    = $this->createMock(LeadDeviceRepository::class);
-        $this->requestStackMock            = $this->createMock(RequestStack::class);
-        $this->security                    = $this->createMock(CorePermissions::class);
-    }
-
-    public function testIsTrackedTrue()
-    {
-        // Parameters
-        $trackingId = 'randomTrackingId';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-        $leadDeviceMock = $this->createMock(LeadDevice::class);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn($leadDeviceMock);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertTrue($deviceTrackingService->isTracked());
-    }
-
-    public function testIsTrackedFalse()
-    {
-        // Parameters
-        $trackingId = 'randomTrackingId';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn(null);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertFalse($deviceTrackingService->isTracked());
-    }
-
-    public function testGetTrackedDeviceCookie()
-    {
-        // Parameters
-        $trackingId = 'randomTrackingId';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $leadDeviceMock = $this->createMock(LeadDevice::class);
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn($leadDeviceMock);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertSame($leadDeviceMock, $deviceTrackingService->getTrackedDevice());
-    }
-
-    public function testGetTrackedDeviceGetFromRequest()
-    {
-        // Parameters
-        $trackingId = 'randomTrackingId';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn(null);
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $leadDeviceMock = $this->createMock(LeadDevice::class);
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn($leadDeviceMock);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertSame($leadDeviceMock, $deviceTrackingService->getTrackedDevice());
-    }
-
-    public function testGetTrackedDeviceNoTrackingId()
-    {
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn(null);
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mautic_device_id', null)
-            ->willReturn(null);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $this->leadDeviceRepositoryMock->expects($this->never())
-            ->method('getByTrackingId');
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertNull($deviceTrackingService->getTrackedDevice());
-    }
-
-    public function testGetTrackedDeviceNoRequest()
-    {
-        // __construct()
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn(null);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $this->assertNull($deviceTrackingService->getTrackedDevice());
-    }
-
-    /**
+        private $security;
+
+        protected function setUp(): void
+        {
+            $this->cookieHelperMock            = $this->createMock(CookieHelper::class);
+            $this->entityManagerMock           = $this->createMock(EntityManagerInterface::class);
+            $this->randomHelperMock            = $this->createMock(RandomHelperInterface::class);
+            $this->leadDeviceRepositoryMock    = $this->createMock(LeadDeviceRepository::class);
+            $this->requestStackMock            = $this->createMock(RequestStack::class);
+            $this->security                    = $this->createMock(CorePermissions::class);
+        }
+
+        public function testIsTrackedTrue()
+        {
+            // Parameters
+            $trackingId = 'randomTrackingId';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+            $leadDeviceMock = $this->createMock(LeadDevice::class);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn($leadDeviceMock);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertTrue($deviceTrackingService->isTracked());
+        }
+
+        public function testIsTrackedFalse()
+        {
+            // Parameters
+            $trackingId = 'randomTrackingId';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn(null);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertFalse($deviceTrackingService->isTracked());
+        }
+
+        public function testGetTrackedDeviceCookie()
+        {
+            // Parameters
+            $trackingId = 'randomTrackingId';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $leadDeviceMock = $this->createMock(LeadDevice::class);
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn($leadDeviceMock);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertSame($leadDeviceMock, $deviceTrackingService->getTrackedDevice());
+        }
+
+        public function testGetTrackedDeviceGetFromRequest()
+        {
+            // Parameters
+            $trackingId = 'randomTrackingId';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn(null);
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $leadDeviceMock = $this->createMock(LeadDevice::class);
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn($leadDeviceMock);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertSame($leadDeviceMock, $deviceTrackingService->getTrackedDevice());
+        }
+
+        public function testGetTrackedDeviceNoTrackingId()
+        {
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn(null);
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mautic_device_id', null)
+                ->willReturn(null);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->leadDeviceRepositoryMock->expects($this->never())
+                ->method('getByTrackingId');
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertNull($deviceTrackingService->getTrackedDevice());
+        }
+
+        public function testGetTrackedDeviceNoRequest()
+        {
+            // __construct()
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn(null);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $this->assertNull($deviceTrackingService->getTrackedDevice());
+        }
+
+        /**
      * Test tracking device with already tracked current device.
      */
-    public function testTrackCurrentDeviceAlreadyTracked()
-    {
-        // Parameters
-        $leadDeviceMock        = $this->createMock(LeadDevice::class);
-        $trackingId            = 'randomTrackingId';
-        $trackedLeadDeviceMock = $this->createMock(LeadDevice::class);
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedDevice()
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn($trackedLeadDeviceMock);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, false);
-        $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
-    }
-
-    /**
+        public function testTrackCurrentDeviceAlreadyTracked()
+        {
+            // Parameters
+            $leadDeviceMock        = $this->createMock(LeadDevice::class);
+            $trackingId            = 'randomTrackingId';
+            $trackedLeadDeviceMock = $this->createMock(LeadDevice::class);
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedDevice()
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn($trackedLeadDeviceMock);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, false);
+            $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
+        }
+
+        /**
      * Test tracking device with already tracked current device, replace existing tracking.
      */
-    public function testTrackCurrentDeviceAlreadyTrackedReplaceExistingTracking()
-    {
-        // Parameters
-        $leadDeviceMock           = $this->createMock(LeadDevice::class);
-        $trackingId               = 'randomTrackingId';
-        $trackedLeadDeviceMock    = $this->createMock(LeadDevice::class);
-        $uniqueTrackingIdentifier = '1234567890abcdefghij123';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedDevice()
-        // getTrackedIdentifier()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn($trackingId);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        $this->leadDeviceRepositoryMock->expects($this->at(0))
-            ->method('getByTrackingId')
-            ->with($trackingId)
-            ->willReturn($trackedLeadDeviceMock);
-
-        // getUniqueTrackingIdentifier()
-        $this->randomHelperMock->expects($this->at(0))
-            ->method('generate')
-            ->with(23)
-            ->willReturn($uniqueTrackingIdentifier);
-
-        $this->entityManagerMock->expects($this->at(0))
-            ->method('persist')
-            ->with($leadDeviceMock);
-
-        // index 0-3 for leadDeviceRepository::findOneBy
-        $leadDeviceMock->expects($this->at(4))
-            ->method('getTrackingId')
-            ->willReturn(null);
-        $leadDeviceMock->expects($this->at(5))
-            ->method('setTrackingId')
-            ->with($uniqueTrackingIdentifier)
-            ->willReturn($leadDeviceMock);
-        $leadDeviceMock->expects($this->at(6))
-            ->method('getTrackingId')
-            ->willReturn($uniqueTrackingIdentifier);
-        $leadDeviceMock->expects($this->exactly(2))
-            ->method('getLead')
-            ->willReturn(new Lead());
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('setCookie')
-            ->with('mautic_device_id', $uniqueTrackingIdentifier, 31536000);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, true);
-        $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
-    }
-
-    /**
+        public function testTrackCurrentDeviceAlreadyTrackedReplaceExistingTracking()
+        {
+            // Parameters
+            $leadDeviceMock           = $this->createMock(LeadDevice::class);
+            $trackingId               = 'randomTrackingId';
+            $trackedLeadDeviceMock    = $this->createMock(LeadDevice::class);
+            $uniqueTrackingIdentifier = '1234567890abcdefghij123';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedDevice()
+            // getTrackedIdentifier()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn($trackingId);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->leadDeviceRepositoryMock->expects($this->at(0))
+                ->method('getByTrackingId')
+                ->with($trackingId)
+                ->willReturn($trackedLeadDeviceMock);
+
+            // getUniqueTrackingIdentifier()
+            $this->randomHelperMock->expects($this->at(0))
+                ->method('generate')
+                ->with(23)
+                ->willReturn($uniqueTrackingIdentifier);
+
+            $this->entityManagerMock->expects($this->at(0))
+                ->method('persist')
+                ->with($leadDeviceMock);
+
+            // index 0-3 for leadDeviceRepository::findOneBy
+            $leadDeviceMock->expects($this->at(4))
+                ->method('getTrackingId')
+                ->willReturn(null);
+            $leadDeviceMock->expects($this->at(5))
+                ->method('setTrackingId')
+                ->with($uniqueTrackingIdentifier)
+                ->willReturn($leadDeviceMock);
+            $leadDeviceMock->expects($this->at(6))
+                ->method('getTrackingId')
+                ->willReturn($uniqueTrackingIdentifier);
+            $leadDeviceMock->expects($this->exactly(2))
+                ->method('getLead')
+                ->willReturn(new Lead());
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('setCookie')
+                ->with('mautic_device_id', $uniqueTrackingIdentifier, 31536000);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, true);
+            $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
+        }
+
+        /**
      * Test tracking device without already tracked current device.
      */
-    public function testTrackCurrentDeviceNotTrackedYet()
-    {
-        // Parameters
-        $leadDeviceMock           = $this->createMock(LeadDevice::class);
-        $uniqueTrackingIdentifier = '1234567890abcdefghij123';
-
-        // __construct()
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
-
-        // getTrackedDevice()
-        $this->cookieHelperMock->expects($this->at(0))
-            ->method('getCookie')
-            ->with('mautic_device_id', null)
-            ->willReturn(null);
-
-        $requestMock->expects($this->at(0))
-            ->method('get')
-            ->with('mautic_device_id', null)
-            ->willReturn(null);
-
-        $leadDeviceMock->expects($this->at(0))
-            ->method('getTrackingId')
-            ->willReturn(null);
-
-        // getUniqueTrackingIdentifier()
-        $this->randomHelperMock->expects($this->at(0))
-            ->method('generate')
-            ->with(23)
-            ->willReturn($uniqueTrackingIdentifier);
-
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(true);
-
-        // index 0-3 for leadDeviceRepository::findOneBy
-        $leadDeviceMock->expects($this->at(4))
-            ->method('getTrackingId')
-            ->willReturn(null);
-        $leadDeviceMock->expects($this->at(5))
-            ->method('setTrackingId')
-            ->with($uniqueTrackingIdentifier)
-            ->willReturn($leadDeviceMock);
-        $leadDeviceMock->expects($this->at(6))
-            ->method('getTrackingId')
-            ->willReturn($uniqueTrackingIdentifier);
-        $leadDeviceMock->expects($this->exactly(2))
-            ->method('getLead')
-            ->willReturn(new Lead());
-
-        $this->cookieHelperMock->expects($this->at(1))
-            ->method('setCookie')
-            ->with('mautic_device_id', $uniqueTrackingIdentifier, 31536000);
-
-        $deviceTrackingService = $this->getDeviceTrackingService();
-        $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, false);
-        $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
-    }
-
-    /**
+        public function testTrackCurrentDeviceNotTrackedYet()
+        {
+            // Parameters
+            $leadDeviceMock           = $this->createMock(LeadDevice::class);
+            $uniqueTrackingIdentifier = '1234567890abcdefghij123';
+
+            // __construct()
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
+
+            // getTrackedDevice()
+            $this->cookieHelperMock->expects($this->at(0))
+                ->method('getCookie')
+                ->with('mautic_device_id', null)
+                ->willReturn(null);
+
+            $requestMock->expects($this->at(0))
+                ->method('get')
+                ->with('mautic_device_id', null)
+                ->willReturn(null);
+
+            $leadDeviceMock->expects($this->at(0))
+                ->method('getTrackingId')
+                ->willReturn(null);
+
+            // getUniqueTrackingIdentifier()
+            $this->randomHelperMock->expects($this->at(0))
+                ->method('generate')
+                ->with(23)
+                ->willReturn($uniqueTrackingIdentifier);
+
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(true);
+
+            // index 0-3 for leadDeviceRepository::findOneBy
+            $leadDeviceMock->expects($this->at(4))
+                ->method('getTrackingId')
+                ->willReturn(null);
+            $leadDeviceMock->expects($this->at(5))
+                ->method('setTrackingId')
+                ->with($uniqueTrackingIdentifier)
+                ->willReturn($leadDeviceMock);
+            $leadDeviceMock->expects($this->at(6))
+                ->method('getTrackingId')
+                ->willReturn($uniqueTrackingIdentifier);
+            $leadDeviceMock->expects($this->exactly(2))
+                ->method('getLead')
+                ->willReturn(new Lead());
+
+            $this->cookieHelperMock->expects($this->at(1))
+                ->method('setCookie')
+                ->with('mautic_device_id', $uniqueTrackingIdentifier, 31536000);
+
+            $deviceTrackingService = $this->getDeviceTrackingService();
+            $returnedLeadDevice    = $deviceTrackingService->trackCurrentDevice($leadDeviceMock, false);
+            $this->assertInstanceOf(LeadDevice::class, $returnedLeadDevice);
+        }
+
+        /**
      * Test that a user is not tracked.
      */
-    public function testUserIsNotTracked()
-    {
-        $this->leadDeviceRepositoryMock->expects($this->never())
-            ->method('getByTrackingId');
+        public function testUserIsNotTracked()
+        {
+            $this->leadDeviceRepositoryMock->expects($this->never())
+                ->method('getByTrackingId');
 
-        $requestMock = $this->createMock(Request::class);
-        $this->requestStackMock->expects($this->at(0))
-            ->method('getCurrentRequest')
-            ->willReturn($requestMock);
+            $requestMock = $this->createMock(Request::class);
+            $this->requestStackMock->expects($this->at(0))
+                ->method('getCurrentRequest')
+                ->willReturn($requestMock);
 
-        $this->security->expects($this->once())
-            ->method('isAnonymous')
-            ->willReturn(false);
+            $this->security->expects($this->once())
+                ->method('isAnonymous')
+                ->willReturn(false);
 
-        $this->getDeviceTrackingService()->getTrackedDevice();
-    }
+            $this->getDeviceTrackingService()->getTrackedDevice();
+        }
 
-    /**
+        /**
      * @return DeviceTrackingService
      */
-    private function getDeviceTrackingService()
-    {
-        return new DeviceTrackingService(
-            $this->cookieHelperMock,
-            $this->entityManagerMock,
-            $this->leadDeviceRepositoryMock,
-            $this->randomHelperMock,
-            $this->requestStackMock,
-            $this->security
-        );
-    }
+        private function getDeviceTrackingService()
+        {
+            return new DeviceTrackingService(
+                $this->cookieHelperMock,
+                $this->entityManagerMock,
+                $this->leadDeviceRepositoryMock,
+                $this->randomHelperMock,
+                $this->requestStackMock,
+                $this->security
+            );
+        }
 }

app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php

Switch Indentation +49 added lines, -49 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2017 Mautic Contributors. All rights reserved
@@ -9,77 +9,77 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Tracker;
+    namespace Mautic\LeadBundle\Tests\Tracker;
 
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadDevice;
-use Mautic\LeadBundle\Tracker\DeviceTracker;
-use Mautic\LeadBundle\Tracker\Factory\DeviceDetectorFactory\DeviceDetectorFactory;
-use Mautic\LeadBundle\Tracker\Service\DeviceCreatorService\DeviceCreatorService;
-use Mautic\LeadBundle\Tracker\Service\DeviceTrackingService\DeviceTrackingServiceInterface;
-use Monolog\Logger;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadDevice;
+    use Mautic\LeadBundle\Tracker\DeviceTracker;
+    use Mautic\LeadBundle\Tracker\Factory\DeviceDetectorFactory\DeviceDetectorFactory;
+    use Mautic\LeadBundle\Tracker\Service\DeviceCreatorService\DeviceCreatorService;
+    use Mautic\LeadBundle\Tracker\Service\DeviceTrackingService\DeviceTrackingServiceInterface;
+    use Monolog\Logger;
 
-class DeviceTrackerTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    class DeviceTrackerTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var DeviceCreatorService
      */
-    private $deviceCreatorService;
+        private $deviceCreatorService;
 
-    /**
+        /**
      * @var DeviceDetectorFactory
      */
-    private $deviceDetectorFactory;
+        private $deviceDetectorFactory;
 
-    /**
+        /**
      * @var DeviceTrackingServiceInterface
      */
-    private $deviceTrackingService;
+        private $deviceTrackingService;
 
-    /**
+        /**
      * @var Logger
      */
-    private $logger;
+        private $logger;
 
-    /**
+        /**
      * @var string
      */
-    private $userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36';
+        private $userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36';
 
-    protected function setUp(): void
-    {
-        $this->deviceCreatorService = new DeviceCreatorService();
+        protected function setUp(): void
+        {
+            $this->deviceCreatorService = new DeviceCreatorService();
 
-        $this->deviceDetectorFactory = new DeviceDetectorFactory();
+            $this->deviceDetectorFactory = new DeviceDetectorFactory();
 
-        $this->deviceTrackingService = $this->getMockBuilder(DeviceTrackingServiceInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $this->deviceTrackingService = $this->getMockBuilder(DeviceTrackingServiceInterface::class)
+                ->disableOriginalConstructor()
+                ->getMock();
 
-        $this->logger = $this->getMockBuilder(Logger::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
+            $this->logger = $this->getMockBuilder(Logger::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        }
 
-    public function testDeviceCreatedByUserAgent()
-    {
-        $lead    = new Lead();
-        $device  = new LeadDevice();
-        $device->setDeviceBrand('apple');
+        public function testDeviceCreatedByUserAgent()
+        {
+            $lead    = new Lead();
+            $device  = new LeadDevice();
+            $device->setDeviceBrand('apple');
 
-        $this->deviceTrackingService->expects($this->once())
-            ->method('trackCurrentDevice')
-            ->willReturn($device);
+            $this->deviceTrackingService->expects($this->once())
+                ->method('trackCurrentDevice')
+                ->willReturn($device);
 
-        $tracker = new DeviceTracker($this->deviceCreatorService, $this->deviceDetectorFactory, $this->deviceTrackingService, $this->logger);
+            $tracker = new DeviceTracker($this->deviceCreatorService, $this->deviceDetectorFactory, $this->deviceTrackingService, $this->logger);
 
-        $device = $tracker->createDeviceFromUserAgent($lead, $this->userAgent);
-        $this->assertEquals('3dfc9e6dff07948058df37455718cb98', $device->getSignature());
+            $device = $tracker->createDeviceFromUserAgent($lead, $this->userAgent);
+            $this->assertEquals('3dfc9e6dff07948058df37455718cb98', $device->getSignature());
 
-        // Subsequent calls should not create a new tracking ID
-        $device2 = $tracker->createDeviceFromUserAgent($lead, $this->userAgent);
-        $this->assertEquals($device->getTrackingId(), $device2->getTrackingId());
-        $this->assertEquals('apple', $device2->getDeviceBrand());
-        $this->assertEquals($device->getSignature(), $device2->getSignature());
-    }
+            // Subsequent calls should not create a new tracking ID
+            $device2 = $tracker->createDeviceFromUserAgent($lead, $this->userAgent);
+            $this->assertEquals($device->getTrackingId(), $device2->getTrackingId());
+            $this->assertEquals('apple', $device2->getDeviceBrand());
+            $this->assertEquals($device->getSignature(), $device2->getSignature());
+        }
 }

app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php

Switch Indentation +238 added lines, -238 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2017 Mautic Contributors. All rights reserved
@@ -9,309 +9,309 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Tracker;
-
-use Mautic\CoreBundle\Entity\IpAddress;
-use Mautic\CoreBundle\Helper\CoreParametersHelper;
-use Mautic\CoreBundle\Helper\IpLookupHelper;
-use Mautic\CoreBundle\Security\Permissions\CorePermissions;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadDevice;
-use Mautic\LeadBundle\Entity\LeadRepository;
-use Mautic\LeadBundle\LeadEvents;
-use Mautic\LeadBundle\Model\FieldModel;
-use Mautic\LeadBundle\Tracker\ContactTracker;
-use Mautic\LeadBundle\Tracker\DeviceTracker;
-use Mautic\LeadBundle\Tracker\Service\ContactTrackingService\ContactTrackingServiceInterface;
-use Monolog\Logger;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-class ContactTrackerTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    namespace Mautic\LeadBundle\Tests\Tracker;
+
+    use Mautic\CoreBundle\Entity\IpAddress;
+    use Mautic\CoreBundle\Helper\CoreParametersHelper;
+    use Mautic\CoreBundle\Helper\IpLookupHelper;
+    use Mautic\CoreBundle\Security\Permissions\CorePermissions;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadDevice;
+    use Mautic\LeadBundle\Entity\LeadRepository;
+    use Mautic\LeadBundle\LeadEvents;
+    use Mautic\LeadBundle\Model\FieldModel;
+    use Mautic\LeadBundle\Tracker\ContactTracker;
+    use Mautic\LeadBundle\Tracker\DeviceTracker;
+    use Mautic\LeadBundle\Tracker\Service\ContactTrackingService\ContactTrackingServiceInterface;
+    use Monolog\Logger;
+    use Symfony\Component\EventDispatcher\EventDispatcher;
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\RequestStack;
+
+    class ContactTrackerTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var LeadRepository
      */
-    private $leadRepositoryMock;
+        private $leadRepositoryMock;
 
-    /**
+        /**
      * @var ContactTrackingServiceInterface
      */
-    private $contactTrackingServiceMock;
+        private $contactTrackingServiceMock;
 
-    /**
+        /**
      * @var DeviceTracker
      */
-    private $deviceTrackerMock;
+        private $deviceTrackerMock;
 
-    /**
+        /**
      * @var CorePermissions
      */
-    private $securityMock;
+        private $securityMock;
 
-    /**
+        /**
      * @var Logger
      */
-    private $loggerMock;
+        private $loggerMock;
 
-    /**
+        /**
      * @var IpLookupHelper
      */
-    private $ipLookupHelperMock;
+        private $ipLookupHelperMock;
 
-    /**
+        /**
      * @var RequestStack
      */
-    private $requestStack;
+        private $requestStack;
 
-    /**
+        /**
      * @var CoreParametersHelper
      */
-    private $coreParametersHelperMock;
+        private $coreParametersHelperMock;
 
-    /**
+        /**
      * @var EventDispatcher
      */
-    private $dispatcherMock;
+        private $dispatcherMock;
 
-    /**
+        /**
      * @var FieldModel
      */
-    private $leadFieldModelMock;
+        private $leadFieldModelMock;
+
+        protected function setUp(): void
+        {
+            $this->leadRepositoryMock = $this->getMockBuilder(LeadRepository::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->contactTrackingServiceMock = $this->getMockBuilder(ContactTrackingServiceInterface::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->deviceTrackerMock = $this->getMockBuilder(DeviceTracker::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->securityMock = $this->getMockBuilder(CorePermissions::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $this->securityMock->method('isAnonymous')
+                ->willReturn(true);
+
+            $this->loggerMock = $this->getMockBuilder(Logger::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->ipLookupHelperMock = $this->getMockBuilder(IpLookupHelper::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->requestStack = new RequestStack();
+            $request            = new Request();
+            $this->requestStack->push($request);
+
+            $this->coreParametersHelperMock = $this->getMockBuilder(CoreParametersHelper::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->dispatcherMock = $this->getMockBuilder(EventDispatcher::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->leadFieldModelMock = $this->createMock(FieldModel::class);
+        }
+
+        public function testSystemContactIsUsedOverTrackedContact()
+        {
+            $contactTracker = $this->getContactTracker();
+
+            $this->leadRepositoryMock->expects($this->any())
+                ->method('getFieldValues')
+                ->willReturn([]);
+
+            $lead1 = new Lead();
+            $lead1->setEmail('lead1@test.com');
+            $contactTracker->setTrackedContact($lead1);
+            $this->assertEquals($lead1->getEmail(), $contactTracker->getContact()->getEmail());
+
+            $lead2 = new Lead();
+            $lead1->setEmail('lead2@test.com');
+            $contactTracker->setSystemContact($lead2);
+            $this->assertEquals($lead2->getEmail(), $contactTracker->getContact()->getEmail());
+        }
+
+        public function testContactIsTrackedByDevice()
+        {
+            $contactTracker = $this->getContactTracker();
+
+            $this->leadRepositoryMock->expects($this->once())
+                ->method('getFieldValues')
+                ->willReturn(
+                    [
+                        'core' => [
+                            'email' => [
+                                'alias' => 'email',
+                                'type'  => 'email',
+                                'value' => 'test@test.com',
+                            ],
+                        ],
+                    ]
+                );
 
-    protected function setUp(): void
-    {
-        $this->leadRepositoryMock = $this->getMockBuilder(LeadRepository::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $device = new LeadDevice();
+            $lead   = new Lead();
+            $device->setLead($lead);
 
-        $this->contactTrackingServiceMock = $this->getMockBuilder(ContactTrackingServiceInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $this->deviceTrackerMock->method('getTrackedDevice')
+                ->willReturn($device);
 
-        $this->deviceTrackerMock = $this->getMockBuilder(DeviceTracker::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $contact = $contactTracker->getContact();
 
-        $this->securityMock = $this->getMockBuilder(CorePermissions::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->securityMock->method('isAnonymous')
-            ->willReturn(true);
+            $this->assertEquals('test@test.com', $contact->getFieldValue('email'));
+        }
 
-        $this->loggerMock = $this->getMockBuilder(Logger::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        public function testContactIsTrackedByOldCookie()
+        {
+            $contactTracker = $this->getContactTracker();
 
-        $this->ipLookupHelperMock = $this->getMockBuilder(IpLookupHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $this->leadRepositoryMock->expects($this->never())
+                ->method('getFieldValues');
 
-        $this->requestStack = new RequestStack();
-        $request            = new Request();
-        $this->requestStack->push($request);
+            $lead = new Lead();
+            $lead->setEmail('test@test.com');
 
-        $this->coreParametersHelperMock = $this->getMockBuilder(CoreParametersHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $this->contactTrackingServiceMock->expects($this->once())
+                ->method('getTrackedLead')
+                ->willReturn($lead);
 
-        $this->dispatcherMock = $this->getMockBuilder(EventDispatcher::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+            $contact = $contactTracker->getContact();
 
-        $this->leadFieldModelMock = $this->createMock(FieldModel::class);
-    }
+            $this->assertEquals('test@test.com', $contact->getEmail());
+        }
 
-    public function testSystemContactIsUsedOverTrackedContact()
-    {
-        $contactTracker = $this->getContactTracker();
+        public function testContactIsTrackedByIp()
+        {
+            $contactTracker = $this->getContactTracker();
 
-        $this->leadRepositoryMock->expects($this->any())
-            ->method('getFieldValues')
-            ->willReturn([]);
+            $this->ipLookupHelperMock->expects($this->exactly(2))
+                ->method('getIpAddress')
+                ->willReturn(new IpAddress());
 
-        $lead1 = new Lead();
-        $lead1->setEmail('lead1@test.com');
-        $contactTracker->setTrackedContact($lead1);
-        $this->assertEquals($lead1->getEmail(), $contactTracker->getContact()->getEmail());
+            $this->leadRepositoryMock->expects($this->never())
+                ->method('getFieldValues');
 
-        $lead2 = new Lead();
-        $lead1->setEmail('lead2@test.com');
-        $contactTracker->setSystemContact($lead2);
-        $this->assertEquals($lead2->getEmail(), $contactTracker->getContact()->getEmail());
-    }
+            $lead = new Lead();
+            $lead->setEmail('test@test.com');
 
-    public function testContactIsTrackedByDevice()
-    {
-        $contactTracker = $this->getContactTracker();
-
-        $this->leadRepositoryMock->expects($this->once())
-            ->method('getFieldValues')
-            ->willReturn(
-                [
-                    'core' => [
-                        'email' => [
-                            'alias' => 'email',
-                            'type'  => 'email',
-                            'value' => 'test@test.com',
-                        ],
-                    ],
-                ]
-            );
+            $this->contactTrackingServiceMock->expects($this->once())
+                ->method('getTrackedLead')
+                ->willReturn(null);
 
-        $device = new LeadDevice();
-        $lead   = new Lead();
-        $device->setLead($lead);
+            $this->coreParametersHelperMock->expects($this->any())
+                ->method('get')
+                ->willReturn(true);
 
-        $this->deviceTrackerMock->method('getTrackedDevice')
-            ->willReturn($device);
+            $this->leadRepositoryMock->expects($this->once())
+                ->method('getLeadsByIp')
+                ->willReturn([$lead]);
 
-        $contact = $contactTracker->getContact();
+            $contact = $contactTracker->getContact();
 
-        $this->assertEquals('test@test.com', $contact->getFieldValue('email'));
-    }
+            $this->assertEquals('test@test.com', $contact->getEmail());
+        }
 
-    public function testContactIsTrackedByOldCookie()
-    {
-        $contactTracker = $this->getContactTracker();
+        public function testNewContactIsCreated()
+        {
+            $contactTracker = $this->getContactTracker();
 
-        $this->leadRepositoryMock->expects($this->never())
-            ->method('getFieldValues');
+            $this->leadRepositoryMock->expects($this->once())
+                ->method('getFieldValues')
+                ->willReturn([]);
 
-        $lead = new Lead();
-        $lead->setEmail('test@test.com');
+            $this->ipLookupHelperMock->expects($this->exactly(2))
+                ->method('getIpAddress')
+                ->willReturn(new IpAddress());
 
-        $this->contactTrackingServiceMock->expects($this->once())
-            ->method('getTrackedLead')
-            ->willReturn($lead);
+            $this->leadRepositoryMock->expects($this->once())
+                ->method('getFieldValues');
 
-        $contact = $contactTracker->getContact();
+            $this->contactTrackingServiceMock->expects($this->once())
+                ->method('getTrackedLead')
+                ->willReturn(null);
 
-        $this->assertEquals('test@test.com', $contact->getEmail());
-    }
+            $this->coreParametersHelperMock->expects($this->once())
+                ->method('get')
+                ->willReturn(false);
 
-    public function testContactIsTrackedByIp()
-    {
-        $contactTracker = $this->getContactTracker();
+            $this->leadRepositoryMock->expects($this->never())
+                ->method('getLeadsByIp');
+            $this->leadFieldModelMock->expects($this->any())->method('getFieldListWithProperties')->willReturn([]);
 
-        $this->ipLookupHelperMock->expects($this->exactly(2))
-            ->method('getIpAddress')
-            ->willReturn(new IpAddress());
+            $contact = $contactTracker->getContact();
+            $this->assertEquals(true, $contact->isNewlyCreated());
+        }
 
-        $this->leadRepositoryMock->expects($this->never())
-            ->method('getFieldValues');
+        public function testEventIsDispatchedWithChangeOfContact()
+        {
+            $contactTracker = $this->getContactTracker();
 
-        $lead = new Lead();
-        $lead->setEmail('test@test.com');
+            $device = new LeadDevice();
+            $device->setTrackingId('abc123');
 
-        $this->contactTrackingServiceMock->expects($this->once())
-            ->method('getTrackedLead')
-            ->willReturn(null);
+            $lead = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $lead->method('getId')
+                ->willReturn(1);
 
-        $this->coreParametersHelperMock->expects($this->any())
-            ->method('get')
-            ->willReturn(true);
+            $lead2 = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $lead2->method('getId')
+                ->willReturn(2);
 
-        $this->leadRepositoryMock->expects($this->once())
-            ->method('getLeadsByIp')
-            ->willReturn([$lead]);
+            $this->dispatcherMock->expects($this->once())
+                ->method('hasListeners')
+                ->withConsecutive([LeadEvents::CURRENT_LEAD_CHANGED])
+                ->willReturn(true);
 
-        $contact = $contactTracker->getContact();
+            $this->dispatcherMock->expects($this->once())
+                ->method('dispatch')
+                ->withConsecutive([LeadEvents::CURRENT_LEAD_CHANGED, $this->anything()])
+                ->willReturn(true);
 
-        $this->assertEquals('test@test.com', $contact->getEmail());
-    }
+            $leadDevice1 = new LeadDevice();
+            $leadDevice1->setTrackingId('abc123');
+            $this->deviceTrackerMock->expects($this->at(0))
+                ->method('getTrackedDevice')
+                ->willReturn($leadDevice1);
 
-    public function testNewContactIsCreated()
-    {
-        $contactTracker = $this->getContactTracker();
+            $leadDevice2 = new LeadDevice();
+            $leadDevice2->setTrackingId('def456');
+            $this->deviceTrackerMock->expects($this->at(2))
+                ->method('getTrackedDevice')
+                ->willReturn($leadDevice2);
 
-        $this->leadRepositoryMock->expects($this->once())
-            ->method('getFieldValues')
-            ->willReturn([]);
+            $contactTracker->setTrackedContact($lead);
+            $contactTracker->setTrackedContact($lead2);
+        }
 
-        $this->ipLookupHelperMock->expects($this->exactly(2))
-            ->method('getIpAddress')
-            ->willReturn(new IpAddress());
-
-        $this->leadRepositoryMock->expects($this->once())
-            ->method('getFieldValues');
-
-        $this->contactTrackingServiceMock->expects($this->once())
-            ->method('getTrackedLead')
-            ->willReturn(null);
-
-        $this->coreParametersHelperMock->expects($this->once())
-            ->method('get')
-            ->willReturn(false);
-
-        $this->leadRepositoryMock->expects($this->never())
-            ->method('getLeadsByIp');
-        $this->leadFieldModelMock->expects($this->any())->method('getFieldListWithProperties')->willReturn([]);
-
-        $contact = $contactTracker->getContact();
-        $this->assertEquals(true, $contact->isNewlyCreated());
-    }
-
-    public function testEventIsDispatchedWithChangeOfContact()
-    {
-        $contactTracker = $this->getContactTracker();
-
-        $device = new LeadDevice();
-        $device->setTrackingId('abc123');
-
-        $lead = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $lead->method('getId')
-            ->willReturn(1);
-
-        $lead2 = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $lead2->method('getId')
-            ->willReturn(2);
-
-        $this->dispatcherMock->expects($this->once())
-            ->method('hasListeners')
-            ->withConsecutive([LeadEvents::CURRENT_LEAD_CHANGED])
-            ->willReturn(true);
-
-        $this->dispatcherMock->expects($this->once())
-            ->method('dispatch')
-            ->withConsecutive([LeadEvents::CURRENT_LEAD_CHANGED, $this->anything()])
-            ->willReturn(true);
-
-        $leadDevice1 = new LeadDevice();
-        $leadDevice1->setTrackingId('abc123');
-        $this->deviceTrackerMock->expects($this->at(0))
-            ->method('getTrackedDevice')
-            ->willReturn($leadDevice1);
-
-        $leadDevice2 = new LeadDevice();
-        $leadDevice2->setTrackingId('def456');
-        $this->deviceTrackerMock->expects($this->at(2))
-            ->method('getTrackedDevice')
-            ->willReturn($leadDevice2);
-
-        $contactTracker->setTrackedContact($lead);
-        $contactTracker->setTrackedContact($lead2);
-    }
-
-    /**
+        /**
      * @return ContactTracker
      */
-    private function getContactTracker()
-    {
-        return new ContactTracker(
-            $this->leadRepositoryMock,
-            $this->contactTrackingServiceMock,
-            $this->deviceTrackerMock,
-            $this->securityMock,
-            $this->loggerMock,
-            $this->ipLookupHelperMock,
-            $this->requestStack,
-            $this->coreParametersHelperMock,
-            $this->dispatcherMock,
-            $this->leadFieldModelMock
-        );
-    }
+        private function getContactTracker()
+        {
+            return new ContactTracker(
+                $this->leadRepositoryMock,
+                $this->contactTrackingServiceMock,
+                $this->deviceTrackerMock,
+                $this->securityMock,
+                $this->loggerMock,
+                $this->ipLookupHelperMock,
+                $this->requestStack,
+                $this->coreParametersHelperMock,
+                $this->dispatcherMock,
+                $this->leadFieldModelMock
+            );
+        }
 }

app/bundles/LeadBundle/Tests/Form/Validator/Constraints/FieldAliasKeywordValidatorTest.php

Switch Indentation +121 added lines, -121 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2018 Mautic Contributors. All rights reserved
@@ -9,152 +9,152 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Form\Validator\Constraints;
-
-use Doctrine\ORM\EntityManager;
-use Doctrine\ORM\UnitOfWork;
-use Mautic\LeadBundle\Entity\LeadField;
-use Mautic\LeadBundle\Form\Validator\Constraints\FieldAliasKeyword;
-use Mautic\LeadBundle\Form\Validator\Constraints\FieldAliasKeywordValidator;
-use Mautic\LeadBundle\Helper\FieldAliasHelper;
-use Mautic\LeadBundle\Model\ListModel;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
-
-class FieldAliasKeywordValidatorTest extends \PHPUnit\Framework\TestCase
-{
-    private $listModelMock;
-    private $fieldAliasHelperlMock;
-    private $executionContextMock;
-    private $entityManagerMock;
-    private $unitOfWorkMock;
-    private $validator;
-
-    protected function setUp(): void
+    namespace Mautic\LeadBundle\Tests\Form\Validator\Constraints;
+
+    use Doctrine\ORM\EntityManager;
+    use Doctrine\ORM\UnitOfWork;
+    use Mautic\LeadBundle\Entity\LeadField;
+    use Mautic\LeadBundle\Form\Validator\Constraints\FieldAliasKeyword;
+    use Mautic\LeadBundle\Form\Validator\Constraints\FieldAliasKeywordValidator;
+    use Mautic\LeadBundle\Helper\FieldAliasHelper;
+    use Mautic\LeadBundle\Model\ListModel;
+    use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+    class FieldAliasKeywordValidatorTest extends \PHPUnit\Framework\TestCase
     {
-        parent::setUp();
-
-        $this->fieldAliasHelperlMock = $this->createMock(FieldAliasHelper::class);
-        $this->listModelMock         = $this->createMock(ListModel::class);
-        $this->executionContextMock  = $this->createMock(ExecutionContextInterface::class);
-        $this->entityManagerMock     = $this->createMock(EntityManager::class);
-        $this->unitOfWorkMock        = $this->createMock(UnitOfWork::class);
-
-        $this->entityManagerMock
-            ->method('getUnitOfWork')
-            ->willReturn($this->unitOfWorkMock);
-
-        $this->listModelMock->method('getChoiceFields')
-            ->willReturn(
-                [
-                    'lead' => [
-                        'date_added' => [
-                            'label'      => 'mautic.core.date.added',
-                            'properties' => ['type' => 'date'],
-                            'operators'  => 'default',
-                            'object'     => 'lead',
+        private $listModelMock;
+        private $fieldAliasHelperlMock;
+        private $executionContextMock;
+        private $entityManagerMock;
+        private $unitOfWorkMock;
+        private $validator;
+
+        protected function setUp(): void
+        {
+            parent::setUp();
+
+            $this->fieldAliasHelperlMock = $this->createMock(FieldAliasHelper::class);
+            $this->listModelMock         = $this->createMock(ListModel::class);
+            $this->executionContextMock  = $this->createMock(ExecutionContextInterface::class);
+            $this->entityManagerMock     = $this->createMock(EntityManager::class);
+            $this->unitOfWorkMock        = $this->createMock(UnitOfWork::class);
+
+            $this->entityManagerMock
+                ->method('getUnitOfWork')
+                ->willReturn($this->unitOfWorkMock);
+
+            $this->listModelMock->method('getChoiceFields')
+                ->willReturn(
+                    [
+                        'lead' => [
+                            'date_added' => [
+                                'label'      => 'mautic.core.date.added',
+                                'properties' => ['type' => 'date'],
+                                'operators'  => 'default',
+                                'object'     => 'lead',
+                            ],
+                            'date_identified' => [
+                                'label'      => 'mautic.lead.list.filter.date_identified',
+                                'properties' => ['type' => 'date'],
+                                'operators'  => 'default',
+                                'object'     => 'lead',
+                            ],
                         ],
-                        'date_identified' => [
-                            'label'      => 'mautic.lead.list.filter.date_identified',
-                            'properties' => ['type' => 'date'],
-                            'operators'  => 'default',
-                            'object'     => 'lead',
-                        ],
-                    ],
-                ]
-            );
+                    ]
+                );
 
-        $this->validator = new FieldAliasKeywordValidator($this->listModelMock, $this->fieldAliasHelperlMock, $this->entityManagerMock);
-        $this->validator->initialize($this->executionContextMock);
-    }
+            $this->validator = new FieldAliasKeywordValidator($this->listModelMock, $this->fieldAliasHelperlMock, $this->entityManagerMock);
+            $this->validator->initialize($this->executionContextMock);
+        }
 
-    public function testAddValidationFailure()
-    {
-        $originalField = [];
+        public function testAddValidationFailure()
+        {
+            $originalField = [];
 
-        $this->unitOfWorkMock
-            ->method('getOriginalEntityData')
-            ->willReturn($originalField);
+            $this->unitOfWorkMock
+                ->method('getOriginalEntityData')
+                ->willReturn($originalField);
 
-        $field = new LeadField();
-        $field->setObject('lead');
-        $field->setAlias('date_added');
+            $field = new LeadField();
+            $field->setObject('lead');
+            $field->setAlias('date_added');
 
-        $this->executionContextMock->expects($this->once())->method('addViolation')->with('mautic.lead.field.keyword.invalid');
+            $this->executionContextMock->expects($this->once())->method('addViolation')->with('mautic.lead.field.keyword.invalid');
 
-        $this->validator->validate($field, new FieldAliasKeyword());
-    }
+            $this->validator->validate($field, new FieldAliasKeyword());
+        }
 
-    public function testAddValidationSuccess()
-    {
-        $originalField = [];
+        public function testAddValidationSuccess()
+        {
+            $originalField = [];
 
-        $this->unitOfWorkMock
-            ->method('getOriginalEntityData')
-            ->willReturn($originalField);
+            $this->unitOfWorkMock
+                ->method('getOriginalEntityData')
+                ->willReturn($originalField);
 
-        $field = new LeadField();
-        $field->setObject('lead');
-        $field->setAlias('not_keyword');
+            $field = new LeadField();
+            $field->setObject('lead');
+            $field->setAlias('not_keyword');
 
-        $this->executionContextMock->expects($this->never())->method('addViolation');
+            $this->executionContextMock->expects($this->never())->method('addViolation');
 
-        $this->validator->validate($field, new FieldAliasKeyword());
-    }
+            $this->validator->validate($field, new FieldAliasKeyword());
+        }
 
-    public function testEditValidationFailure()
-    {
-        $originalField = [
-            'alias' => 'old_alias',
-        ];
+        public function testEditValidationFailure()
+        {
+            $originalField = [
+                'alias' => 'old_alias',
+            ];
 
-        $this->unitOfWorkMock
-            ->method('getOriginalEntityData')
-            ->willReturn($originalField);
+            $this->unitOfWorkMock
+                ->method('getOriginalEntityData')
+                ->willReturn($originalField);
 
-        $field = new LeadField();
-        $field->setObject('lead');
-        $field->setAlias('date_added');
+            $field = new LeadField();
+            $field->setObject('lead');
+            $field->setAlias('date_added');
 
-        $this->executionContextMock->expects($this->once())->method('addViolation')->with('mautic.lead.field.keyword.invalid');
+            $this->executionContextMock->expects($this->once())->method('addViolation')->with('mautic.lead.field.keyword.invalid');
 
-        $this->validator->validate($field, new FieldAliasKeyword());
-    }
+            $this->validator->validate($field, new FieldAliasKeyword());
+        }
 
-    public function testEditValidationSuccess()
-    {
-        $originalField = [
-            'alias' => 'old_alias',
-        ];
+        public function testEditValidationSuccess()
+        {
+            $originalField = [
+                'alias' => 'old_alias',
+            ];
 
-        $this->unitOfWorkMock
-            ->method('getOriginalEntityData')
-            ->willReturn($originalField);
+            $this->unitOfWorkMock
+                ->method('getOriginalEntityData')
+                ->willReturn($originalField);
 
-        $field = new LeadField();
-        $field->setObject('lead');
-        $field->setAlias('not_keyword');
+            $field = new LeadField();
+            $field->setObject('lead');
+            $field->setAlias('not_keyword');
 
-        $this->executionContextMock->expects($this->never())->method('addViolation');
+            $this->executionContextMock->expects($this->never())->method('addViolation');
 
-        $this->validator->validate($field, new FieldAliasKeyword());
-    }
+            $this->validator->validate($field, new FieldAliasKeyword());
+        }
 
-    public function testEditWithoutChangesValidationSuccess()
-    {
-        $originalField = [
-            'alias' => 'date_added',
-        ];
+        public function testEditWithoutChangesValidationSuccess()
+        {
+            $originalField = [
+                'alias' => 'date_added',
+            ];
 
-        $this->unitOfWorkMock
-            ->method('getOriginalEntityData')
-            ->willReturn($originalField);
+            $this->unitOfWorkMock
+                ->method('getOriginalEntityData')
+                ->willReturn($originalField);
 
-        $field = new LeadField();
-        $field->setObject('lead');
-        $field->setAlias('date_added');
+            $field = new LeadField();
+            $field->setObject('lead');
+            $field->setAlias('date_added');
 
-        $this->executionContextMock->expects($this->never())->method('addViolation');
+            $this->executionContextMock->expects($this->never())->method('addViolation');
 
-        $this->validator->validate($field, new FieldAliasKeyword());
-    }
+            $this->validator->validate($field, new FieldAliasKeyword());
+        }
 }

app/bundles/LeadBundle/Tests/StandardImportTestHelper.php

Switch Indentation +154 added lines, -154 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2016 Mautic Contributors. All rights reserved
@@ -9,178 +9,178 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests;
-
-use Mautic\CoreBundle\Helper\UserHelper;
-use Mautic\CoreBundle\Model\NotificationModel;
-use Mautic\CoreBundle\Tests\CommonMocks;
-use Mautic\LeadBundle\Entity\Import;
-use Mautic\LeadBundle\Entity\ImportRepository;
-use Mautic\LeadBundle\Entity\LeadEventLogRepository;
-use Mautic\LeadBundle\Model\CompanyModel;
-use Mautic\LeadBundle\Model\ImportModel;
-use Mautic\LeadBundle\Model\LeadModel;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-
-abstract class StandardImportTestHelper extends CommonMocks
-{
-    protected $eventEntities = [];
-    protected static $csvPath;
-    protected static $largeCsvPath;
-
-    protected static $initialList = [
-        ['email', 'firstname', 'lastname'],
-        ['john@doe.email', 'John', 'Doe'],
-        ['bad.@doe.email', 'Bad', 'Doe'],
-        ['donald@doe.email', 'Don', 'Doe'],
-        [''],
-        ['ella@doe.email', 'Ella', 'Doe'],
-    ];
-
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
+    namespace Mautic\LeadBundle\Tests;
 
-        static::generateSmallCSV();
-        static::generateLargeCSV();
-    }
+    use Mautic\CoreBundle\Helper\UserHelper;
+    use Mautic\CoreBundle\Model\NotificationModel;
+    use Mautic\CoreBundle\Tests\CommonMocks;
+    use Mautic\LeadBundle\Entity\Import;
+    use Mautic\LeadBundle\Entity\ImportRepository;
+    use Mautic\LeadBundle\Entity\LeadEventLogRepository;
+    use Mautic\LeadBundle\Model\CompanyModel;
+    use Mautic\LeadBundle\Model\ImportModel;
+    use Mautic\LeadBundle\Model\LeadModel;
+    use Symfony\Component\EventDispatcher\EventDispatcher;
 
-    public static function tearDownAfterClass(): void
+    abstract class StandardImportTestHelper extends CommonMocks
     {
-        if (file_exists(self::$csvPath)) {
-            unlink(self::$csvPath);
+        protected $eventEntities = [];
+        protected static $csvPath;
+        protected static $largeCsvPath;
+
+        protected static $initialList = [
+            ['email', 'firstname', 'lastname'],
+            ['john@doe.email', 'John', 'Doe'],
+            ['bad.@doe.email', 'Bad', 'Doe'],
+            ['donald@doe.email', 'Don', 'Doe'],
+            [''],
+            ['ella@doe.email', 'Ella', 'Doe'],
+        ];
+
+        public static function setUpBeforeClass(): void
+        {
+            parent::setUpBeforeClass();
+
+            static::generateSmallCSV();
+            static::generateLargeCSV();
         }
 
-        if (file_exists(self::$largeCsvPath)) {
-            unlink(self::$largeCsvPath);
+        public static function tearDownAfterClass(): void
+        {
+            if (file_exists(self::$csvPath)) {
+                unlink(self::$csvPath);
+            }
+
+            if (file_exists(self::$largeCsvPath)) {
+                unlink(self::$largeCsvPath);
+            }
+
+            parent::tearDownAfterClass();
         }
 
-        parent::tearDownAfterClass();
-    }
+        public static function generateSmallCSV()
+        {
+            $tmpFile = tempnam(sys_get_temp_dir(), 'mautic_import_test_');
+            $file    = fopen($tmpFile, 'w');
 
-    public static function generateSmallCSV()
-    {
-        $tmpFile = tempnam(sys_get_temp_dir(), 'mautic_import_test_');
-        $file    = fopen($tmpFile, 'w');
+            foreach (self::$initialList as $line) {
+                fputcsv($file, $line);
+            }
 
-        foreach (self::$initialList as $line) {
-            fputcsv($file, $line);
+            fclose($file);
+            self::$csvPath = $tmpFile;
         }
 
-        fclose($file);
-        self::$csvPath = $tmpFile;
-    }
+        public static function generateLargeCSV()
+        {
+            $tmpFile = tempnam(sys_get_temp_dir(), 'mautic_import_large_test_');
+            $file    = fopen($tmpFile, 'w');
+            fputcsv($file, ['email', 'firstname', 'lastname']);
+            $counter = 510;
+            while ($counter) {
+                fputcsv($file, [uniqid().'@gmail.com', uniqid(), uniqid()]);
 
-    public static function generateLargeCSV()
-    {
-        $tmpFile = tempnam(sys_get_temp_dir(), 'mautic_import_large_test_');
-        $file    = fopen($tmpFile, 'w');
-        fputcsv($file, ['email', 'firstname', 'lastname']);
-        $counter = 510;
-        while ($counter) {
-            fputcsv($file, [uniqid().'@gmail.com', uniqid(), uniqid()]);
-
-            --$counter;
+                --$counter;
+            }
+
+            fclose($file);
+            self::$largeCsvPath = $tmpFile;
         }
 
-        fclose($file);
-        self::$largeCsvPath = $tmpFile;
-    }
+        public function setUp(): void
+        {
+            defined('MAUTIC_ENV') or define('MAUTIC_ENV', 'test');
 
-    public function setUp(): void
-    {
-        defined('MAUTIC_ENV') or define('MAUTIC_ENV', 'test');
+            $this->eventEntities = [];
+        }
 
-        $this->eventEntities = [];
-    }
+        protected function initImportEntity(array $methods = null)
+        {
+            $entity = $this->getMockBuilder(Import::class)
+                ->setMethods($methods)
+                ->getMock();
 
-    protected function initImportEntity(array $methods = null)
-    {
-        $entity = $this->getMockBuilder(Import::class)
-            ->setMethods($methods)
-            ->getMock();
-
-        $entity->setFilePath(self::$csvPath)
-            ->setLineCount(count(self::$initialList))
-            ->setHeaders(self::$initialList[0])
-            ->setParserConfig(
-                [
-                    'batchlimit' => 10,
-                    'delimiter'  => ',',
-                    'enclosure'  => '"',
-                    'escape'     => '/',
-                ]
-            );
-
-        return $entity;
-    }
-
-    /**
-     * Initialize the ImportModel object.
-     *
-     * @return ImportModel
-     */
-    protected function initImportModel()
-    {
-        $translator           = $this->getTranslatorMock();
-        $pathsHelper          = $this->getPathsHelperMock();
-        $entityManager        = $this->getEntityManagerMock();
-        $coreParametersHelper = $this->getCoreParametersHelperMock();
-
-        $logRepository = $this->getMockBuilder(LeadEventLogRepository::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $importRepository = $this->getMockBuilder(ImportRepository::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $importRepository->method('getValue')
-            ->willReturn(true);
-
-        $entityManager->expects($this->any())
-            ->method('getRepository')
-            ->will(
-                $this->returnValueMap(
+            $entity->setFilePath(self::$csvPath)
+                ->setLineCount(count(self::$initialList))
+                ->setHeaders(self::$initialList[0])
+                ->setParserConfig(
                     [
-                        ['MauticLeadBundle:LeadEventLog', $logRepository],
-                        ['MauticLeadBundle:Import', $importRepository],
+                        'batchlimit' => 10,
+                        'delimiter'  => ',',
+                        'enclosure'  => '"',
+                        'escape'     => '/',
                     ]
-                )
-            );
-
-        $leadModel = $this->getMockBuilder(LeadModel::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+                );
 
-        $leadModel->setEntityManager($entityManager);
-
-        $leadModel->expects($this->any())
-            ->method('getEventLogRepository')
-            ->will($this->returnValue($logRepository));
-
-        $companyModel = $this->getMockBuilder(CompanyModel::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $companyModel->setEntityManager($entityManager);
-
-        $notificationModel = $this->getMockBuilder(NotificationModel::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $notificationModel->setEntityManager($entityManager);
-
-        $importModel = new ImportModel($pathsHelper, $leadModel, $notificationModel, $coreParametersHelper, $companyModel);
-        $importModel->setEntityManager($entityManager);
-        $importModel->setTranslator($translator);
-
-        $userHelper = $this->getMockBuilder(UserHelper::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $importModel->setUserHelper($userHelper);
-
-        $importModel->setDispatcher(new EventDispatcher());
+            return $entity;
+        }
 
-        return $importModel;
-    }
+        /**
+     * Initialize the ImportModel object.
+     *
+     * @return ImportModel
+     */
+        protected function initImportModel()
+        {
+            $translator           = $this->getTranslatorMock();
+            $pathsHelper          = $this->getPathsHelperMock();
+            $entityManager        = $this->getEntityManagerMock();
+            $coreParametersHelper = $this->getCoreParametersHelperMock();
+
+            $logRepository = $this->getMockBuilder(LeadEventLogRepository::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $importRepository = $this->getMockBuilder(ImportRepository::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $importRepository->method('getValue')
+                ->willReturn(true);
+
+            $entityManager->expects($this->any())
+                ->method('getRepository')
+                ->will(
+                    $this->returnValueMap(
+                        [
+                            ['MauticLeadBundle:LeadEventLog', $logRepository],
+                            ['MauticLeadBundle:Import', $importRepository],
+                        ]
+                    )
+                );
+
+            $leadModel = $this->getMockBuilder(LeadModel::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $leadModel->setEntityManager($entityManager);
+
+            $leadModel->expects($this->any())
+                ->method('getEventLogRepository')
+                ->will($this->returnValue($logRepository));
+
+            $companyModel = $this->getMockBuilder(CompanyModel::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $companyModel->setEntityManager($entityManager);
+
+            $notificationModel = $this->getMockBuilder(NotificationModel::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $notificationModel->setEntityManager($entityManager);
+
+            $importModel = new ImportModel($pathsHelper, $leadModel, $notificationModel, $coreParametersHelper, $companyModel);
+            $importModel->setEntityManager($entityManager);
+            $importModel->setTranslator($translator);
+
+            $userHelper = $this->getMockBuilder(UserHelper::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+            $importModel->setUserHelper($userHelper);
+
+            $importModel->setDispatcher(new EventDispatcher());
+
+            return $importModel;
+        }
 }

app/bundles/LeadBundle/Tests/Deduplicate/ContactDeduperTest.php

Switch Indentation +138 added lines, -138 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2018 Mautic Contributors. All rights reserved
@@ -9,158 +9,158 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Deduplicate;
+    namespace Mautic\LeadBundle\Tests\Deduplicate;
 
-use Mautic\LeadBundle\Deduplicate\ContactDeduper;
-use Mautic\LeadBundle\Deduplicate\ContactMerger;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadRepository;
-use Mautic\LeadBundle\Model\FieldModel;
+    use Mautic\LeadBundle\Deduplicate\ContactDeduper;
+    use Mautic\LeadBundle\Deduplicate\ContactMerger;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadRepository;
+    use Mautic\LeadBundle\Model\FieldModel;
 
-class ContactDeduperTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    class ContactDeduperTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|FieldModel
      */
-    private $fieldModel;
+        private $fieldModel;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|ContactMerger
      */
-    private $contactMerger;
+        private $contactMerger;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|LeadRepository
      */
-    private $leadRepository;
-
-    protected function setUp(): void
-    {
-        $this->fieldModel = $this->getMockBuilder(FieldModel::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->contactMerger = $this->getMockBuilder(ContactMerger::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->leadRepository = $this->getMockBuilder(LeadRepository::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    public function testDuplicatesAreMergedWithMergeOlderIntoNewer()
-    {
-        $this->leadRepository->expects($this->once())
-            ->method('getIdentifiedContactCount')
-            ->willReturn(4);
-
-        $lead1 = $this->getLead(1, 'lead1@test.com');
-        $lead2 = $this->getLead(2, 'lead2@test.com');
-        $lead3 = $this->getLead(3, 'lead3@test.com');
-        // Duplicate
-        $lead4 = $this->getLead(4, 'lead1@test.com');
-
-        $this->leadRepository->expects($this->exactly(4))
-            ->method('getNextIdentifiedContact')
-            ->withConsecutive([0], [1], [2], [3])
-            ->willReturnOnConsecutiveCalls($lead1, $lead2, $lead3, null);
-
-        $this->fieldModel->expects($this->exactly(3))
-            ->method('getUniqueIdentifierFields')
-            ->willReturn(['email' => 'email']);
-        $this->fieldModel->expects($this->once())
-            ->method('getFieldList')
-            ->willReturn(['email' => 'email']);
-
-        $this->leadRepository->expects($this->exactly(3))
-            ->method('getLeadsByUniqueFields')
-            // $lead4 has a older dateAdded
-            ->willReturnOnConsecutiveCalls([$lead4, $lead1], [], []);
-
-        // $lead4 is winner as the older contact
-        $this->contactMerger->expects($this->once())
-            ->method('merge')
-            ->with($lead4, $lead1);
-
-        $this->getDeduper()->deduplicate();
-    }
-
-    public function testDuplicatesAreMergedWithMergeNewerIntoOlder()
-    {
-        $this->leadRepository->expects($this->once())
-            ->method('getIdentifiedContactCount')
-            ->willReturn(4);
-
-        $lead1 = $this->getLead(1, 'lead1@test.com');
-        $lead2 = $this->getLead(2, 'lead2@test.com');
-        $lead3 = $this->getLead(3, 'lead3@test.com');
-        // Duplicate
-        $lead4 = $this->getLead(4, 'lead1@test.com');
-
-        $this->leadRepository->expects($this->exactly(4))
-            ->method('getNextIdentifiedContact')
-            ->withConsecutive([0], [1], [2], [3])
-            ->willReturnOnConsecutiveCalls($lead1, $lead2, $lead3, null);
-
-        $this->fieldModel->expects($this->exactly(3))
-            ->method('getUniqueIdentifierFields')
-            ->willReturn(['email' => 'email']);
-        $this->fieldModel->expects($this->once())
-            ->method('getFieldList')
-            ->willReturn(['email' => 'email']);
-
-        $this->leadRepository->expects($this->exactly(3))
-            ->method('getLeadsByUniqueFields')
-            // $lead1 has a older dateAdded
-            ->willReturnOnConsecutiveCalls([$lead1, $lead4], [], []);
-
-        // $lead1 is the winner as the newer contact
-        $this->contactMerger->expects($this->once())
-            ->method('merge')
-            ->with($lead1, $lead4);
-
-        $this->getDeduper()->deduplicate();
-    }
-
-    /**
+        private $leadRepository;
+
+        protected function setUp(): void
+        {
+            $this->fieldModel = $this->getMockBuilder(FieldModel::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->contactMerger = $this->getMockBuilder(ContactMerger::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+
+            $this->leadRepository = $this->getMockBuilder(LeadRepository::class)
+                ->disableOriginalConstructor()
+                ->getMock();
+        }
+
+        public function testDuplicatesAreMergedWithMergeOlderIntoNewer()
+        {
+            $this->leadRepository->expects($this->once())
+                ->method('getIdentifiedContactCount')
+                ->willReturn(4);
+
+            $lead1 = $this->getLead(1, 'lead1@test.com');
+            $lead2 = $this->getLead(2, 'lead2@test.com');
+            $lead3 = $this->getLead(3, 'lead3@test.com');
+            // Duplicate
+            $lead4 = $this->getLead(4, 'lead1@test.com');
+
+            $this->leadRepository->expects($this->exactly(4))
+                ->method('getNextIdentifiedContact')
+                ->withConsecutive([0], [1], [2], [3])
+                ->willReturnOnConsecutiveCalls($lead1, $lead2, $lead3, null);
+
+            $this->fieldModel->expects($this->exactly(3))
+                ->method('getUniqueIdentifierFields')
+                ->willReturn(['email' => 'email']);
+            $this->fieldModel->expects($this->once())
+                ->method('getFieldList')
+                ->willReturn(['email' => 'email']);
+
+            $this->leadRepository->expects($this->exactly(3))
+                ->method('getLeadsByUniqueFields')
+                // $lead4 has a older dateAdded
+                ->willReturnOnConsecutiveCalls([$lead4, $lead1], [], []);
+
+            // $lead4 is winner as the older contact
+            $this->contactMerger->expects($this->once())
+                ->method('merge')
+                ->with($lead4, $lead1);
+
+            $this->getDeduper()->deduplicate();
+        }
+
+        public function testDuplicatesAreMergedWithMergeNewerIntoOlder()
+        {
+            $this->leadRepository->expects($this->once())
+                ->method('getIdentifiedContactCount')
+                ->willReturn(4);
+
+            $lead1 = $this->getLead(1, 'lead1@test.com');
+            $lead2 = $this->getLead(2, 'lead2@test.com');
+            $lead3 = $this->getLead(3, 'lead3@test.com');
+            // Duplicate
+            $lead4 = $this->getLead(4, 'lead1@test.com');
+
+            $this->leadRepository->expects($this->exactly(4))
+                ->method('getNextIdentifiedContact')
+                ->withConsecutive([0], [1], [2], [3])
+                ->willReturnOnConsecutiveCalls($lead1, $lead2, $lead3, null);
+
+            $this->fieldModel->expects($this->exactly(3))
+                ->method('getUniqueIdentifierFields')
+                ->willReturn(['email' => 'email']);
+            $this->fieldModel->expects($this->once())
+                ->method('getFieldList')
+                ->willReturn(['email' => 'email']);
+
+            $this->leadRepository->expects($this->exactly(3))
+                ->method('getLeadsByUniqueFields')
+                // $lead1 has a older dateAdded
+                ->willReturnOnConsecutiveCalls([$lead1, $lead4], [], []);
+
+            // $lead1 is the winner as the newer contact
+            $this->contactMerger->expects($this->once())
+                ->method('merge')
+                ->with($lead1, $lead4);
+
+            $this->getDeduper()->deduplicate();
+        }
+
+        /**
      * @param $id
      * @param $email
      *
      * @return Lead|\PHPUnit\Framework\MockObject\MockObject
      */
-    private function getLead($id, $email)
-    {
-        $lead = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $lead->expects($this->any())
-            ->method('getId')
-            ->willReturn($id);
-        $lead->expects($this->any())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => $id,
-                    'points' => 10,
-                    'email'  => $email,
-                ]
-            );
-        $lead->expects($this->any())
-            ->method('getDateModified')
-            ->willReturn(new \DateTime());
-
-        return $lead;
-    }
-
-    /**
+        private function getLead($id, $email)
+        {
+            $lead = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $lead->expects($this->any())
+                ->method('getId')
+                ->willReturn($id);
+            $lead->expects($this->any())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => $id,
+                        'points' => 10,
+                        'email'  => $email,
+                    ]
+                );
+            $lead->expects($this->any())
+                ->method('getDateModified')
+                ->willReturn(new \DateTime());
+
+            return $lead;
+        }
+
+        /**
      * @return ContactDeduper
      */
-    private function getDeduper()
-    {
-        return new ContactDeduper(
-            $this->fieldModel,
-            $this->contactMerger,
-            $this->leadRepository
-        );
-    }
+        private function getDeduper()
+        {
+            return new ContactDeduper(
+                $this->fieldModel,
+                $this->contactMerger,
+                $this->leadRepository
+            );
+        }
 }

app/bundles/LeadBundle/Tests/Deduplicate/ContactMergerTest.php

Switch Indentation +653 added lines, -653 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /*
  * @copyright   2018 Mautic Contributors. All rights reserved
@@ -9,730 +9,730 @@ 
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\LeadBundle\Tests\Deduplicate;
-
-use Doctrine\Common\Collections\ArrayCollection;
-use Mautic\CoreBundle\Entity\IpAddress;
-use Mautic\LeadBundle\Deduplicate\ContactMerger;
-use Mautic\LeadBundle\Deduplicate\Exception\SameContactException;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadRepository;
-use Mautic\LeadBundle\Entity\MergeRecordRepository;
-use Mautic\LeadBundle\Entity\Tag;
-use Mautic\LeadBundle\Model\LeadModel;
-use Mautic\UserBundle\Entity\User;
-use Monolog\Logger;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-
-class ContactMergerTest extends \PHPUnit\Framework\TestCase
-{
-    /**
+    namespace Mautic\LeadBundle\Tests\Deduplicate;
+
+    use Doctrine\Common\Collections\ArrayCollection;
+    use Mautic\CoreBundle\Entity\IpAddress;
+    use Mautic\LeadBundle\Deduplicate\ContactMerger;
+    use Mautic\LeadBundle\Deduplicate\Exception\SameContactException;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadRepository;
+    use Mautic\LeadBundle\Entity\MergeRecordRepository;
+    use Mautic\LeadBundle\Entity\Tag;
+    use Mautic\LeadBundle\Model\LeadModel;
+    use Mautic\UserBundle\Entity\User;
+    use Monolog\Logger;
+    use Symfony\Component\EventDispatcher\EventDispatcher;
+
+    class ContactMergerTest extends \PHPUnit\Framework\TestCase
+    {
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|LeadModel
      */
-    private $leadModel;
+        private $leadModel;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|MergeRecordRepository
      */
-    private $leadRepo;
+        private $leadRepo;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|MergeRecordRepository
      */
-    private $mergeRecordRepo;
+        private $mergeRecordRepo;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|EventDispatcher
      */
-    private $dispatcher;
+        private $dispatcher;
 
-    /**
+        /**
      * @var \PHPUnit\Framework\MockObject\MockObject|Logger
      */
-    private $logger;
+        private $logger;
 
-    protected function setUp(): void
-    {
-        $this->leadModel       = $this->createMock(LeadModel::class);
-        $this->leadRepo        = $this->createMock(LeadRepository::class);
-        $this->mergeRecordRepo = $this->createMock(MergeRecordRepository::class);
-        $this->dispatcher      = $this->createMock(EventDispatcher::class);
-        $this->logger          = $this->createMock(Logger::class);
+        protected function setUp(): void
+        {
+            $this->leadModel       = $this->createMock(LeadModel::class);
+            $this->leadRepo        = $this->createMock(LeadRepository::class);
+            $this->mergeRecordRepo = $this->createMock(MergeRecordRepository::class);
+            $this->dispatcher      = $this->createMock(EventDispatcher::class);
+            $this->logger          = $this->createMock(Logger::class);
 
-        $this->leadModel->method('getRepository')->willReturn($this->leadRepo);
-    }
+            $this->leadModel->method('getRepository')->willReturn($this->leadRepo);
+        }
 
-    public function testMergeTimestamps()
-    {
-        $oldestDateTime = new \DateTime('-60 minutes');
-        $latestDateTime = new \DateTime('-30 minutes');
+        public function testMergeTimestamps()
+        {
+            $oldestDateTime = new \DateTime('-60 minutes');
+            $latestDateTime = new \DateTime('-30 minutes');
 
-        $winner = new Lead();
-        $winner->setLastActive($oldestDateTime);
-        $winner->setDateIdentified($latestDateTime);
+            $winner = new Lead();
+            $winner->setLastActive($oldestDateTime);
+            $winner->setDateIdentified($latestDateTime);
 
-        $loser  = new Lead();
-        $loser->setLastActive($latestDateTime);
-        $loser->setDateIdentified($oldestDateTime);
+            $loser  = new Lead();
+            $loser->setLastActive($latestDateTime);
+            $loser->setDateIdentified($oldestDateTime);
 
-        $this->getMerger()->mergeTimestamps($winner, $loser);
+            $this->getMerger()->mergeTimestamps($winner, $loser);
 
-        $this->assertEquals($latestDateTime, $winner->getLastActive());
-        $this->assertEquals($oldestDateTime, $winner->getDateIdentified());
+            $this->assertEquals($latestDateTime, $winner->getLastActive());
+            $this->assertEquals($oldestDateTime, $winner->getDateIdentified());
 
-        // Test with null date identified loser
-        $winner->setDateIdentified($latestDateTime);
-        $loser->setDateIdentified(null);
+            // Test with null date identified loser
+            $winner->setDateIdentified($latestDateTime);
+            $loser->setDateIdentified(null);
 
-        $this->getMerger()->mergeTimestamps($winner, $loser);
+            $this->getMerger()->mergeTimestamps($winner, $loser);
 
-        $this->assertEquals($latestDateTime, $winner->getDateIdentified());
+            $this->assertEquals($latestDateTime, $winner->getDateIdentified());
 
-        // Test with null date identified winner
-        $winner->setDateIdentified(null);
-        $loser->setDateIdentified($latestDateTime);
+            // Test with null date identified winner
+            $winner->setDateIdentified(null);
+            $loser->setDateIdentified($latestDateTime);
 
-        $this->getMerger()->mergeTimestamps($winner, $loser);
+            $this->getMerger()->mergeTimestamps($winner, $loser);
 
-        $this->assertEquals($latestDateTime, $winner->getDateIdentified());
-    }
+            $this->assertEquals($latestDateTime, $winner->getDateIdentified());
+        }
 
-    public function testMergeIpAddresses()
-    {
-        $winner = new Lead();
-        $winner->addIpAddress((new IpAddress('1.2.3.4'))->setIpDetails('from winner'));
-        $winner->addIpAddress((new IpAddress('4.3.2.1'))->setIpDetails('from winner'));
-        $winner->addIpAddress((new IpAddress('5.6.7.8'))->setIpDetails('from winner'));
+        public function testMergeIpAddresses()
+        {
+            $winner = new Lead();
+            $winner->addIpAddress((new IpAddress('1.2.3.4'))->setIpDetails('from winner'));
+            $winner->addIpAddress((new IpAddress('4.3.2.1'))->setIpDetails('from winner'));
+            $winner->addIpAddress((new IpAddress('5.6.7.8'))->setIpDetails('from winner'));
 
-        $loser = new Lead();
-        $loser->addIpAddress((new IpAddress('5.6.7.8'))->setIpDetails('from loser'));
-        $loser->addIpAddress((new IpAddress('8.7.6.5'))->setIpDetails('from loser'));
+            $loser = new Lead();
+            $loser->addIpAddress((new IpAddress('5.6.7.8'))->setIpDetails('from loser'));
+            $loser->addIpAddress((new IpAddress('8.7.6.5'))->setIpDetails('from loser'));
 
-        $this->getMerger()->mergeIpAddressHistory($winner, $loser);
+            $this->getMerger()->mergeIpAddressHistory($winner, $loser);
 
-        $ipAddresses = $winner->getIpAddresses();
-        $this->assertCount(4, $ipAddresses);
+            $ipAddresses = $winner->getIpAddresses();
+            $this->assertCount(4, $ipAddresses);
 
-        $ipAddressArray = $ipAddresses->toArray();
+            $ipAddressArray = $ipAddresses->toArray();
 
-        $expectedIpAddressArray = [
-            '1.2.3.4' => 'from winner',
-            '4.3.2.1' => 'from winner',
-            '5.6.7.8' => 'from winner',
-            '8.7.6.5' => 'from loser',
-        ];
+            $expectedIpAddressArray = [
+                '1.2.3.4' => 'from winner',
+                '4.3.2.1' => 'from winner',
+                '5.6.7.8' => 'from winner',
+                '8.7.6.5' => 'from loser',
+            ];
 
-        foreach ($expectedIpAddressArray as $ipAddress => $ipId) {
-            $this->assertSame($ipAddress, $ipAddressArray[$ipAddress]->getIpAddress());
-            $this->assertSame($ipId, $ipAddressArray[$ipAddress]->getIpDetails());
+            foreach ($expectedIpAddressArray as $ipAddress => $ipId) {
+                $this->assertSame($ipAddress, $ipAddressArray[$ipAddress]->getIpAddress());
+                $this->assertSame($ipId, $ipAddressArray[$ipAddress]->getIpDetails());
+            }
         }
-    }
-
-    public function testMergeFieldDataWithLoserAsNewlyUpdated()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 1,
-                    'points' => 10,
-                    'email'  => 'winner@test.com',
-                ]
-            );
-
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 2,
-                    'points' => 20,
-                    'email'  => 'loser@test.com',
-                ]
-            );
-
-        $merger = $this->getMerger();
-
-        $winnerDateModified = new \DateTime('-30 minutes');
-        $loserDateModified  = new \DateTime();
-        $winner->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($winnerDateModified);
-        $loser->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($loserDateModified);
-        $winner->expects($this->once())
-            ->method('getFieldValue')
-            ->with('email')
-            ->willReturn('winner@test.com');
-
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn([
-                'value'         => 'winner@test.com',
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ]);
-
-        $winner->expects($this->exactly(3))
-            ->method('getId')
-            ->willReturn(1);
-
-        $loser->expects($this->exactly(2))
-            ->method('getId')
-            ->willReturn(2);
-
-        // Loser values are newest so should be kept
-        // id and points should not be set addUpdatedField should only be called once for email
-        $winner->expects($this->once())
-            ->method('addUpdatedField')
-            ->with('email', 'loser@test.com');
-
-        $merger->mergeFieldData($winner, $loser);
-    }
-
-    public function testMergeFieldDataWithWinnerAsNewlyUpdated()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 1,
-                    'points' => 10,
-                    'email'  => 'winner@test.com',
-                ]
-            );
 
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 2,
-                    'points' => 20,
-                    'email'  => 'loser@test.com',
-                ]
-            );
-
-        $merger = $this->getMerger();
-
-        $winnerDateModified = new \DateTime();
-        $loserDateModified  = new \DateTime('-30 minutes');
-        $winner->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($winnerDateModified);
-
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn([
-                'value'         => 'winner@test.com',
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ]);
-
-        $winner->expects($this->once())
-            ->method('getFieldValue')
-            ->with('email')
-            ->willReturn('winner@test.com');
-
-        $loser->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($loserDateModified);
-
-        $winner->expects($this->exactly(4))
-            ->method('getId')
-            ->willReturn(1);
-
-        $loser->expects($this->once())
-            ->method('getId');
-
-        // Winner values are newest so should be kept
-        // addUpdatedField should never be called as they aren't different values
-        $winner->expects($this->never())
-            ->method('addUpdatedField');
-
-        $merger->mergeFieldData($winner, $loser);
-    }
-
-    public function testMergeFieldDataWithLoserAsNewlyCreated()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 1,
-                    'points' => 10,
-                    'email'  => 'winner@test.com',
-                ]
-            );
+        public function testMergeFieldDataWithLoserAsNewlyUpdated()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 1,
+                        'points' => 10,
+                        'email'  => 'winner@test.com',
+                    ]
+                );
+
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 2,
+                        'points' => 20,
+                        'email'  => 'loser@test.com',
+                    ]
+                );
+
+            $merger = $this->getMerger();
+
+            $winnerDateModified = new \DateTime('-30 minutes');
+            $loserDateModified  = new \DateTime();
+            $winner->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($winnerDateModified);
+            $loser->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($loserDateModified);
+            $winner->expects($this->once())
+                ->method('getFieldValue')
+                ->with('email')
+                ->willReturn('winner@test.com');
+
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn([
+                    'value'         => 'winner@test.com',
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ]);
+
+            $winner->expects($this->exactly(3))
+                ->method('getId')
+                ->willReturn(1);
+
+            $loser->expects($this->exactly(2))
+                ->method('getId')
+                ->willReturn(2);
+
+            // Loser values are newest so should be kept
+            // id and points should not be set addUpdatedField should only be called once for email
+            $winner->expects($this->once())
+                ->method('addUpdatedField')
+                ->with('email', 'loser@test.com');
+
+            $merger->mergeFieldData($winner, $loser);
+        }
 
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 2,
-                    'points' => 20,
-                    'email'  => 'loser@test.com',
-                ]
-            );
+        public function testMergeFieldDataWithWinnerAsNewlyUpdated()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 1,
+                        'points' => 10,
+                        'email'  => 'winner@test.com',
+                    ]
+                );
+
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 2,
+                        'points' => 20,
+                        'email'  => 'loser@test.com',
+                    ]
+                );
+
+            $merger = $this->getMerger();
+
+            $winnerDateModified = new \DateTime();
+            $loserDateModified  = new \DateTime('-30 minutes');
+            $winner->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($winnerDateModified);
+
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn([
+                    'value'         => 'winner@test.com',
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ]);
+
+            $winner->expects($this->once())
+                ->method('getFieldValue')
+                ->with('email')
+                ->willReturn('winner@test.com');
+
+            $loser->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($loserDateModified);
+
+            $winner->expects($this->exactly(4))
+                ->method('getId')
+                ->willReturn(1);
+
+            $loser->expects($this->once())
+                ->method('getId');
+
+            // Winner values are newest so should be kept
+            // addUpdatedField should never be called as they aren't different values
+            $winner->expects($this->never())
+                ->method('addUpdatedField');
+
+            $merger->mergeFieldData($winner, $loser);
+        }
 
-        $merger = $this->getMerger();
-
-        $winnerDateModified = new \DateTime('-30 minutes');
-        $loserDateModified  = new \DateTime();
-        $winner->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($winnerDateModified);
-
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn([
-                'value'         => 'winner@test.com',
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ]);
-
-        $winner->expects($this->once())
-            ->method('getFieldValue')
-            ->with('email')
-            ->willReturn('winner@test.com');
-
-        $loser->expects($this->exactly(1))
-            ->method('getDateModified')
-            ->willReturn(null);
-        $loser->expects($this->once())
-            ->method('getDateAdded')
-            ->willReturn($loserDateModified);
-
-        $winner->expects($this->exactly(3))
-            ->method('getId')
-            ->willReturn(1);
-
-        $loser->expects($this->exactly(2))
-            ->method('getId')
-            ->willReturn(2);
-
-        // Loser values are newest so should be kept
-        // id and points should not be set addUpdatedField should only be called once for email
-        $winner->expects($this->once())
-            ->method('addUpdatedField')
-            ->with('email', 'loser@test.com');
-
-        $merger->mergeFieldData($winner, $loser);
-    }
-
-    public function testMergeFieldDataWithWinnerAsNewlyCreated()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 1,
-                    'points' => 10,
-                    'email'  => 'winner@test.com',
-                ]
-            );
+        public function testMergeFieldDataWithLoserAsNewlyCreated()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 1,
+                        'points' => 10,
+                        'email'  => 'winner@test.com',
+                    ]
+                );
+
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 2,
+                        'points' => 20,
+                        'email'  => 'loser@test.com',
+                    ]
+                );
+
+            $merger = $this->getMerger();
+
+            $winnerDateModified = new \DateTime('-30 minutes');
+            $loserDateModified  = new \DateTime();
+            $winner->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($winnerDateModified);
+
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn([
+                    'value'         => 'winner@test.com',
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ]);
+
+            $winner->expects($this->once())
+                ->method('getFieldValue')
+                ->with('email')
+                ->willReturn('winner@test.com');
+
+            $loser->expects($this->exactly(1))
+                ->method('getDateModified')
+                ->willReturn(null);
+            $loser->expects($this->once())
+                ->method('getDateAdded')
+                ->willReturn($loserDateModified);
+
+            $winner->expects($this->exactly(3))
+                ->method('getId')
+                ->willReturn(1);
+
+            $loser->expects($this->exactly(2))
+                ->method('getId')
+                ->willReturn(2);
+
+            // Loser values are newest so should be kept
+            // id and points should not be set addUpdatedField should only be called once for email
+            $winner->expects($this->once())
+                ->method('addUpdatedField')
+                ->with('email', 'loser@test.com');
+
+            $merger->mergeFieldData($winner, $loser);
+        }
 
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 2,
-                    'points' => 20,
-                    'email'  => 'loser@test.com',
-                ]
-            );
+        public function testMergeFieldDataWithWinnerAsNewlyCreated()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 1,
+                        'points' => 10,
+                        'email'  => 'winner@test.com',
+                    ]
+                );
+
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 2,
+                        'points' => 20,
+                        'email'  => 'loser@test.com',
+                    ]
+                );
+
+            $merger = $this->getMerger();
+
+            $winnerDateModified = new \DateTime();
+            $loserDateModified  = new \DateTime('-30 minutes');
+            $winner->expects($this->once())
+                ->method('getDateModified')
+                ->willReturn(null);
+            $winner->expects($this->once())
+                ->method('getDateAdded')
+                ->willReturn($winnerDateModified);
+
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn([
+                    'value'         => 'winner@test.com',
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ]);
+
+            $winner->expects($this->once())
+                ->method('getFieldValue')
+                ->with('email')
+                ->willReturn('winner@test.com');
+
+            $loser->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn($loserDateModified);
+
+            $winner->expects($this->exactly(4))
+                ->method('getId')
+                ->willReturn(1);
+
+            $loser->expects($this->once())
+                ->method('getId');
+
+            // Winner values are newest so should be kept
+            // addUpdatedField should never be called as they aren't different values
+            $winner->expects($this->never())
+                ->method('addUpdatedField');
+
+            $merger->mergeFieldData($winner, $loser);
+        }
 
-        $merger = $this->getMerger();
-
-        $winnerDateModified = new \DateTime();
-        $loserDateModified  = new \DateTime('-30 minutes');
-        $winner->expects($this->once())
-            ->method('getDateModified')
-            ->willReturn(null);
-        $winner->expects($this->once())
-            ->method('getDateAdded')
-            ->willReturn($winnerDateModified);
-
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn([
-                'value'         => 'winner@test.com',
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ]);
-
-        $winner->expects($this->once())
-            ->method('getFieldValue')
-            ->with('email')
-            ->willReturn('winner@test.com');
-
-        $loser->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn($loserDateModified);
-
-        $winner->expects($this->exactly(4))
-            ->method('getId')
-            ->willReturn(1);
-
-        $loser->expects($this->once())
-            ->method('getId');
-
-        // Winner values are newest so should be kept
-        // addUpdatedField should never be called as they aren't different values
-        $winner->expects($this->never())
-            ->method('addUpdatedField');
-
-        $merger->mergeFieldData($winner, $loser);
-    }
-
-    /**
+        /**
      * Scenario: A contact clicks on a tracked email link that goes to a tracked page.
      * The browser must contain no Mautic cookies. A new contact is created with only default values.
      * If default values from the new contact overwrite the values of the original contact then data are lost.
      */
-    public function testMergeFieldDataWithDefaultValues()
-    {
-        $winner = $this->createMock(Lead::class);
-        $loser  = $this->createMock(Lead::class);
-        $merger = $this->getMerger();
-
-        $winnerDateModified = new \DateTime('-30 minutes');
-        $loserDateModified  = new \DateTime();
-
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn([
-                'id'      => 1,
-                'email'   => 'winner@test.com',
-                'consent' => 'Yes',
-                'boolean' => 1,
-            ]);
-
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn([
-                'id'      => 2,
-                'email'   => null,
-                'consent' => 'No',
-                'boolean' => 0,
-            ]);
-
-        $winner->method('getDateModified')->willReturn($winnerDateModified);
-        $winner->method('getId')->willReturn(1);
-        $loser->method('getDateModified')->willReturn($loserDateModified);
-        $loser->method('getId')->willReturn(2);
-        $loser->method('isAnonymous')->willReturn(true);
-
-        $winner->expects($this->exactly(3))
-            ->method('getFieldValue')
-            ->withConsecutive(['email'], ['consent'], ['boolean'])
-            ->will($this->onConsecutiveCalls('winner@test.com', 'Yes', 1));
-
-        $winner->expects($this->exactly(3))
-            ->method('getField')
-            ->withConsecutive(['email'], ['consent'], ['boolean'])
-            ->will($this->onConsecutiveCalls([
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ], [
-                'id'            => 44,
-                'label'         => 'Email Consent',
-                'alias'         => 'consent',
-                'type'          => 'select',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => 'No',
-            ], [
-                'id'            => 45,
-                'label'         => 'Boolean Field',
-                'alias'         => 'boolean',
-                'type'          => 'boolean',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => 0,
-            ]));
-
-        $winner->expects($this->exactly(3))
-            ->method('addUpdatedField')
-            ->withConsecutive(
-                ['email', 'winner@test.com'],
-                ['consent', 'Yes'],
-                ['boolean', 1]
-            );
+        public function testMergeFieldDataWithDefaultValues()
+        {
+            $winner = $this->createMock(Lead::class);
+            $loser  = $this->createMock(Lead::class);
+            $merger = $this->getMerger();
+
+            $winnerDateModified = new \DateTime('-30 minutes');
+            $loserDateModified  = new \DateTime();
+
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn([
+                    'id'      => 1,
+                    'email'   => 'winner@test.com',
+                    'consent' => 'Yes',
+                    'boolean' => 1,
+                ]);
+
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn([
+                    'id'      => 2,
+                    'email'   => null,
+                    'consent' => 'No',
+                    'boolean' => 0,
+                ]);
+
+            $winner->method('getDateModified')->willReturn($winnerDateModified);
+            $winner->method('getId')->willReturn(1);
+            $loser->method('getDateModified')->willReturn($loserDateModified);
+            $loser->method('getId')->willReturn(2);
+            $loser->method('isAnonymous')->willReturn(true);
+
+            $winner->expects($this->exactly(3))
+                ->method('getFieldValue')
+                ->withConsecutive(['email'], ['consent'], ['boolean'])
+                ->will($this->onConsecutiveCalls('winner@test.com', 'Yes', 1));
+
+            $winner->expects($this->exactly(3))
+                ->method('getField')
+                ->withConsecutive(['email'], ['consent'], ['boolean'])
+                ->will($this->onConsecutiveCalls([
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ], [
+                    'id'            => 44,
+                    'label'         => 'Email Consent',
+                    'alias'         => 'consent',
+                    'type'          => 'select',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => 'No',
+                ], [
+                    'id'            => 45,
+                    'label'         => 'Boolean Field',
+                    'alias'         => 'boolean',
+                    'type'          => 'boolean',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => 0,
+                ]));
+
+            $winner->expects($this->exactly(3))
+                ->method('addUpdatedField')
+                ->withConsecutive(
+                    ['email', 'winner@test.com'],
+                    ['consent', 'Yes'],
+                    ['boolean', 1]
+                );
+
+            $merger->mergeFieldData($winner, $loser);
+        }
 
-        $merger->mergeFieldData($winner, $loser);
-    }
+        public function testMergeOwners()
+        {
+            $winner = new Lead();
+            $loser  = new Lead();
 
-    public function testMergeOwners()
-    {
-        $winner = new Lead();
-        $loser  = new Lead();
+            $winnerOwner = new User();
+            $winnerOwner->setUsername('bob');
+            $winner->setOwner($winnerOwner);
 
-        $winnerOwner = new User();
-        $winnerOwner->setUsername('bob');
-        $winner->setOwner($winnerOwner);
+            $loserOwner = new User();
+            $loserOwner->setUsername('susan');
+            $loser->setOwner($loserOwner);
 
-        $loserOwner = new User();
-        $loserOwner->setUsername('susan');
-        $loser->setOwner($loserOwner);
+            // Should not have been merged due to winner already having one
+            $this->getMerger()->mergeOwners($winner, $loser);
+            $this->assertEquals($winnerOwner->getUsername(), $winner->getOwner()->getUsername());
 
-        // Should not have been merged due to winner already having one
-        $this->getMerger()->mergeOwners($winner, $loser);
-        $this->assertEquals($winnerOwner->getUsername(), $winner->getOwner()->getUsername());
+            $winner->setOwner(null);
+            $this->getMerger()->mergeOwners($winner, $loser);
 
-        $winner->setOwner(null);
-        $this->getMerger()->mergeOwners($winner, $loser);
+            // Should be set to loser owner since winner owner was null
+            $this->assertEquals($loserOwner->getUsername(), $winner->getOwner()->getUsername());
+        }
 
-        // Should be set to loser owner since winner owner was null
-        $this->assertEquals($loserOwner->getUsername(), $winner->getOwner()->getUsername());
-    }
+        public function testMergePoints()
+        {
+            $winner = new Lead();
+            $loser  = new Lead();
 
-    public function testMergePoints()
-    {
-        $winner = new Lead();
-        $loser  = new Lead();
+            $winner->setPoints(100);
+            $loser->setPoints(50);
 
-        $winner->setPoints(100);
-        $loser->setPoints(50);
+            $this->getMerger()->mergePoints($winner, $loser);
 
-        $this->getMerger()->mergePoints($winner, $loser);
+            $this->assertEquals(150, $winner->getPoints());
+        }
 
-        $this->assertEquals(150, $winner->getPoints());
-    }
+        public function testMergeTags()
+        {
+            $winner = new Lead();
+            $loser  = new Lead();
+            $loser->addTag(new Tag('loser'));
+            $loser->addTag(new Tag('loser2'));
 
-    public function testMergeTags()
-    {
-        $winner = new Lead();
-        $loser  = new Lead();
-        $loser->addTag(new Tag('loser'));
-        $loser->addTag(new Tag('loser2'));
+            $this->leadModel->expects($this->once())
+                ->method('modifyTags')
+                ->with($winner, ['loser', 'loser2'], null, false);
 
-        $this->leadModel->expects($this->once())
-            ->method('modifyTags')
-            ->with($winner, ['loser', 'loser2'], null, false);
+            $this->getMerger()->mergeTags($winner, $loser);
+        }
 
-        $this->getMerger()->mergeTags($winner, $loser);
-    }
+        public function testFullMergeThrowsSameContactException()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->once())
+                ->method('getId')
+                ->willReturn(1);
 
-    public function testFullMergeThrowsSameContactException()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->once())
+                ->method('getId')
+                ->willReturn(1);
 
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
+            $this->expectException(SameContactException::class);
 
-        $this->expectException(SameContactException::class);
+            $this->getMerger()->merge($winner, $loser);
+        }
 
-        $this->getMerger()->merge($winner, $loser);
-    }
+        public function testFullMerge()
+        {
+            $winner = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $winner->expects($this->any())
+                ->method('getId')
+                ->willReturn(1);
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 1,
+                        'points' => 10,
+                        'email'  => 'winner@test.com',
+                    ]
+                );
+            $winner->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn(new \DateTime('-30 minutes'));
+
+            $loser = $this->getMockBuilder(Lead::class)
+                ->getMock();
+            $loser->expects($this->any())
+                ->method('getId')
+                ->willReturn(2);
+            $loser->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn(
+                    [
+                        'id'     => 2,
+                        'points' => 20,
+                        'email'  => 'loser@test.com',
+                    ]
+                );
+            $loser->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn(new \DateTime());
+
+            // updateMergeRecords
+            $this->mergeRecordRepo->expects($this->once())
+                ->method('moveMergeRecord')
+                ->with(2, 1);
+
+            // mergeIpAddresses
+            $ip = new IpAddress('1.2.3..4');
+            $loser->expects($this->once())
+                ->method('getIpAddresses')
+                ->willReturn(new ArrayCollection([$ip]));
+            $winner->expects($this->once())
+                ->method('addIpAddress')
+                ->with($ip);
+
+            // mergeFieldData
+            $winner->expects($this->once())
+                ->method('getFieldValue')
+                ->with('email')
+                ->willReturn('winner@test.com');
+
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn([
+                    'value'         => 'winner@test.com',
+                    'id'            => 22,
+                    'label'         => 'Email',
+                    'alias'         => 'email',
+                    'type'          => 'email',
+                    'group'         => 'core',
+                    'object'        => 'lead',
+                    'is_fixed'      => true,
+                    'default_value' => null,
+                ]);
+
+            $winner->expects($this->once())
+                ->method('addUpdatedField')
+                ->with('email', 'loser@test.com');
+
+            // mergeOwners
+            $winner->expects($this->never())
+                ->method('setOwner');
+
+            // mergePoints
+            $loser->expects($this->once())
+                ->method('getPoints')
+                ->willReturn(100);
+            $winner->expects($this->once())
+                ->method('adjustPoints')
+                ->with(100);
+
+            // mergeTags
+            $loser->expects($this->once())
+                ->method('getTags')
+                ->willReturn(new ArrayCollection());
+            $this->leadModel->expects($this->once())
+                ->method('modifyTags')
+                ->with($winner, [], null, false);
+
+            $this->getMerger()->merge($winner, $loser);
+        }
 
-    public function testFullMerge()
-    {
-        $winner = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $winner->expects($this->any())
-            ->method('getId')
-            ->willReturn(1);
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 1,
-                    'points' => 10,
-                    'email'  => 'winner@test.com',
-                ]
-            );
-        $winner->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn(new \DateTime('-30 minutes'));
-
-        $loser = $this->getMockBuilder(Lead::class)
-            ->getMock();
-        $loser->expects($this->any())
-            ->method('getId')
-            ->willReturn(2);
-        $loser->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn(
-                [
-                    'id'     => 2,
-                    'points' => 20,
-                    'email'  => 'loser@test.com',
-                ]
-            );
-        $loser->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn(new \DateTime());
-
-        // updateMergeRecords
-        $this->mergeRecordRepo->expects($this->once())
-            ->method('moveMergeRecord')
-            ->with(2, 1);
-
-        // mergeIpAddresses
-        $ip = new IpAddress('1.2.3..4');
-        $loser->expects($this->once())
-            ->method('getIpAddresses')
-            ->willReturn(new ArrayCollection([$ip]));
-        $winner->expects($this->once())
-            ->method('addIpAddress')
-            ->with($ip);
-
-        // mergeFieldData
-        $winner->expects($this->once())
-            ->method('getFieldValue')
-            ->with('email')
-            ->willReturn('winner@test.com');
-
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn([
-                'value'         => 'winner@test.com',
-                'id'            => 22,
-                'label'         => 'Email',
-                'alias'         => 'email',
-                'type'          => 'email',
-                'group'         => 'core',
-                'object'        => 'lead',
-                'is_fixed'      => true,
-                'default_value' => null,
-            ]);
-
-        $winner->expects($this->once())
-            ->method('addUpdatedField')
-            ->with('email', 'loser@test.com');
-
-        // mergeOwners
-        $winner->expects($this->never())
-            ->method('setOwner');
-
-        // mergePoints
-        $loser->expects($this->once())
-            ->method('getPoints')
-            ->willReturn(100);
-        $winner->expects($this->once())
-            ->method('adjustPoints')
-            ->with(100);
-
-        // mergeTags
-        $loser->expects($this->once())
-            ->method('getTags')
-            ->willReturn(new ArrayCollection());
-        $this->leadModel->expects($this->once())
-            ->method('modifyTags')
-            ->with($winner, [], null, false);
-
-        $this->getMerger()->merge($winner, $loser);
-    }
-
-    public function testMergeFieldWithEmptyFieldData()
-    {
-        $loser  = $this->createMock(Lead::class);
-        $winner = $this->createMock(Lead::class);
+        public function testMergeFieldWithEmptyFieldData()
+        {
+            $loser  = $this->createMock(Lead::class);
+            $winner = $this->createMock(Lead::class);
 
-        $loser->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn(new \DateTime('-10 minutes'));
+            $loser->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn(new \DateTime('-10 minutes'));
 
-        $winner->expects($this->exactly(2))
-            ->method('getDateModified')
-            ->willReturn(new \DateTime());
+            $winner->expects($this->exactly(2))
+                ->method('getDateModified')
+                ->willReturn(new \DateTime());
 
-        $winner->expects($this->exactly(4))
-            ->method('getId')
-            ->willReturn(1);
+            $winner->expects($this->exactly(4))
+                ->method('getId')
+                ->willReturn(1);
 
-        $loser->expects($this->once())
-            ->method('getId')
-            ->willReturn(2);
+            $loser->expects($this->once())
+                ->method('getId')
+                ->willReturn(2);
 
-        $winner->expects($this->once())
-            ->method('getProfileFields')
-            ->willReturn([
-                'email'  => 'winner@test.com',
-            ]);
+            $winner->expects($this->once())
+                ->method('getProfileFields')
+                ->willReturn([
+                    'email'  => 'winner@test.com',
+                ]);
 
-        $winner->expects($this->once())
-            ->method('getField')
-            ->with('email')
-            ->willReturn(false);
+            $winner->expects($this->once())
+                ->method('getField')
+                ->with('email')
+                ->willReturn(false);
 
-        $this->logger->expects($this->once())
-            ->method('info')
-            ->with('CONTACT: email is not mergeable for 1 - ');
+            $this->logger->expects($this->once())
+                ->method('info')
+                ->with('CONTACT: email is not mergeable for 1 - ');
 
-        $this->getMerger()->mergeFieldData($winner, $loser);
-    }
+            $this->getMerger()->mergeFieldData($winner, $loser);
+        }
 
-    /**
+        /**
      * @return ContactMerger
      */
-    private function getMerger()
-    {
-        return new ContactMerger(
-            $this->leadModel,
-            $this->mergeRecordRepo,
-            $this->dispatcher,
-            $this->logger
-        );
-    }
+        private function getMerger()
+        {
+            return new ContactMerger(
+                $this->leadModel,
+                $this->mergeRecordRepo,
+                $this->dispatcher,
+                $this->logger
+            );
+        }
 }

app/bundles/LeadBundle/Tests/Controller/LeadControllerTest.php

Switch Indentation +200 added lines, -200 removed lines

@@ -1,229 +1,229 @@
-<?php
-
-namespace Mautic\LeadBundle\Tests\Controller;
-
-use Mautic\CampaignBundle\DataFixtures\ORM\CampaignData;
-use Mautic\CoreBundle\Entity\AuditLog;
-use Mautic\CoreBundle\Entity\AuditLogRepository;
-use Mautic\CoreBundle\Test\MauticMysqlTestCase;
-use Mautic\LeadBundle\DataFixtures\ORM\LoadLeadData;
-use Mautic\LeadBundle\Entity\Company;
-use Mautic\LeadBundle\Entity\Lead;
-use Mautic\LeadBundle\Entity\LeadRepository;
-use PHPUnit\Framework\Assert;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class LeadControllerTest extends MauticMysqlTestCase
-{
-    protected function setUp(): void
+    <?php
+
+    namespace Mautic\LeadBundle\Tests\Controller;
+
+    use Mautic\CampaignBundle\DataFixtures\ORM\CampaignData;
+    use Mautic\CoreBundle\Entity\AuditLog;
+    use Mautic\CoreBundle\Entity\AuditLogRepository;
+    use Mautic\CoreBundle\Test\MauticMysqlTestCase;
+    use Mautic\LeadBundle\DataFixtures\ORM\LoadLeadData;
+    use Mautic\LeadBundle\Entity\Company;
+    use Mautic\LeadBundle\Entity\Lead;
+    use Mautic\LeadBundle\Entity\LeadRepository;
+    use PHPUnit\Framework\Assert;
+    use Symfony\Component\HttpFoundation\Request;
+    use Symfony\Component\HttpFoundation\Response;
+
+    class LeadControllerTest extends MauticMysqlTestCase
     {
-        parent::setUp();
+        protected function setUp(): void
+        {
+            parent::setUp();
+
+            defined('MAUTIC_TABLE_PREFIX') or define('MAUTIC_TABLE_PREFIX', '');
+        }
+
+        protected function beforeBeginTransaction(): void
+        {
+            $this->resetAutoincrement([
+                'leads',
+                'companies',
+                'campaigns',
+            ]);
+        }
+
+        public function testContactsAreAddedToThenRemovedFromCampaignsInBatch()
+        {
+            $this->loadFixtures([CampaignData::class, LoadLeadData::class]);
+
+            $payload = [
+                'lead_batch' => [
+                    'add' => [1],
+                    'ids' => json_encode([1, 2, 3]),
+                ],
+            ];
 
-        defined('MAUTIC_TABLE_PREFIX') or define('MAUTIC_TABLE_PREFIX', '');
-    }
+            $this->client->request(Request::METHOD_POST, '/s/contacts/batchCampaigns', $payload);
 
-    protected function beforeBeginTransaction(): void
-    {
-        $this->resetAutoincrement([
-            'leads',
-            'companies',
-            'campaigns',
-        ]);
-    }
-
-    public function testContactsAreAddedToThenRemovedFromCampaignsInBatch()
-    {
-        $this->loadFixtures([CampaignData::class, LoadLeadData::class]);
+            $clientResponse = $this->client->getResponse();
+            $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
 
-        $payload = [
-            'lead_batch' => [
-                'add' => [1],
-                'ids' => json_encode([1, 2, 3]),
-            ],
-        ];
+            $this->assertSame(
+                [
+                    [
+                        'lead_id'          => '1',
+                        'manually_added'   => '1',
+                        'manually_removed' => '0',
+                        'date_last_exited' => null,
+                    ],
+                    [
+                        'lead_id'          => '2',
+                        'manually_added'   => '1',
+                        'manually_removed' => '0',
+                        'date_last_exited' => null,
+                    ],
+                    [
+                        'lead_id'          => '3',
+                        'manually_added'   => '1',
+                        'manually_removed' => '0',
+                        'date_last_exited' => null,
+                    ],
+                ],
+                $this->getMembersForCampaign(1)
+            );
+
+            $response = json_decode($clientResponse->getContent(), true);
+            $this->assertTrue(isset($response['closeModal']), 'The response does not contain the `closeModal` param.');
+            $this->assertTrue($response['closeModal']);
+            $this->assertStringContainsString('3 contacts affected', $response['flashes']);
+
+            $payload = [
+                'lead_batch' => [
+                    'remove' => [1],
+                    'ids'    => json_encode([1, 2, 3]),
+                ],
+            ];
 
-        $this->client->request(Request::METHOD_POST, '/s/contacts/batchCampaigns', $payload);
+            $this->client->request(Request::METHOD_POST, '/s/contacts/batchCampaigns', $payload);
 
-        $clientResponse = $this->client->getResponse();
-        $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
+            $clientResponse = $this->client->getResponse();
+            $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
 
-        $this->assertSame(
-            [
-                [
-                    'lead_id'          => '1',
-                    'manually_added'   => '1',
-                    'manually_removed' => '0',
-                    'date_last_exited' => null,
-                ],
+            $this->assertSame(
                 [
-                    'lead_id'          => '2',
-                    'manually_added'   => '1',
-                    'manually_removed' => '0',
-                    'date_last_exited' => null,
+                    [
+                        'lead_id'          => '1',
+                        'manually_added'   => '0',
+                        'manually_removed' => '1',
+                        'date_last_exited' => null,
+                    ],
+                    [
+                        'lead_id'          => '2',
+                        'manually_added'   => '0',
+                        'manually_removed' => '1',
+                        'date_last_exited' => null,
+                    ],
+                    [
+                        'lead_id'          => '3',
+                        'manually_added'   => '0',
+                        'manually_removed' => '1',
+                        'date_last_exited' => null,
+                    ],
                 ],
+                $this->getMembersForCampaign(1)
+            );
+
+            $response = json_decode($clientResponse->getContent(), true);
+            $this->assertTrue(isset($response['closeModal']), 'The response does not contain the `closeModal` param.');
+            $this->assertTrue($response['closeModal']);
+            $this->assertStringContainsString('3 contacts affected', $response['flashes']);
+        }
+
+        public function testCompanyChangesAreTrackedWhenContactAddedViaUI(): void
+        {
+            $company = new Company();
+            $company->setName('Doe Corp');
+
+            $this->em->persist($company);
+            $this->em->flush();
+
+            $crawler = $this->client->request('GET', 's/contacts/new/');
+            $form    = $crawler->filterXPath('//form[@name="lead"]')->form();
+            $form->setValues(
                 [
-                    'lead_id'          => '3',
-                    'manually_added'   => '1',
-                    'manually_removed' => '0',
-                    'date_last_exited' => null,
-                ],
-            ],
-            $this->getMembersForCampaign(1)
-        );
+                    'lead[firstname]' => 'John',
+                    'lead[lastname]'  => 'Doe',
+                    'lead[email]'     => 'john@doe.com',
+                    'lead[companies]' => [$company->getId()],
+                    'lead[points]'    => 20,
+                ]
+            );
 
-        $response = json_decode($clientResponse->getContent(), true);
-        $this->assertTrue(isset($response['closeModal']), 'The response does not contain the `closeModal` param.');
-        $this->assertTrue($response['closeModal']);
-        $this->assertStringContainsString('3 contacts affected', $response['flashes']);
+            $this->client->submit($form);
 
-        $payload = [
-            'lead_batch' => [
-                'remove' => [1],
-                'ids'    => json_encode([1, 2, 3]),
-            ],
-        ];
+            /** @var AuditLogRepository $auditLogRepository */
+            $auditLogRepository = $this->em->getRepository(AuditLog::class);
 
-        $this->client->request(Request::METHOD_POST, '/s/contacts/batchCampaigns', $payload);
+            /** @var LeadRepository $contactRepository */
+            $contactRepository = $this->em->getRepository(Lead::class);
 
-        $clientResponse = $this->client->getResponse();
-        $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
+            /** @var AuditLog[] $auditLogs */
+            $auditLogs = $auditLogRepository->getAuditLogs($contactRepository->findOneBy(['email' => 'john@doe.com']));
 
-        $this->assertSame(
-            [
-                [
-                    'lead_id'          => '1',
-                    'manually_added'   => '0',
-                    'manually_removed' => '1',
-                    'date_last_exited' => null,
-                ],
+            Assert::assertSame(
                 [
-                    'lead_id'          => '2',
-                    'manually_added'   => '0',
-                    'manually_removed' => '1',
-                    'date_last_exited' => null,
-                ],
-                [
-                    'lead_id'          => '3',
-                    'manually_added'   => '0',
-                    'manually_removed' => '1',
-                    'date_last_exited' => null,
-                ],
-            ],
-            $this->getMembersForCampaign(1)
-        );
-
-        $response = json_decode($clientResponse->getContent(), true);
-        $this->assertTrue(isset($response['closeModal']), 'The response does not contain the `closeModal` param.');
-        $this->assertTrue($response['closeModal']);
-        $this->assertStringContainsString('3 contacts affected', $response['flashes']);
-    }
-
-    public function testCompanyChangesAreTrackedWhenContactAddedViaUI(): void
-    {
-        $company = new Company();
-        $company->setName('Doe Corp');
-
-        $this->em->persist($company);
-        $this->em->flush();
-
-        $crawler = $this->client->request('GET', 's/contacts/new/');
-        $form    = $crawler->filterXPath('//form[@name="lead"]')->form();
-        $form->setValues(
-            [
-                'lead[firstname]' => 'John',
-                'lead[lastname]'  => 'Doe',
-                'lead[email]'     => 'john@doe.com',
-                'lead[companies]' => [$company->getId()],
-                'lead[points]'    => 20,
-            ]
-        );
-
-        $this->client->submit($form);
-
-        /** @var AuditLogRepository $auditLogRepository */
-        $auditLogRepository = $this->em->getRepository(AuditLog::class);
-
-        /** @var LeadRepository $contactRepository */
-        $contactRepository = $this->em->getRepository(Lead::class);
-
-        /** @var AuditLog[] $auditLogs */
-        $auditLogs = $auditLogRepository->getAuditLogs($contactRepository->findOneBy(['email' => 'john@doe.com']));
-
-        Assert::assertSame(
-            [
-                'firstname' => [
-                    0 => null,
-                    1 => 'John',
-                ],
-                'lastname' => [
-                    0 => null,
-                    1 => 'Doe',
-                ],
-                'email' => [
-                    0 => null,
-                    1 => 'john@doe.com',
-                ],
-                'points' => [
-                    0 => 0,
-                    1 => 20.0,
-                ],
-                'company' => [
-                    0 => '',
-                    1 => 'Doe Corp',
+                    'firstname' => [
+                        0 => null,
+                        1 => 'John',
+                    ],
+                    'lastname' => [
+                        0 => null,
+                        1 => 'Doe',
+                    ],
+                    'email' => [
+                        0 => null,
+                        1 => 'john@doe.com',
+                    ],
+                    'points' => [
+                        0 => 0,
+                        1 => 20.0,
+                    ],
+                    'company' => [
+                        0 => '',
+                        1 => 'Doe Corp',
+                    ],
                 ],
-            ],
-            $auditLogs[0]['details']['fields']
-        );
-    }
+                $auditLogs[0]['details']['fields']
+            );
+        }
 
-    /**
+        /**
      * Only tests if an actual CSV file is returned and if the content size isn't suspiciously small.
      * We do more in-depth tests in \Mautic\CoreBundle\Tests\Unit\Helper\ExportHelperTest.
      */
-    public function testCsvIsExportedCorrectly()
-    {
-        $this->loadFixtures([LoadLeadData::class]);
+        public function testCsvIsExportedCorrectly()
+        {
+            $this->loadFixtures([LoadLeadData::class]);
 
-        ob_start();
-        $this->client->request(Request::METHOD_GET, '/s/contacts/batchExport?filetype=csv');
-        $content = ob_get_contents();
-        ob_end_clean();
+            ob_start();
+            $this->client->request(Request::METHOD_GET, '/s/contacts/batchExport?filetype=csv');
+            $content = ob_get_contents();
+            ob_end_clean();
 
-        $clientResponse = $this->client->getResponse();
+            $clientResponse = $this->client->getResponse();
 
-        $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
-        $this->assertEquals($this->client->getInternalResponse()->getHeader('content-type'), 'text/csv; charset=UTF-8');
-        $this->assertEquals(true, (strlen($content) > 5000));
-    }
+            $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
+            $this->assertEquals($this->client->getInternalResponse()->getHeader('content-type'), 'text/csv; charset=UTF-8');
+            $this->assertEquals(true, (strlen($content) > 5000));
+        }
 
-    /**
+        /**
      * Only tests if an actual Excel file is returned and if the content size isn't suspiciously small.
      * We do more in-depth tests in \Mautic\CoreBundle\Tests\Unit\Helper\ExportHelperTest.
      */
-    public function testExcelIsExportedCorrectly()
-    {
-        $this->loadFixtures([LoadLeadData::class]);
-
-        ob_start();
-        $this->client->request(Request::METHOD_GET, '/s/contacts/batchExport?filetype=xlsx');
-        $content = ob_get_contents();
-        ob_end_clean();
-
-        $clientResponse = $this->client->getResponse();
-
-        $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
-        $this->assertEquals($this->client->getInternalResponse()->getHeader('content-type'), 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-        $this->assertEquals(true, (strlen($content) > 10000));
-    }
-
-    private function getMembersForCampaign(int $campaignId): array
-    {
-        return $this->connection->createQueryBuilder()
-            ->select('cl.lead_id, cl.manually_added, cl.manually_removed, cl.date_last_exited')
-            ->from(MAUTIC_TABLE_PREFIX.'campaign_leads', 'cl')
-            ->where("cl.campaign_id = {$campaignId}")
-            ->execute()
-            ->fetchAll();
-    }
+        public function testExcelIsExportedCorrectly()
+        {
+            $this->loadFixtures([LoadLeadData::class]);
+
+            ob_start();
+            $this->client->request(Request::METHOD_GET, '/s/contacts/batchExport?filetype=xlsx');
+            $content = ob_get_contents();
+            ob_end_clean();
+
+            $clientResponse = $this->client->getResponse();
+
+            $this->assertEquals(Response::HTTP_OK, $clientResponse->getStatusCode());
+            $this->assertEquals($this->client->getInternalResponse()->getHeader('content-type'), 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+            $this->assertEquals(true, (strlen($content) > 10000));
+        }
+
+        private function getMembersForCampaign(int $campaignId): array
+        {
+            return $this->connection->createQueryBuilder()
+                ->select('cl.lead_id, cl.manually_added, cl.manually_removed, cl.date_last_exited')
+                ->from(MAUTIC_TABLE_PREFIX.'campaign_leads', 'cl')
+                ->where("cl.campaign_id = {$campaignId}")
+                ->execute()
+                ->fetchAll();
+        }
 }