M3 support

mtcextendee · Apr 13, 2021 · 4640878 · 4640878
1 parent 1bcbcd9
commit 4640878
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 16 deletions.
diff --git a/Assets/css/demo.css → Assets/lib/css/demo.css b/Assets/css/demo.css → Assets/lib/css/demo.css
diff --git a/Assets/css/intlTelInput.css → Assets/lib/css/intlTelInput.css b/Assets/css/intlTelInput.css → Assets/lib/css/intlTelInput.css
diff --git a/Assets/css/intlTelInput.min.css → Assets/lib/css/intlTelInput.min.css b/Assets/css/intlTelInput.min.css → Assets/lib/css/intlTelInput.min.css
diff --git a/Assets/img/flags.png → Assets/lib/img/flags.png b/Assets/img/flags.png → Assets/lib/img/flags.png
diff --git a/Assets/img/flags@2x.png → Assets/lib/img/flags@2x.png b/Assets/img/flags@2x.png → Assets/lib/img/flags@2x.png
diff --git a/Assets/img/icon.png → Assets/lib/img/icon.png b/Assets/img/icon.png → Assets/lib/img/icon.png
diff --git a/Assets/js/intlTelInput-jquery.js → Assets/lib/js/intlTelInput-jquery.js b/Assets/js/intlTelInput-jquery.js → Assets/lib/js/intlTelInput-jquery.js
diff --git a/Assets/js/intlTelInput-jquery.min.js → Assets/lib/js/intlTelInput-jquery.min.js b/Assets/js/intlTelInput-jquery.min.js → Assets/lib/js/intlTelInput-jquery.min.js
diff --git a/Assets/js/intlTelInput.js → Assets/lib/js/intlTelInput.js b/Assets/js/intlTelInput.js → Assets/lib/js/intlTelInput.js
diff --git a/Assets/js/intlTelInput.min.js → Assets/lib/js/intlTelInput.min.js b/Assets/js/intlTelInput.min.js → Assets/lib/js/intlTelInput.min.js
diff --git a/Assets/js/utils.js → Assets/lib/js/utils.js b/Assets/js/utils.js → Assets/lib/js/utils.js
diff --git a/Config/config.php b/Config/config.php
@@ -25,7 +25,10 @@
             ],
             'mautic.form.validation.inttel.subscriber' => [
                 'class'     => \MauticPlugin\MauticInternationalPhoneInputBundle\EventListener\FormValidationSubscriber::class,
-                'arguments' =>  []
+                'arguments' =>  [
+                    'translator',
+                    'request_stack'
+                ]
             ],
         ],
         'forms' => [
@@ -41,6 +44,22 @@
             'mautic.integration.internationalphoneinput' => [
                 'class'     => \MauticPlugin\MauticInternationalPhoneInputBundle\Integration\InternationalPhoneInputIntegration::class,
                 'arguments' => [
+                    'event_dispatcher',
+                    'mautic.helper.cache_storage',
+                    'doctrine.orm.entity_manager',
+                    'session',
+                    'request_stack',
+                    'router',
+                    'translator',
+                    'monolog.logger.mautic',
+                    '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',
                 ],
             ],
         ],

diff --git a/Controller/JsController.php b/Controller/JsController.php
@@ -50,10 +50,10 @@ public function generateCountryCodeAction($formName)
     {
         $ip       = $this->ipLookupHelper->getIpAddress();
         include_once __DIR__.'/../countries.php';
-        $country  = ArrayHelper::getValue('country', $ip->getIpDetails());
+        $country  = ArrayHelper::getValue('country', $ip->getIpDetails() ?? []);
         $countryCode = array_search(strtolower($country), array_map('strtolower', $countries)); ## easy version
         $realFormName = ltrim($formName, '_');
-        $utilsUrl = $this->assetsHelper->getUrl('plugins/MauticInternationalPhoneInputBundle/Assets/js/utils.js', null, null, true
+        $utilsUrl = $this->assetsHelper->getUrl('plugins/MauticInternationalPhoneInputBundle/Assets/lib/js/utils.js', null, null, true
         );
         $js       = <<<JS
         if(!window.{$formName}){
@@ -63,7 +63,7 @@ public function generateCountryCodeAction($formName)
                var elem = elems[i];
 
       window.intlTelInput(elem , {
-            hiddenInput: elem.getAttribute('data-field-alias')+'_full',
+            hiddenInput: elem.getAttribute('data-field-alias'),
             separateDialCode: true,
           initialCountry: "{$countryCode}",
           utilsScript: "{$utilsUrl}"

diff --git a/EventListener/FormSubscriber.php b/EventListener/FormSubscriber.php
@@ -13,19 +13,16 @@
 use Mautic\FormBundle\FormEvents;
 use Mautic\PluginBundle\Helper\IntegrationHelper;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
+use MauticPlugin\MauticInternationalPhoneInputBundle\Form\Type\InternationalPhoneInputType;
 use MauticPlugin\MauticInternationalPhoneInputBundle\Integration\InternationalPhoneInputIntegration;
 use MauticPlugin\MauticInternationalPhoneInputBundle\InternationalPhoneInputEvents;
 use MauticPlugin\MauticInternationalPhoneInputBundle\Service\InternationalPhoneInputClient;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class FormSubscriber extends CommonSubscriber
+class FormSubscriber implements EventSubscriberInterface
 {
     const FIELD_NAME = 'plugin.internationalphoneinput';
 
-    /**
-     * @var InternationalPhoneInputClient
-     */
-    protected $internationalphoneinputClient;
-
     /**
      * @var string
      */
@@ -74,7 +71,7 @@ public function onFormBuild(FormBuilderEvent $event)
         }
         $event->addFormField(self::FIELD_NAME, [
             'label'          => 'mautic.plugin.actions.internationalphoneinput',
-            'formType'       =>  'internationalphoneinput',
+            'formType'       =>  InternationalPhoneInputType::class,
             'template'       => 'MauticInternationalPhoneInputBundle:Integration:internationalphoneinput.html.php',
             'builderOptions' => [
             ],

diff --git a/EventListener/FormValidationSubscriber.php b/EventListener/FormValidationSubscriber.php
@@ -17,10 +17,30 @@
 use Mautic\CoreBundle\Helper\ArrayHelper;
 use Mautic\FormBundle\Event as Events;
 use Mautic\FormBundle\FormEvents;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\Translation\TranslatorInterface;
 
-class FormValidationSubscriber extends CommonSubscriber
+class FormValidationSubscriber implements EventSubscriberInterface
 {
 
+    /**
+     * @var TranslatorInterface
+     */
+    private $translator;
+
+    /**
+     * @var \Symfony\Component\HttpFoundation\Request|null
+     */
+    private $request;
+
+    public function __construct(TranslatorInterface $translator, RequestStack $requestStack)
+    {
+        $this->translator = $translator;
+        $this->request = $requestStack->getCurrentRequest();
+    }
+
+
     /**
      * {@inheritdoc}
      */
@@ -58,7 +78,7 @@ public function onFormValidate(Events\ValidationEvent $event)
     {
         $field = $event->getField();
         $phoneNumber = $event->getValue();
-        $fullPhoneNumber = ArrayHelper::getValue($field->getAlias().'_full', $this->request->request->get('mauticform'));
+        $fullPhoneNumber = ArrayHelper::getValue($field->getAlias(), $this->request ? $this->request->request->get('mauticform') : []);
         if (!empty($phoneNumber) && $field->getType() === FormSubscriber::FIELD_NAME && !empty($field->getValidation()['international'])) {
             $phoneUtil = PhoneNumberUtil::getInstance();
             try {

diff --git a/Views/Integration/internationalphoneinput.html.php b/Views/Integration/internationalphoneinput.html.php
@@ -32,18 +32,18 @@
 if(!$inBuilder) {
     echo <<<HTML
 <link rel="stylesheet" href="{$view['assets']->getUrl(
-        'plugins/MauticInternationalPhoneInputBundle/Assets/css/intlTelInput.min.css',
+        'plugins/MauticInternationalPhoneInputBundle/Assets/lib/css/intlTelInput.min.css',
         null,
         null,
         true
     )}">
 <script src="{$view['assets']->getUrl(
-        'plugins/MauticInternationalPhoneInputBundle/Assets/js/intlTelInput.min.js',
+        'plugins/MauticInternationalPhoneInputBundle/Assets/lib/js/intlTelInput.min.js',
         null,
         null,
         true
     )}"></script>
-<script async defer src="{$view['router']->generate(
+<script async defer src="{$view['router']->url(
         'mautic_country_code_generate',
         ['formName' => $formName],
         true