Unified integration interface

app/bundles/AssetBundle/Controller/AjaxController.php

@@ -43,6 +43,8 @@ protected function categoryListAction(Request $request)
 
     /**
      * @return \Symfony\Component\HttpFoundation\JsonResponse
+     *
+     * @throws \Exception
      */
     protected function fetchRemoteFilesAction(Request $request)
     {

app/bundles/AssetBundle/Event/RemoteAssetBrowseEvent.php

@@ -14,6 +14,7 @@
 use Gaufrette\Adapter;
 use Mautic\CoreBundle\Event\CommonEvent;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class RemoteAssetBrowseEvent.
@@ -30,7 +31,7 @@ class RemoteAssetBrowseEvent extends CommonEvent
      */
     private $integration;
 
-    public function __construct(AbstractIntegration $integration)
+    public function __construct(UnifiedIntegrationInterface $integration)
     {
         $this->integration = $integration;
     }

app/bundles/IntegrationsBundle/Views/Config/form.html.php

@@ -95,7 +95,7 @@
     <?php if ($showFeaturesTab): ?>
     <div class="tab-pane fade <?php if ('features-container' == $activeTab): echo 'in active'; endif; ?> bdr-w-0" id="features-container">
         <?php
-        echo $view['form']->row($form['supportedFeatures']);
+        echo $view['form']->rowIfExists($form, 'supportedFeatures');
 
         if ($useFeatureSettings || $useSyncFeatures):
             echo '<hr />';

app/bundles/PluginBundle/Command/FetchLeadsCommand.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Command;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -97,10 +97,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $integrationHelper = $container->get('mautic.helper.integration');
 
         $integrationObject = $integrationHelper->getIntegrationObject($integration);
-        if (!$integrationObject instanceof AbstractIntegration) {
-            $availableIntegrations = array_filter($integrationHelper->getIntegrationObjects(), function (AbstractIntegration $availableIntegration) {
-                return $availableIntegration->isConfigured();
-            });
+        if (!$integrationObject instanceof UnifiedIntegrationInterface) {
+            $availableIntegrations = array_filter($integrationHelper->getIntegrationObjects(),
+                function (UnifiedIntegrationInterface $availableIntegration) {
+                    return $availableIntegration->isConfigured();
+                });
             throw new \RuntimeException(sprintf('The Integration "%s" is not one of the available integrations (%s)', $integration, implode(', ', array_keys($availableIntegrations))));
         }
 

app/bundles/PluginBundle/Event/PluginIntegrationAuthCallbackUrlEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationAuthCallbackUrlEvent.
@@ -23,12 +23,7 @@ class PluginIntegrationAuthCallbackUrlEvent extends AbstractPluginIntegrationEve
      */
     private $callbackUrl;
 
-    /**
-     * PluginIntegrationAuthCallbackUrlEvent constructor.
-     *
-     * @param $callbackUrl
-     */
-    public function __construct(AbstractIntegration $integration, $callbackUrl)
+    public function __construct(UnifiedIntegrationInterface $integration, $callbackUrl)
     {
         $this->integration = $integration;
         $this->callbackUrl = $callbackUrl;

app/bundles/PluginBundle/Event/PluginIntegrationAuthRedirectEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationAuthRedirectEvent.
@@ -23,12 +23,7 @@ class PluginIntegrationAuthRedirectEvent extends AbstractPluginIntegrationEvent
      */
     private $authUrl;
 
-    /**
-     * PluginIntegrationAuthRedirectEvent constructor.
-     *
-     * @param $authUrl
-     */
-    public function __construct(AbstractIntegration $integration, $authUrl)
+    public function __construct(UnifiedIntegrationInterface $integration, $authUrl)
     {
         $this->integration = $integration;
         $this->authUrl     = $authUrl;

app/bundles/PluginBundle/Event/PluginIntegrationEvent.php

@@ -12,17 +12,14 @@
 namespace Mautic\PluginBundle\Event;
 
 use Mautic\PluginBundle\Entity\Integration;
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationEvent.
  */
 class PluginIntegrationEvent extends AbstractPluginIntegrationEvent
 {
-    /**
-     * PluginIntegrationEvent constructor.
-     */
-    public function __construct(AbstractIntegration $integration)
+    public function __construct(UnifiedIntegrationInterface $integration)
     {
         $this->integration = $integration;
     }

app/bundles/PluginBundle/Event/PluginIntegrationFormBuildEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 use Symfony\Component\Form\FormBuilder;
 
 class PluginIntegrationFormBuildEvent extends AbstractPluginIntegrationEvent
@@ -26,7 +26,7 @@ class PluginIntegrationFormBuildEvent extends AbstractPluginIntegrationEvent
      */
     private $builder;
 
-    public function __construct(AbstractIntegration $integration, FormBuilder $builder, array $options)
+    public function __construct(UnifiedIntegrationInterface $integration, FormBuilder $builder, array $options)
     {
         $this->integration = $integration;
         $this->builder     = $builder;

app/bundles/PluginBundle/Event/PluginIntegrationFormDisplayEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationFormDisplayEvent.
@@ -23,12 +23,7 @@ class PluginIntegrationFormDisplayEvent extends AbstractPluginIntegrationEvent
      */
     private $settings = [];
 
-    /**
-     * PluginIntegrationAuthCallbackUrlEvent constructor.
-     *
-     * @param $settings
-     */
-    public function __construct(AbstractIntegration $integration, array $settings)
+    public function __construct(UnifiedIntegrationInterface $integration, array $settings)
     {
         $this->integration = $integration;
         $this->settings    = $settings;

app/bundles/PluginBundle/Event/PluginIntegrationKeyEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationKeyEvent.
@@ -23,10 +23,7 @@ class PluginIntegrationKeyEvent extends AbstractPluginIntegrationEvent
      */
     private $keys;
 
-    /**
-     * PluginIntegrationKeyEvent constructor.
-     */
-    public function __construct(AbstractIntegration $integration, array $keys = null)
+    public function __construct(UnifiedIntegrationInterface $integration, array $keys = null)
     {
         $this->integration = $integration;
         $this->keys        = $keys;

app/bundles/PluginBundle/Event/PluginIntegrationRequestEvent.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Event;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 
 /**
  * Class PluginIntegrationRequestEvent.
@@ -53,17 +53,7 @@ class PluginIntegrationRequestEvent extends AbstractPluginIntegrationEvent
      */
     private $response;
 
-    /**
-     * PluginIntegrationRequestEvent constructor.
-     *
-     * @param $url
-     * @param $parameters
-     * @param $headers
-     * @param $method
-     * @param $settings
-     * @param $authType
-     */
-    public function __construct(AbstractIntegration $integration, $url, $parameters, $headers, $method, $settings, $authType)
+    public function __construct(UnifiedIntegrationInterface $integration, $url, $parameters, $headers, $method, $settings, $authType)
     {
         $this->integration = $integration;
         $this->url         = $url;

app/bundles/PluginBundle/Helper/IntegrationHelper.php

@@ -20,6 +20,7 @@
 use Mautic\PluginBundle\Entity\Integration;
 use Mautic\PluginBundle\Entity\Plugin;
 use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 use Mautic\PluginBundle\Model\PluginModel;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Finder\Finder;
@@ -662,7 +663,7 @@ public function getIconPath($integration)
         } elseif ($integration instanceof Plugin) {
             // A bundle so check for an icon
             $icon = $pluginPath.'/'.$integration->getBundle().'/Assets/img/icon.png';
-        } elseif ($integration instanceof AbstractIntegration) {
+        } elseif ($integration instanceof UnifiedIntegrationInterface) {
             return $integration->getIcon();
         }
 

app/bundles/PluginBundle/Helper/oAuthHelper.php

@@ -11,7 +11,7 @@
 
 namespace Mautic\PluginBundle\Helper;
 
-use Mautic\PluginBundle\Integration\AbstractIntegration;
+use Mautic\PluginBundle\Integration\UnifiedIntegrationInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -35,7 +35,7 @@ class oAuthHelper
 
     private $request;
 
-    public function __construct(AbstractIntegration $integration, Request $request = null, $settings = [])
+    public function __construct(UnifiedIntegrationInterface $integration, Request $request = null, $settings = [])
     {
         $clientId                = $integration->getClientIdKey();
         $clientSecret            = $integration->getClientSecretKey();

app/bundles/PluginBundle/Integration/AbstractIntegration.php

@@ -57,7 +57,7 @@
  * @method getLeads(array $params, string $query, &$executed, array $result = [], $object = 'Lead')
  * @method getCompanies(array $params)
  */
-abstract class AbstractIntegration
+abstract class AbstractIntegration implements UnifiedIntegrationInterface
 {
     const FIELD_TYPE_STRING   = 'string';
     const FIELD_TYPE_BOOL     = 'boolean';

plugins/MauticCitrixBundle/Config/config.php

@@ -78,7 +78,6 @@
             ],
             'mautic.citrix.integration.request' => [
                 'class'     => \MauticPlugin\MauticCitrixBundle\EventListener\IntegrationRequestSubscriber::class,
-                'arguments' => [],
             ],
         ],
         'forms' => [

plugins/MauticCitrixBundle/Controller/PublicController.php

@@ -44,7 +44,7 @@ public function proxyAction(Request $request)
             }
 
             $ch = curl_init($url);
-            if ('post' === strtolower($request->server->get('REQUEST_METHOD', ''))) {
+            if (Request::METHOD_POST === $request->getMethod()) {
                 $headers = [
                     'Content-type: application/json',
                     'Accept: application/json',
@@ -71,8 +71,7 @@ public function proxyAction(Request $request)
         $response = new Response($json, $status['http_code']);
 
         // Generate appropriate content-type header.
-        $is_xhr = 'xmlhttprequest' === strtolower($request->server->get('HTTP_X_REQUESTED_WITH', null));
-        $response->headers->set('Content-type', 'application/'.($is_xhr ? 'json' : 'x-javascript'));
+        $response->headers->set('Content-type', 'application/'.($request->isXmlHttpRequest() ? 'json' : 'x-javascript'));
 
         // Allow CORS requests only from dev machines
         $allowedIps = $this->coreParametersHelper->get('dev_hosts') ?: [];

plugins/MauticCitrixBundle/EventListener/IntegrationRequestSubscriber.php

@@ -51,12 +51,12 @@ public function getParameters(PluginIntegrationRequestEvent $requestEvent)
      */
     private function getAuthorization(array $parameters)
     {
-        if (!isset($parameters['client_id']) || empty($parameters['client_id'])) {
-            throw new \Exception('No client ID given.', 1554211764);
+        if (empty($parameters['client_id'])) {
+            throw new \Exception('No client ID given.');
         }
 
-        if (!isset($parameters['client_secret']) || empty($parameters['client_secret'])) {
-            throw new \Exception('No client secret given.', 1554211808);
+        if (empty($parameters['client_secret'])) {
+            throw new \Exception('No client secret given.');
         }
 
         return sprintf('%s:%s', $parameters['client_id'], $parameters['client_secret']);

plugins/MauticCitrixBundle/Form/Type/CitrixCampaignActionType.php

@@ -65,28 +65,28 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
         $newChoices = [];
         foreach ($choices as $k => $c) {
-            if (0 === strpos($k, $product)) {
-                $newChoices[$c] = $k;
+            if (0 === mb_strpos($k, $product)) {
+                $newChoices[$k] = $c;
             }
         }
 
         $builder->add(
             'event-criteria-'.$product,
             ChoiceType::class,
             [
-                'label'             => $this->translator->trans('plugin.citrix.action.criteria'),
-                'choices'           => $newChoices,
-                ]
+                'label'   => $this->translator->trans('plugin.citrix.action.criteria'),
+                'choices' => $newChoices,
+            ]
         );
 
         if (CitrixProducts::GOTOASSIST !== $product) {
             $builder->add(
                 $product.'-list',
                 ChoiceType::class,
                 [
-                    'label'             => $this->translator->trans('plugin.citrix.decision.'.$product.'.list'),
-                    'choices'           => array_flip(CitrixHelper::getCitrixChoices($product)),
-                    'multiple'          => true,
+                    'label'    => $this->translator->trans('plugin.citrix.decision.'.$product.'.list'),
+                    'choices'  => array_flip(CitrixHelper::getCitrixChoices($product)),
+                    'multiple' => true,
                 ]
             );
         }
@@ -102,8 +102,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'class'   => 'form-control',
                     'tooltip' => 'plugin.citrix.emailtemplate_descr',
                 ],
-                'required' => true,
-                'multiple' => false,
+                'required'   => true,
+                'multiple'   => false,
             ];
 
             if (array_key_exists('list_options', $options)) {