Refactor mautic.parameters to use CoreParametersHelper

Author: alanhartless

app/bundles/LeadBundle/Config/config.php

@@ -351,7 +351,7 @@
                     'mautic.lead.model.list',
                     'mautic.lead.model.company',
                     'mautic.campaign.model.campaign',
-                    '%mautic.parameters%',
+                    'mautic.helper.core_parameters',
                 ],
             ],
             'mautic.lead.campaignbundle.action_delete_contacts.subscriber' => [

app/bundles/LeadBundle/EventListener/CampaignSubscriber.php

@@ -15,6 +15,7 @@
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\CampaignExecutionEvent;
 use Mautic\CampaignBundle\Model\CampaignModel;
+use Mautic\CoreBundle\Helper\CoreParametersHelper;
 use Mautic\CoreBundle\Helper\IpLookupHelper;
 use Mautic\LeadBundle\Entity\Company;
 use Mautic\LeadBundle\Entity\Lead;
@@ -76,11 +77,9 @@ class CampaignSubscriber implements EventSubscriberInterface
     private $campaignModel;
 
     /**
-     * System params.
-     *
-     * @var array
+     * @var CoreParametersHelper
      */
-    private $params;
+    private $coreParametersHelper;
 
     public function __construct(
         IpLookupHelper $ipLookupHelper,
@@ -89,15 +88,15 @@ public function __construct(
         ListModel $listModel,
         CompanyModel $companyModel,
         CampaignModel $campaignModel,
-        array $params
+        CoreParametersHelper $coreParametersHelper
     ) {
-        $this->ipLookupHelper = $ipLookupHelper;
-        $this->leadModel      = $leadModel;
-        $this->leadFieldModel = $leadFieldModel;
-        $this->listModel      = $listModel;
-        $this->companyModel   = $companyModel;
-        $this->campaignModel  = $campaignModel;
-        $this->params         = $params;
+        $this->ipLookupHelper       = $ipLookupHelper;
+        $this->leadModel            = $leadModel;
+        $this->leadFieldModel       = $leadFieldModel;
+        $this->listModel            = $listModel;
+        $this->companyModel         = $companyModel;
+        $this->campaignModel        = $campaignModel;
+        $this->coreParametersHelper = $coreParametersHelper;
     }
 
     /**
@@ -400,7 +399,7 @@ public function onCampaignTriggerActionUpdateCompany(CampaignExecutionEvent $eve
         $primaryCompany =  $this->companyModel->getEntity($company['id']);
 
         if (isset($config['companyname']) && $primaryCompany->getName() != $config['companyname']) {
-            list($company, $leadAdded, $companyEntity) = IdentifyCompanyHelper::identifyLeadsCompany($config, $lead, $this->companyModel);
+            [$company, $leadAdded, $companyEntity] = IdentifyCompanyHelper::identifyLeadsCompany($config, $lead, $this->companyModel);
             if ($leadAdded) {
                 $lead->addCompanyChangeLogEntry('form', 'Identify Company', 'Lead added to the company, '.$company['companyname'], $company['id']);
             } elseif ($companyEntity instanceof Company) {
@@ -471,7 +470,7 @@ public function onCampaignTriggerCondition(CampaignExecutionEvent $event)
         } elseif ($event->checkContext('lead.field_value')) {
             if ('date' === $event->getConfig()['operator']) {
                 // Set the date in system timezone since this is triggered by cron
-                $triggerDate = new \DateTime('now', new \DateTimeZone($this->params['default_timezone']));
+                $triggerDate = new \DateTime('now', new \DateTimeZone($this->coreParametersHelper->getParameter('default_timezone')));
                 $interval    = substr($event->getConfig()['value'], 1); // remove 1st character + or -
 
                 if (false !== strpos($event->getConfig()['value'], '+P')) { //add date