M3 release

Author: kuzmany

Config/config.php

@@ -73,6 +73,25 @@
         'integrations' => [
             'mautic.integration.sqlConditions' => [
                 'class' => \MauticPlugin\MauticSqlConditionsBundle\Integration\SqlConditionsIntegration::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',
+                    'mautic.lead.model.dnc',
+                    'mautic.crontester.helper',
+                ],
             ],
         ],
     ],

EventListener/CampaignConditionSubscriber.php

@@ -15,6 +15,8 @@
 use Mautic\CampaignBundle\Event\CampaignBuilderEvent;
 use Mautic\CampaignBundle\Event\ConditionEvent;
 use MauticPlugin\MauticSqlConditionsBundle\Executioner\SqlExecutioner;
+use MauticPlugin\MauticSqlConditionsBundle\Form\Type\SqlConditionsCampaignType;
+use MauticPlugin\MauticSqlConditionsBundle\Form\Type\SqlListType;
 use MauticPlugin\MauticSqlConditionsBundle\SqlConditionsEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -60,7 +62,7 @@ public function onCampaignBuild(CampaignBuilderEvent $event)
             [
                 'label'           => 'mautic.sqlConditions',
                 'eventName'       => SqlConditionsEvents::ON_CAMPAIGN_CONDITION_TRIGGER,
-                'formType'        => 'sqlconditions_list',
+                'formType'        => SqlConditionsCampaignType::class,
                 'formTheme'       => 'MauticSqlConditionsBundle:FormTheme\SqlConditionsList',
                 'formTypeOptions' => ['update_select' => 'campaignevent_properties_sql'],
 

Form/Type/SqlConditionsCampaignType.php

@@ -13,6 +13,7 @@
 
 use MauticPlugin\MauticSqlConditionsBundle\Validator\Constraint\UrlDnsConstraint;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Routing\RouterInterface;
@@ -73,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $builder->add(
                 'newButton',
-                'button',
+                ButtonType::class,
                 [
                     'attr' => [
                         'class'   => 'btn btn-primary btn-nospin',
@@ -99,7 +100,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $builder->add(
                 'editButton',
-                'button',
+                ButtonType::class,
                 [
                     'attr' => [
                         'class'    => 'btn btn-primary btn-nospin',
@@ -126,7 +127,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'sqlconditions_list';
     }

Form/Type/SqlConditionsType.php

@@ -11,10 +11,16 @@
 
 namespace MauticPlugin\MauticSqlConditionsBundle\Form\Type;
 
+use Mautic\CategoryBundle\Form\Type\CategoryListType;
+use Mautic\CoreBundle\Form\Type\FormButtonsType;
+use Mautic\CoreBundle\Form\Type\YesNoButtonGroupType;
 use MauticPlugin\MauticSqlConditionsBundle\Validator\Constraint\UrlDnsConstraint;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
@@ -29,7 +35,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->add(
             'name',
-            'text',
+            TextType::class,
             [
                 'label'       => 'mautic.core.name',
                 'label_attr'  => ['class' => 'control-label'],
@@ -59,26 +65,26 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $builder->add(
             'category',
-            'category',
+            CategoryListType::class,
             [
                 'bundle' => 'plugin:sqlConditions',
             ]
         );
 
-        $builder->add('isPublished', 'yesno_button_group');
+        $builder->add('isPublished', YesNoButtonGroupType::class);
 
 
         if (!empty($options['update_select'])) {
             $builder->add(
                 'buttons',
-                'form_buttons',
+                FormButtonsType::class,
                 [
                     'apply_text'        => false,
                 ]
             );
             $builder->add(
                 'updateSelect',
-                'hidden',
+                HiddenType::class,
                 [
                     'data'   => $options['update_select'],
                     'mapped' => false,
@@ -87,29 +93,29 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         } else {
             $builder->add(
                 'buttons',
-                'form_buttons'
+                FormButtonsType::class
             );
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+
+    public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults(
             [
                 'data_class' => 'MauticPlugin\MauticSqlConditionsBundle\Entity\SqlConditions',
             ]
         );
         $resolver->setDefined(['update_select']);
+
     }
 
 
+
     /**
      * @return string
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'sqlConditions';
     }

Views/SqlConditions/list.html.php

@@ -94,7 +94,7 @@
                         ?>
                     </td>
                     <td>
-                        <a href="<?php echo $view['router']->generate(
+                        <a href="<?php echo $view['router']->url(
                             'mautic_sqlConditions_action',
                             ['objectAction' => 'edit', 'objectId' => $item->getId()]
                         ); ?>" data-toggle="ajax">
@@ -121,7 +121,7 @@
                     'page'       => $page,
                     'limit'      => $limit,
                     'menuLinkId' => 'mautic_sqlConditions_event_index',
-                    'baseUrl'    => $view['router']->generate('mautic_sqlConditions_index'),
+                    'baseUrl'    => $view['router']->url('mautic_sqlConditions_index'),
                     'sessionVar' => 'badge',
                 ]
             ); ?>