Refactor deprecated code in CoreBundle

app/bundles/ApiBundle/Form/Type/ClientType.php

@@ -16,6 +16,7 @@
 use Mautic\CoreBundle\Form\DataTransformer as Transformers;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormError;
@@ -254,7 +255,7 @@ function (FormEvent $event) use ($translator, $validator) {
             );
         }
 
-        $builder->add('buttons', 'form_buttons');
+        $builder->add('buttons', FormButtonsType::class);
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);

app/bundles/ApiBundle/Form/Type/ConfigType.php

@@ -11,6 +11,7 @@
 
 namespace Mautic\ApiBundle\Form\Type;
 
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
@@ -28,7 +29,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add(
             'api_enabled',
-            'yesno_button_group',
+            YesNoButtonGroupType::class,
             [
                 'label' => 'mautic.api.config.form.api.enabled',
                 'data'  => (bool) $options['data']['api_enabled'],
@@ -40,7 +41,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->add(
             'api_enable_basic_auth',
-            'yesno_button_group',
+            YesNoButtonGroupType::class,
             [
                 'label' => 'mautic.api.config.form.api.basic_auth_enabled',
                 'data'  => (bool) $options['data']['api_enable_basic_auth'],

app/bundles/AssetBundle/Controller/AssetController.php

@@ -13,6 +13,7 @@
 
 use Mautic\AssetBundle\Entity\Asset;
 use Mautic\CoreBundle\Controller\FormController;
+use Mautic\CoreBundle\Form\Type\DateRangeType;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -153,7 +154,7 @@ public function viewAction($objectId)
         // Init the date range filter form
         $dateRangeValues = $this->request->get('daterange', []);
         $action          = $this->generateUrl('mautic_asset_action', ['objectAction' => 'view', 'objectId' => $objectId]);
-        $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
+        $dateRangeForm   = $this->get('form.factory')->create(DateRangeType::class, $dateRangeValues, ['action' => $action]);
 
         if ($activeAsset === null) {
             //set the return URL

app/bundles/AssetBundle/EventListener/BuilderSubscriber.php

@@ -74,7 +74,7 @@ public function onBuilderBuild(BuilderEvent $event)
     {
         if ($event->tokensRequested($this->assetToken)) {
             $tokenHelper = new BuilderTokenHelper($this->factory, 'asset');
-            $event->addTokensFromHelper($tokenHelper, $this->assetToken, 'title', 'id', false, true);
+            $event->addTokensFromHelper($tokenHelper, $this->assetToken, 'title', 'id', true);
         }
     }
 

app/bundles/AssetBundle/Form/Type/AssetType.php

@@ -16,6 +16,9 @@
 use Mautic\CategoryBundle\Form\Type\CategoryListType;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
+use Mautic\CoreBundle\Form\Type\ButtonGroupType;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -56,7 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->addEventSubscriber(new CleanFormSubscriber(['description' => 'html']));
         $builder->addEventSubscriber(new FormExitSubscriber('asset.asset', $options));
 
-        $builder->add('storageLocation', 'button_group', [
+        $builder->add('storageLocation', ButtonGroupType::class, [
             'label'   => 'mautic.asset.asset.form.storageLocation',
             'choices' => [
                 'mautic.asset.asset.form.storageLocation.local'  => 'local',
@@ -88,7 +91,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         );
         $builder->add(
             'disallow',
-            'yesno_button_group',
+            YesNoButtonGroupType::class,
             [
                 'label' => 'mautic.asset.asset.form.disallow.crawlers',
                 'attr'  => [
@@ -163,7 +166,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'required' => false,
         ]);
 
-        $builder->add('isPublished', 'yesno_button_group');
+        $builder->add('isPublished', YesNoButtonGroupType::class);
 
         $builder->add('publishUp', 'datetime', [
             'widget'     => 'single_text',
@@ -201,7 +204,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $builder->add('buttons', 'form_buttons', []);
+        $builder->add('buttons', FormButtonsType::class, []);
 
         if (!empty($options['action'])) {
             $builder->setAction($options['action']);

app/bundles/CampaignBundle/Controller/CampaignController.php

@@ -18,6 +18,7 @@
 use Mautic\CampaignBundle\Model\CampaignModel;
 use Mautic\CampaignBundle\Model\EventModel;
 use Mautic\CoreBundle\Controller\AbstractStandardFormController;
+use Mautic\CoreBundle\Form\Type\DateRangeType;
 use Mautic\LeadBundle\Controller\EntityContactsTrait;
 use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormError;
@@ -677,7 +678,7 @@ protected function getViewArguments(array $args, $action)
                 // Init the date range filter form
                 $dateRangeValues = $this->request->get('daterange', []);
                 $action          = $this->generateUrl('mautic_campaign_action', ['objectAction' => 'view', 'objectId' => $objectId]);
-                $dateRangeForm   = $this->get('form.factory')->create('daterange', $dateRangeValues, ['action' => $action]);
+                $dateRangeForm   = $this->get('form.factory')->create(DateRangeType::class, $dateRangeValues, ['action' => $action]);
 
                 /** @var LeadEventLogRepository $eventLogRepo */
                 $eventLogRepo             = $this->getDoctrine()->getManager()->getRepository('MauticCampaignBundle:LeadEventLog');

app/bundles/CampaignBundle/Form/Type/CampaignEventLeadChangeType.php

@@ -11,6 +11,7 @@
 
 namespace Mautic\CampaignBundle\Form\Type;
 
+use Mautic\CoreBundle\Form\Type\ButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 
@@ -26,7 +27,7 @@ class CampaignEventLeadChangeType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $data = (isset($options['data']['action'])) ? $options['data']['action'] : 'added';
-        $builder->add('action', 'button_group', [
+        $builder->add('action', ButtonGroupType::class, [
             'choices' => [
                 'added'   => 'mautic.campaign.form.trigger_leadchanged_added',
                 'removed' => 'mautic.campaign.form.trigger_leadchanged_removed',

app/bundles/CampaignBundle/Form/Type/CampaignLeadSourceType.php

@@ -12,6 +12,7 @@
 namespace Mautic\CampaignBundle\Form\Type;
 
 use Mautic\CoreBundle\Factory\MauticFactory;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -103,7 +104,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $btnIcon  = 'fa fa-plus';
         }
 
-        $builder->add('buttons', 'form_buttons', [
+        $builder->add('buttons', FormButtonsType::class, [
             'save_text'       => $btnValue,
             'save_icon'       => $btnIcon,
             'save_onclick'    => 'Mautic.submitCampaignSource(event)',

app/bundles/CampaignBundle/Form/Type/CampaignType.php

@@ -15,6 +15,8 @@
 use Mautic\CoreBundle\Factory\MauticFactory;
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -61,7 +63,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
 
         $builder->add('allowRestart',
-            'yesno_button_group',
+            YesNoButtonGroupType::class,
             [
                 'label' => 'mautic.campaign.allow_restart',
                 'attr'  => [
@@ -90,7 +92,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $data     = false;
         }
 
-        $builder->add('isPublished', 'yesno_button_group', [
+        $builder->add('isPublished', YesNoButtonGroupType::class, [
             'read_only' => $readonly,
             'data'      => $data,
         ]);
@@ -127,7 +129,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->setAction($options['action']);
         }
 
-        $builder->add('buttons', 'form_buttons', [
+        $builder->add('buttons', FormButtonsType::class, [
             'pre_extra_buttons' => [
                 [
                     'name'  => 'builder',

app/bundles/CampaignBundle/Form/Type/EventType.php

@@ -12,6 +12,8 @@
 namespace Mautic\CampaignBundle\Form\Type;
 
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
+use Mautic\CoreBundle\Form\Type\ButtonGroupType;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
 use Mautic\CoreBundle\Form\Type\PropertiesTrait;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
@@ -79,7 +81,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $triggerMode = (empty($options['data']['triggerMode'])) ? $default : $options['data']['triggerMode'];
             $builder->add(
                 'triggerMode',
-                'button_group',
+                ButtonGroupType::class,
                 [
                     'choices'     => $choices,
                     'expanded'    => true,
@@ -259,7 +261,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->add(
             'buttons',
-            'form_buttons',
+            FormButtonsType::class,
             [
                 'save_text'       => $btnValue,
                 'save_icon'       => $btnIcon,

app/bundles/CategoryBundle/Form/Type/CategoryType.php

@@ -14,6 +14,7 @@
 use Mautic\CoreBundle\Form\EventListener\CleanFormSubscriber;
 use Mautic\CoreBundle\Form\EventListener\FormExitSubscriber;
 use Mautic\CoreBundle\Form\Type\FormButtonsType;
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
@@ -136,7 +137,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $builder->add('isPublished', 'yesno_button_group');
+        $builder->add('isPublished', YesNoButtonGroupType::class);
 
         $builder->add(
             'inForm',

app/bundles/ChannelBundle/Event/ChannelBroadcastEvent.php

@@ -36,7 +36,7 @@ class ChannelBroadcastEvent extends Event
     /**
      * Number of contacts successfully processed and/or failed per channel.
      *
-     * @var int
+     * @var array
      */
     protected $results = [];
 
@@ -118,7 +118,7 @@ public function setResults($channelLabel, $successCount, $failedCount = 0, array
     }
 
     /**
-     * @return int
+     * @return array
      */
     public function getResults()
     {

app/bundles/ChannelBundle/Form/Type/ChannelType.php

@@ -12,6 +12,7 @@
 namespace Mautic\ChannelBundle\Form\Type;
 
 use Mautic\ChannelBundle\Entity\Channel;
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -58,7 +59,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $form->add(
                 'isEnabled',
-                'yesno_button_group',
+                YesNoButtonGroupType::class,
                 [
                     'label' => 'mautic.channel.message.form.enabled',
                     'attr'  => [

app/bundles/ConfigBundle/Form/Type/ConfigType.php

@@ -12,6 +12,7 @@
 namespace Mautic\ConfigBundle\Form\Type;
 
 use Mautic\ConfigBundle\Form\Helper\RestrictionHelper;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
@@ -70,7 +71,7 @@ function (FormEvent $event) {
 
         $builder->add(
             'buttons',
-            'form_buttons',
+            FormButtonsType::class,
             [
                 'apply_onclick' => 'Mautic.activateBackdrop()',
                 'save_onclick'  => 'Mautic.activateBackdrop()',