mautic · escopecz · Dec 11, 2019 · Nov 14, 2019 · Nov 14, 2019 · Nov 14, 2019
diff --git a/app/bundles/CampaignBundle/Tests/Command/AbstractCampaignCommand.php b/app/bundles/CampaignBundle/Tests/Command/AbstractCampaignCommand.php
@@ -39,7 +39,7 @@ class AbstractCampaignCommand extends MauticMysqlTestCase
     /**
      * @throws \Exception
      */
-    public function setUp()
+    protected function setUp()
     {
         // Everything needs to happen anonymously
         $this->defaultClientServer = $this->clientServer;

diff --git a/app/bundles/CampaignBundle/Tests/Command/TriggerCampaignCommandTest.php b/app/bundles/CampaignBundle/Tests/Command/TriggerCampaignCommandTest.php
@@ -13,7 +13,7 @@
 
 class TriggerCampaignCommandTest extends AbstractCampaignCommand
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

diff --git a/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php b/app/bundles/CampaignBundle/Tests/Membership/Action/AdderTest.php
@@ -31,7 +31,7 @@ class AdderTest extends \PHPUnit_Framework_TestCase
      */
     private $leadEventLogRepository;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->leadRepository         = $this->createMock(LeadRepository::class);
         $this->leadEventLogRepository = $this->createMock(LeadEventLogRepository::class);

diff --git a/app/bundles/CoreBundle/DependencyInjection/Compiler/IntegrationPass.php b/app/bundles/CoreBundle/DependencyInjection/Compiler/IntegrationPass.php
diff --git a/app/bundles/CoreBundle/MauticCoreBundle.php b/app/bundles/CoreBundle/MauticCoreBundle.php
@@ -26,6 +26,5 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new Compiler\TemplatingPass());
         $container->addCompilerPass(new Compiler\TranslationsPass());
         $container->addCompilerPass(new Compiler\ModelPass());
-        $container->addCompilerPass(new Compiler\IntegrationPass());
     }
 }
diff --git a/app/bundles/CoreBundle/Test/AbstractMauticTestCase.php b/app/bundles/CoreBundle/Test/AbstractMauticTestCase.php
@@ -45,7 +45,7 @@ abstract class AbstractMauticTestCase extends WebTestCase
         'PHP_AUTH_PW'   => 'mautic',
     ];
 
-    public function setUp()
+    protected function setUp()
     {
         \Mautic\CoreBundle\ErrorHandler\ErrorHandler::register('prod');
 

diff --git a/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php b/app/bundles/CoreBundle/Test/EventListener/MaintenanceSubscriberTest.php
@@ -27,7 +27,7 @@ class MaintenanceSubscriberTest extends \PHPUnit_Framework_TestCase
      */
     private $subscriber;
 
-    public function setUp()
+    protected function setUp()
     {
         $connection          = $this->createMock(Connection::class);
         $userTokenRepository = $this->createMock(UserTokenRepositoryInterface::class);

diff --git a/app/bundles/CoreBundle/Test/MauticMysqlTestCase.php b/app/bundles/CoreBundle/Test/MauticMysqlTestCase.php
@@ -12,7 +12,7 @@ abstract class MauticMysqlTestCase extends AbstractMauticTestCase
     /**
      * @throws \Exception
      */
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

diff --git a/app/bundles/CoreBundle/Test/MauticSqliteTestCase.php b/app/bundles/CoreBundle/Test/MauticSqliteTestCase.php
@@ -8,7 +8,7 @@
 
 abstract class MauticSqliteTestCase extends AbstractMauticTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
 

diff --git a/app/bundles/CoreBundle/Test/MauticWebTestCase.php b/app/bundles/CoreBundle/Test/MauticWebTestCase.php
@@ -15,7 +15,6 @@
 
 use Doctrine\Common\DataFixtures\ReferenceRepository;
 use Liip\FunctionalTestBundle\Test\WebTestCase;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;
@@ -202,7 +201,7 @@ protected function assertNoError($response, $crawler, $fullOutput = false)
     /**
      * {@inheritdoc}
      */
-    public function setUp()
+    protected function setUp()
     {
         static::$kernel = static::createKernel();
         static::$kernel->boot();

diff --git a/app/bundles/CoreBundle/Tests/Unit/Helper/IpLookupHelperTest.php b/app/bundles/CoreBundle/Tests/Unit/Helper/IpLookupHelperTest.php
@@ -28,7 +28,7 @@ public function __construct($name = null, array $data = [], $dataName = '')
         parent::__construct($name, $data, $dataName);
     }
 
-    public function setUp()
+    protected function setUp()
     {
         defined('MAUTIC_ENV') or define('MAUTIC_ENV', 'test');
     }

diff --git a/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxmindLookupTest.php b/app/bundles/CoreBundle/Tests/Unit/IpLookup/MaxmindLookupTest.php
@@ -25,7 +25,7 @@ class MaxmindLookupTest extends \PHPUnit_Framework_TestCase
 {
     protected $mockHttp;
 
-    public function setUp()
+    protected function setUp()
     {
         // Mock http connector
         $this->mockHttp = $this->getMockBuilder('Joomla\Http\Http')

diff --git a/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php b/app/bundles/EmailBundle/Tests/Helper/MailHelperTest.php
@@ -56,7 +56,7 @@ class MailHelperTest extends \PHPUnit_Framework_TestCase
         ],
     ];
 
-    public function setUp()
+    protected function setUp()
     {
         defined('MAUTIC_ENV') or define('MAUTIC_ENV', 'test');
     }

diff --git a/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php b/app/bundles/EmailBundle/Tests/Transport/AmazonTransportTest.php
@@ -32,7 +32,7 @@ class AmazonTransportTest extends \PHPUnit_Framework_TestCase
      */
     private $translator;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->logger = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/EmailBundle/Tests/Transport/ElasticemailTransportTest.php b/app/bundles/EmailBundle/Tests/Transport/ElasticemailTransportTest.php
@@ -24,7 +24,7 @@ class ElasticemailTransportTest extends \PHPUnit_Framework_TestCase
     private $transportCallback;
     private $logger;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->translator = $this->getMockBuilder(Translator::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/FormBundle/Tests/Helper/FormFieldHelperTest.php b/app/bundles/FormBundle/Tests/Helper/FormFieldHelperTest.php
@@ -14,7 +14,7 @@ class FormFieldHelperTest extends \PHPUnit_Framework_TestCase
      */
     protected $fixture;
 
-    public function setUp()
+    protected function setUp()
     {
         $translatorMock = $this->getMockBuilder(TranslatorInterface::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/LeadBundle/Tests/Controller/Api/LeadApiControllerFunctionalTest.php b/app/bundles/LeadBundle/Tests/Controller/Api/LeadApiControllerFunctionalTest.php
@@ -198,7 +198,7 @@ public function testBachdDncAddAndRemove()
         $clientResponse = $this->client->getResponse();
         $response       = json_decode($clientResponse->getContent(), true);
 
-        $this->assertFalse(isset($response['contacts'][0]['doNotContact'][0]));
+        $this->assertEmpty($response['contacts'][0]['doNotContact']);
 
         // Remove contact
         $this->client->request('DELETE', "/api/contacts/$contactId/delete");

diff --git a/app/bundles/LeadBundle/Tests/Helper/TokenHelperTest.php b/app/bundles/LeadBundle/Tests/Helper/TokenHelperTest.php
@@ -28,7 +28,7 @@ class TokenHelperTest extends \PHPUnit_Framework_TestCase
         ],
     ];
 
-    public function setUp()
+    protected function setUp()
     {
         $reflectionProperty = new ReflectionProperty(TokenHelper::class, 'parameters');
         $reflectionProperty->setAccessible(true);

diff --git a/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php b/app/bundles/LeadBundle/Tests/Model/CompanyReportDataTest.php
@@ -25,7 +25,7 @@ class CompanyReportDataTest extends \PHPUnit_Framework_TestCase
      */
     private $translator;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->translator = $this->getMockBuilder(Translator::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php b/app/bundles/LeadBundle/Tests/Model/LeadListModelTest.php
@@ -10,7 +10,7 @@ class LeadListModelTest extends \PHPUnit_Framework_TestCase
 {
     protected $fixture;
 
-    public function setUp()
+    protected function setUp()
     {
         $mockListModel = $this->getMockBuilder(ListModel::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/LeadBundle/Tests/Segment/Decorator/BaseDecoratorTest.php b/app/bundles/LeadBundle/Tests/Segment/Decorator/BaseDecoratorTest.php
@@ -17,7 +17,7 @@
 
 class BaseDecoratorTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         defined('MAUTIC_TABLE_PREFIX') or define('MAUTIC_TABLE_PREFIX', '');

diff --git a/app/bundles/LeadBundle/Tests/Segment/Decorator/CustomMappedDecoratorTest.php b/app/bundles/LeadBundle/Tests/Segment/Decorator/CustomMappedDecoratorTest.php
@@ -18,7 +18,7 @@
 
 class CustomMappedDecoratorTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         defined('MAUTIC_TABLE_PREFIX') or define('MAUTIC_TABLE_PREFIX', '');

diff --git a/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php b/app/bundles/LeadBundle/Tests/Segment/Decorator/DecoratorFactoryTest.php
@@ -22,7 +22,7 @@
 
 class DecoratorFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         defined('MAUTIC_TABLE_PREFIX') or define('MAUTIC_TABLE_PREFIX', '');

diff --git a/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php b/app/bundles/LeadBundle/Tests/Tracker/ContactTrackerTest.php
@@ -80,7 +80,7 @@ class ContactTrackerTest extends \PHPUnit_Framework_TestCase
      */
     private $leadFieldModelMock;
 
-    public function setUp()
+    protected function setUp()
     {
         $this->leadRepositoryMock = $this->getMockBuilder(LeadRepository::class)
             ->disableOriginalConstructor()

diff --git a/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php b/app/bundles/LeadBundle/Tests/Tracker/DeviceTrackerTest.php
@@ -46,7 +46,7 @@ class DeviceTrackerTest extends \PHPUnit_Framework_TestCase
      */
     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';
 
-    public function setUp()
+    protected function setUp()
     {
         $this->deviceCreatorService = new DeviceCreatorService();
 

diff --git a/app/bundles/NotificationBundle/Config/config.php b/app/bundles/NotificationBundle/Config/config.php
@@ -158,7 +158,24 @@
         ],
         'integrations' => [
             'mautic.integration.onesignal' => [
-                'class' => \Mautic\NotificationBundle\Integration\OneSignalIntegration::class,
+                'class'     => \Mautic\NotificationBundle\Integration\OneSignalIntegration::class,
+                'arguments' => [
+                    'event_dispatcher',
+                    'mautic.helper.cache_storage',
+                    'doctrine.orm.entity_manager',
+                    'session',
+                    'request_stack',
+                    'router',
+                    'translator',
+                    'logger',
+                    'mautic.helper.encryption',
+                    'mautic.lead.model.lead',
+                    'mautic.lead.model.company',
+                    'mautic.helper.paths',
+                    'mautic.core.model.notification',
+                    'mautic.lead.model.field',
+                    'mautic.plugin.model.integration_entity',
+                ],
             ],
         ],
     ],

diff --git a/app/bundles/PageBundle/Tests/Controller/PageControllerTest.php b/app/bundles/PageBundle/Tests/Controller/PageControllerTest.php
@@ -22,7 +22,7 @@ class PageControllerTest extends MauticMysqlTestCase
     /**
      * @throws \Exception
      */
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();
         $this->db     = $this->container->get('doctrine.dbal.default_connection');

diff --git a/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php b/app/bundles/PluginBundle/Command/PushLeadActivityCommand.php
@@ -11,6 +11,7 @@
 
 namespace Mautic\PluginBundle\Command;
 
+use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
@@ -67,10 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $container = $this->getContainer();
 
-        /** @var \Mautic\CoreBundle\Factory\MauticFactory $factory */
-        $factory = $container->get('mautic.factory');
-
-        $translator  = $factory->getTranslator();
+        $translator  = $container->get('translator');
         $integration = $input->getOption('integration');
         $startDate   = $input->getOption('start-date');
         $endDate     = $input->getOption('end-date');
@@ -88,8 +86,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         if ($integration && $startDate && $endDate) {
-            /** @var \Mautic\PluginBundle\Helper\IntegrationHelper $integrationHelper */
-            $integrationHelper = $factory->getHelper('integration');
+            /** @var IntegrationHelper $integrationHelper */
+            $integrationHelper = $container->get('mautic.helper.integration');
 
             /** @var AbstractIntegration $integrationObject */
             $integrationObject = $integrationHelper->getIntegrationObject($integration);